PacketSetCompression and PacketLoginSetCompression implements now PacketCompressionInterface

src/main/java/de/bixilon/minosoft/protocol/network/Network.java

@@ -16,9 +16,8 @@ package de.bixilon.minosoft.protocol.network;
 import de.bixilon.minosoft.logging.Log;
 import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
 import de.bixilon.minosoft.protocol.packets.ServerboundPacket;
-import de.bixilon.minosoft.protocol.packets.clientbound.login.PacketLoginSetCompression;
+import de.bixilon.minosoft.protocol.packets.clientbound.interfaces.PacketCompressionInterface;
 import de.bixilon.minosoft.protocol.packets.clientbound.login.PacketLoginSuccess;
-import de.bixilon.minosoft.protocol.packets.clientbound.play.PacketSetCompression;
 import de.bixilon.minosoft.protocol.packets.serverbound.login.PacketEncryptionResponse;
 import de.bixilon.minosoft.protocol.protocol.*;
 import de.bixilon.minosoft.util.Util;
@@ -179,10 +178,8 @@ public class Network {
                                 //set special settings to avoid miss timing issues
                                 if (packetInstance instanceof PacketLoginSuccess) {
                                     connection.setConnectionState(ConnectionState.PLAY);
-                                } else if (packetInstance instanceof PacketLoginSetCompression) {
+                                } else if (packetInstance instanceof PacketCompressionInterface) {
-                                    compressionThreshold = ((PacketLoginSetCompression) packetInstance).getThreshold();
+                                    compressionThreshold = ((PacketCompressionInterface) packetInstance).getThreshold();
-                                } else if (packetInstance instanceof PacketSetCompression) {
-                                    compressionThreshold = ((PacketSetCompression) packetInstance).getThreshold();
                                 }
                                 connection.handle(packetInstance);
                             } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {

src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/interfaces/PacketCompressionInterface.java

@@ -0,0 +1,20 @@
+/*
+ * Codename Minosoft
+ * Copyright (C) 2020 Moritz Zwerger
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ *  This software is not affiliated with Mojang AB, the original developer of Minecraft.
+ */
+
+package de.bixilon.minosoft.protocol.packets.clientbound.interfaces;
+
+import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
+
+public interface PacketCompressionInterface extends ClientboundPacket {
+    int getThreshold();
+}

src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSetCompression.java

@@ -14,11 +14,11 @@
 package de.bixilon.minosoft.protocol.packets.clientbound.login;
 
 import de.bixilon.minosoft.logging.Log;
-import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
+import de.bixilon.minosoft.protocol.packets.clientbound.interfaces.PacketCompressionInterface;
 import de.bixilon.minosoft.protocol.protocol.InByteBuffer;
 import de.bixilon.minosoft.protocol.protocol.PacketHandler;
 
-public class PacketLoginSetCompression implements ClientboundPacket {
+public class PacketLoginSetCompression implements PacketCompressionInterface {
     int threshold;
 
     @Override
@@ -37,6 +37,7 @@ public class PacketLoginSetCompression implements ClientboundPacket {
         h.handle(this);
     }
 
+    @Override
     public int getThreshold() {
         return threshold;
     }

src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSetCompression.java

@@ -14,11 +14,11 @@
 package de.bixilon.minosoft.protocol.packets.clientbound.play;
 
 import de.bixilon.minosoft.logging.Log;
-import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
+import de.bixilon.minosoft.protocol.packets.clientbound.interfaces.PacketCompressionInterface;
 import de.bixilon.minosoft.protocol.protocol.InByteBuffer;
 import de.bixilon.minosoft.protocol.protocol.PacketHandler;
 
-public class PacketSetCompression implements ClientboundPacket {
+public class PacketSetCompression implements PacketCompressionInterface {
     int threshold;
 
     @Override
@@ -37,6 +37,7 @@ public class PacketSetCompression implements ClientboundPacket {
         h.handle(this);
     }
 
+    @Override
     public int getThreshold() {
         return threshold;
     }