Try resolve merge issues with Master and 1.16 branches

README.md

@@ -11,4 +11,4 @@ __ProxyPass requires  Java 8 u162 or later to function correctly due to the encr
 
 __[Jenkins](https://ci.nukkitx.com/job/NukkitX/job/ProxyPass/job/master/)__
 
-__[Protocol library](https://github.com/NukkitX/Protocol) used in this project__
+__[Protocol library](https://github.com/NukkitX/Protocol) used in this project__

pom.xml

@@ -88,6 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -101,11 +102,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.github.edwgiz</groupId>
                         <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
-                        <version>2.8.1</version>
+                        <version>2.13.1</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -119,7 +121,7 @@
                 <configuration>
                     <transformers>
                         <transformer
-                                implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer">
+                                implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer">
                         </transformer>
                     </transformers>
                 </configuration>

src/main/java/com/nukkitx/proxypass/network/bedrock/session/ProxyPlayerSession.java

@@ -133,11 +133,11 @@ public void handle(BedrockSession session, ByteBuf compressed, Collection<Bedroc
                 }
 
                 if (packetTesting) {
-                    int packetId = proxy.CODEC.getId(packet.getClass());
+                    int packetId = ProxyPass.CODEC.getId(packet.getClass());
                     ByteBuf buffer = ByteBufAllocator.DEFAULT.ioBuffer();
                     try {
                         ProxyPass.CODEC.tryEncode(buffer, packet);
-                        BedrockPacket packet2 = proxy.CODEC.tryDecode(buffer, packetId);
+                        BedrockPacket packet2 = ProxyPass.CODEC.tryDecode(buffer, packetId);
                         if (!Objects.equals(packet, packet2)) {
                             // Something went wrong in serialization.
                             log.warn("Packets instances not equal:\n Original  : {}\nRe-encoded : {}",

src/main/java/com/nukkitx/proxypass/network/bedrock/session/UpstreamPacketHandler.java

@@ -77,15 +77,15 @@ public boolean handle(ClientToServerHandshakePacket packet) {
     public boolean handle(LoginPacket packet) {
         int protocolVersion = packet.getProtocolVersion();
 
-        if (protocolVersion != proxy.PROTOCOL_VERSION) {
+        if (protocolVersion != ProxyPass.PROTOCOL_VERSION) {
             PlayStatusPacket status = new PlayStatusPacket();
-            if (protocolVersion > proxy.PROTOCOL_VERSION) {
+            if (protocolVersion > ProxyPass.PROTOCOL_VERSION) {
                 status.setStatus(PlayStatusPacket.Status.LOGIN_FAILED_SERVER_OLD);
             } else {
                 status.setStatus(PlayStatusPacket.Status.LOGIN_FAILED_CLIENT_OLD);
             }
         }
-        session.setPacketCodec(proxy.CODEC);
+        session.setPacketCodec(ProxyPass.CODEC);
 
         JsonNode certData;
         try {

src/main/java/com/nukkitx/proxypass/network/bedrock/util/RecipeUtils.java

@@ -95,7 +95,7 @@ public static void writeRecipes(CraftingDataPacket packet, ProxyPass proxy) {
             entries.add(entry);
         }
 
-        Recipes recipes = new Recipes(proxy.CODEC.getProtocolVersion(), entries, packet.getPotionMixData(), packet.getContainerMixData());
+        Recipes recipes = new Recipes(ProxyPass.CODEC.getProtocolVersion(), entries, packet.getPotionMixData(), packet.getContainerMixData());
 
         proxy.saveJson("recipes.json", recipes);
     }