From 850d44d5490ab3b15eea2b07f6f52dc4828e7629 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Sun, 18 Jul 2021 16:05:34 +0200
Subject: [PATCH] Minor cleanup - pom and encryption package

---
 pom.xml                                       | 24 ++++++++++---------
 .../MapleCustomEncryption.java                |  2 +-
 .../java/net/encryption/PacketDecoder.java    |  1 -
 .../java/net/encryption/PacketEncoder.java    |  1 -
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename src/main/java/net/{ => encryption}/MapleCustomEncryption.java (99%)

diff --git a/pom.xml b/pom.xml
index ac8592c6ee..0334d6b9c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,8 @@
 
         <log4j.version>2.14.1</log4j.version>
         <graalvm.version>21.1.0</graalvm.version>
+        <netty.version>4.1.65.Final</netty.version>
+        <junit.version>5.7.2</junit.version>
     </properties>
 
     <dependencies>
@@ -32,6 +34,11 @@
             <artifactId>jcip-annotations</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency> <!-- only used for some tools -->
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.10.0</version>
+        </dependency>
 
         <!-- Database -->
         <dependency>
@@ -49,27 +56,22 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>4.1.65.Final</version>
+            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>4.1.65.Final</version>
+            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>4.1.65.Final</version>
-        </dependency>
-        <dependency> <!-- only used for some tools -->
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.10.0</version>
+            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.1.65.Final</version>
+            <version>${netty.version}</version>
         </dependency>
 
         <!-- Logging -->
@@ -110,12 +112,12 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.7.2</version>
+            <version>${junit.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.7.2</version>
+            <version>${junit.version}</version>
         </dependency>
 
 
diff --git a/src/main/java/net/MapleCustomEncryption.java b/src/main/java/net/encryption/MapleCustomEncryption.java
similarity index 99%
rename from src/main/java/net/MapleCustomEncryption.java
rename to src/main/java/net/encryption/MapleCustomEncryption.java
index e6063279b9..67e94844c3 100644
--- a/src/main/java/net/MapleCustomEncryption.java
+++ b/src/main/java/net/encryption/MapleCustomEncryption.java
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package net;
+package net.encryption;
 
 public class MapleCustomEncryption {
     private static byte rollLeft(byte in, int count) {
diff --git a/src/main/java/net/encryption/PacketDecoder.java b/src/main/java/net/encryption/PacketDecoder.java
index cec48f5bcb..896d565d0f 100644
--- a/src/main/java/net/encryption/PacketDecoder.java
+++ b/src/main/java/net/encryption/PacketDecoder.java
@@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ReplayingDecoder;
-import net.MapleCustomEncryption;
 import net.netty.InvalidPacketHeaderException;
 import net.packet.ByteBufInPacket;
 
diff --git a/src/main/java/net/encryption/PacketEncoder.java b/src/main/java/net/encryption/PacketEncoder.java
index 7a297116c6..d558e7b13b 100644
--- a/src/main/java/net/encryption/PacketEncoder.java
+++ b/src/main/java/net/encryption/PacketEncoder.java
@@ -3,7 +3,6 @@ package net.encryption;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import net.MapleCustomEncryption;
 import net.packet.OutPacket;
 
 public class PacketEncoder extends MessageToByteEncoder<OutPacket> {