Refactor packets (#3295)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

18 files changed, 90 insertions, 131 deletions

diff --git a/src/main/java/gregtech/api/net/GTPacket.java b/src/main/java/gregtech/api/net/GTPacket.java
index 1d2de3303b..68e08ab304 100644
--- a/src/main/java/gregtech/api/net/GTPacket.java
+++ b/src/main/java/gregtech/api/net/GTPacket.java
@@ -7,53 +7,35 @@ import com.google.common.io.ByteArrayDataInput;
 
 import io.netty.buffer.ByteBuf;
 
-/**
- * @deprecated Use {@link GTPacketNew} instead
- */
-@Deprecated
 public abstract class GTPacket {
 
-    public GTPacket(boolean aIsReference) {
-        //
-    }
+    public GTPacket() {}
 
     /**
-     * I use constant IDs instead of Dynamic ones, since that is much more fail safe
-     *
-     * @return a Packet ID for this Class
+     * Unique ID of this packet.
      */
     public abstract byte getPacketID();
 
     /**
-     * @return encoded byte Stream
-     * @deprecated Use {@link #encode(ByteBuf)} instead
-     */
-    @Deprecated
-    public abstract byte[] encode();
-
-    /**
-     * Encode the data into given byte buffer without creating an intermediate byte array. Default implementation just
-     * throw {@link UnsupportedOperationException}.
+     * Encode the data into given byte buffer.
      */
-    public void encode(ByteBuf aOut) {
-        throw new UnsupportedOperationException();
-    }
+    public abstract void encode(ByteBuf buffer);
 
     /**
-     * @return encoded byte Stream
+     * Decode byte buffer into packet object.
      */
-    public abstract GTPacket decode(ByteArrayDataInput aData);
+    public abstract GTPacket decode(ByteArrayDataInput buffer);
 
     /**
-     * Process the packet
+     * Process the received packet.
      *
-     * @param aWorld null if message is received on server side, the client world if message is received on client side
+     * @param world null if message is received on server side, the client world if message is received on client side
      */
-    public abstract void process(IBlockAccess aWorld);
+    public abstract void process(IBlockAccess world);
 
     /**
      * This will be called just before {@link #process(IBlockAccess)} to inform the handler about the source and type of
-     * connection
+     * connection.
      */
-    public void setINetHandler(INetHandler aHandler) {}
+    public void setINetHandler(INetHandler handler) {}
 }
diff --git a/src/main/java/gregtech/api/net/GTPacketBlockEvent.java b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
index a2164f4f07..1e4e942bf2 100644
--- a/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
+++ b/src/main/java/gregtech/api/net/GTPacketBlockEvent.java
@@ -10,18 +10,18 @@ import io.netty.buffer.ByteBuf;
 /**
  * Used to transfer Block Events in a much better fashion
  */
-public class GTPacketBlockEvent extends GTPacketNew {
+public class GTPacketBlockEvent extends GTPacket {
 
     private int mX, mZ;
     private short mY;
     private byte mID, mValue;
 
     public GTPacketBlockEvent() {
-        super(true);
+        super();
     }
 
     public GTPacketBlockEvent(int aX, short aY, int aZ, byte aID, byte aValue) {
-        super(false);
+        super();
         mX = aX;
         mY = aY;
         mZ = aZ;
@@ -39,7 +39,7 @@ public class GTPacketBlockEvent extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketBlockEvent(
             aData.readInt(),
             aData.readShort(),
diff --git a/src/main/java/gregtech/api/net/GTPacketClientPreference.java b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
index ea5d9ec476..28a5a83f2e 100644
--- a/src/main/java/gregtech/api/net/GTPacketClientPreference.java
+++ b/src/main/java/gregtech/api/net/GTPacketClientPreference.java
@@ -11,17 +11,17 @@ import gregtech.GTMod;
 import gregtech.api.util.GTClientPreference;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketClientPreference extends GTPacketNew {
+public class GTPacketClientPreference extends GTPacket {
 
     private GTClientPreference mPreference;
     private EntityPlayerMP mPlayer;
 
     public GTPacketClientPreference() {
-        super(true);
+        super();
     }
 
     public GTPacketClientPreference(GTClientPreference mPreference) {
-        super(false);
+        super();
         this.mPreference = mPreference;
     }
 
@@ -51,7 +51,7 @@ public class GTPacketClientPreference extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketClientPreference(
             new GTClientPreference(aData.readBoolean(), aData.readBoolean(), aData.readBoolean(), aData.readBoolean()));
     }
diff --git a/src/main/java/gregtech/api/net/GTPacketInfiniteSpraycan.java b/src/main/java/gregtech/api/net/GTPacketInfiniteSpraycan.java
index 302937f6ba..c12dc7d02a 100644
--- a/src/main/java/gregtech/api/net/GTPacketInfiniteSpraycan.java
+++ b/src/main/java/gregtech/api/net/GTPacketInfiniteSpraycan.java
@@ -16,24 +16,24 @@ import gregtech.api.util.GTUtility;
 import gregtech.common.items.behaviors.BehaviourSprayColorInfinite;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketInfiniteSpraycan extends GTPacketNew {
+public class GTPacketInfiniteSpraycan extends GTPacket {
 
     private Action action;
     private int newColor;
     private EntityPlayerMP player;
 
     public GTPacketInfiniteSpraycan() {
-        super(true);
+        super();
     }
 
     public GTPacketInfiniteSpraycan(Action action) {
-        super(false);
+        super();
         this.action = action;
         this.newColor = -1;
     }
 
     public GTPacketInfiniteSpraycan(Action action, int newColor) {
-        super(false);
+        super();
         this.action = action;
         this.newColor = newColor;
     }
@@ -53,7 +53,7 @@ public class GTPacketInfiniteSpraycan extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(final ByteArrayDataInput aData) {
+    public GTPacket decode(final ByteArrayDataInput aData) {
         final int newColor = aData.readInt();
         final int length = aData.readInt();
         final byte[] name = new byte[length];
diff --git a/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
index b151f8eb5f..1b9fab34d4 100644
--- a/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketMultiTileEntity.java
@@ -18,14 +18,14 @@ import gregtech.api.net.data.MultiTileEntityProcess;
 import gregtech.api.net.data.PacketData;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketMultiTileEntity extends GTPacketNew {
+public class GTPacketMultiTileEntity extends GTPacket {
 
     private final Set<PacketData<MultiTileEntityProcess>> data = new HashSet<>();
     public static final int COVERS = B[0], REDSTONE = B[1], MODES = B[2], CONTROLLER = B[3], INVENTORY_INDEX = B[4],
         INVENTORY_NAME_ID = B[5], BOOLEANS = B[6], SOUND = B[7];
 
-    public GTPacketMultiTileEntity(boolean reference) {
-        super(reference);
+    public GTPacketMultiTileEntity() {
+        super();
     }
 
     @Override
@@ -97,11 +97,11 @@ public class GTPacketMultiTileEntity extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput in) {
+    public GTPacket decode(ByteArrayDataInput in) {
         Objects.requireNonNull(in);
         final int packetFeatures = in.readInt();
 
-        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity(false);
+        final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity();
 
         if (containsBit(packetFeatures, CoordinateData.COORDINATE_DATA_ID)) {
             packet.addData(new CoordinateData());
diff --git a/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
index c650188594..c69772a2fb 100644
--- a/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
+++ b/src/main/java/gregtech/api/net/GTPacketMusicSystemData.java
@@ -8,16 +8,16 @@ import gregtech.api.util.GTMusicSystem;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-public class GTPacketMusicSystemData extends GTPacketNew {
+public class GTPacketMusicSystemData extends GTPacket {
 
     ByteBuf storedData;
 
     public GTPacketMusicSystemData() {
-        super(true);
+        super();
     }
 
     public GTPacketMusicSystemData(ByteBuf data) {
-        super(false);
+        super();
         this.storedData = data;
     }
 
@@ -39,7 +39,7 @@ public class GTPacketMusicSystemData extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         final int len = aData.readInt();
         final byte[] fullData = new byte[len];
         aData.readFully(fullData);
diff --git a/src/main/java/gregtech/api/net/GTPacketNew.java b/src/main/java/gregtech/api/net/GTPacketNew.java
deleted file mode 100644
index d3fee800c6..0000000000
--- a/src/main/java/gregtech/api/net/GTPacketNew.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package gregtech.api.net;
-
-import com.google.common.io.ByteArrayDataInput;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
-@SuppressWarnings("deprecation")
-public abstract class GTPacketNew extends GTPacket {
-
-    public GTPacketNew(boolean aIsReference) {
-        super(aIsReference);
-    }
-
-    @Override
-    @Deprecated
-    public final byte[] encode() {
-        final ByteBuf tOut = Unpooled.buffer();
-        encode(tOut);
-        final byte[] bytes = new byte[tOut.readableBytes()];
-        tOut.readBytes(bytes);
-        return bytes;
-    }
-
-    @Override
-    public abstract void encode(ByteBuf aOut);
-
-    @Override
-    public abstract GTPacketNew decode(ByteArrayDataInput aData);
-}
diff --git a/src/main/java/gregtech/api/net/GTPacketPollution.java b/src/main/java/gregtech/api/net/GTPacketPollution.java
index 2f4805aad8..6d15341682 100644
--- a/src/main/java/gregtech/api/net/GTPacketPollution.java
+++ b/src/main/java/gregtech/api/net/GTPacketPollution.java
@@ -8,17 +8,17 @@ import com.google.common.io.ByteArrayDataInput;
 import gregtech.common.GTClient;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketPollution extends GTPacketNew {
+public class GTPacketPollution extends GTPacket {
 
     private ChunkCoordIntPair chunk;
     private int pollution;
 
     public GTPacketPollution() {
-        super(true);
+        super();
     }
 
     public GTPacketPollution(ChunkCoordIntPair chunk, int pollution) {
-        super(false);
+        super();
         this.chunk = chunk;
         this.pollution = pollution;
     }
@@ -31,7 +31,7 @@ public class GTPacketPollution extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketPollution(new ChunkCoordIntPair(aData.readInt(), aData.readInt()), aData.readInt());
     }
 
diff --git a/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
index 4679643624..5d42086454 100644
--- a/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketRequestCoverData.java
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server : ask for cover data
  */
-public class GTPacketRequestCoverData extends GTPacketNew {
+public class GTPacketRequestCoverData extends GTPacket {
 
     protected int mX;
     protected short mY;
@@ -31,11 +31,11 @@ public class GTPacketRequestCoverData extends GTPacketNew {
     protected EntityPlayerMP mPlayer;
 
     public GTPacketRequestCoverData() {
-        super(true);
+        super();
     }
 
     public GTPacketRequestCoverData(CoverInfo info, ICoverable tile) {
-        super(false);
+        super();
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
         this.mZ = tile.getZCoord();
@@ -45,7 +45,7 @@ public class GTPacketRequestCoverData extends GTPacketNew {
     }
 
     public GTPacketRequestCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID) {
-        super(false);
+        super();
         this.mX = mX;
         this.mY = mY;
         this.mZ = mZ;
@@ -55,7 +55,7 @@ public class GTPacketRequestCoverData extends GTPacketNew {
     }
 
     public GTPacketRequestCoverData(ForgeDirection coverSide, int coverID, ICoverable tile) {
-        super(false);
+        super();
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
         this.mZ = tile.getZCoord();
@@ -80,7 +80,7 @@ public class GTPacketRequestCoverData extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketRequestCoverData(
             aData.readInt(),
             aData.readShort(),
diff --git a/src/main/java/gregtech/api/net/GTPacketSendCoverData.java b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
index 76adb75d31..15945b113a 100644
--- a/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendCoverData.java
@@ -16,7 +16,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Server -> Client : Update cover data
  */
-public class GTPacketSendCoverData extends GTPacketNew {
+public class GTPacketSendCoverData extends GTPacket {
 
     protected int mX;
     protected short mY;
@@ -27,12 +27,12 @@ public class GTPacketSendCoverData extends GTPacketNew {
     protected ISerializableObject coverData;
 
     public GTPacketSendCoverData() {
-        super(true);
+        super();
     }
 
     public GTPacketSendCoverData(int mX, short mY, int mZ, ForgeDirection coverSide, int coverID,
         ISerializableObject coverData) {
-        super(false);
+        super();
         this.mX = mX;
         this.mY = mY;
         this.mZ = mZ;
@@ -43,7 +43,7 @@ public class GTPacketSendCoverData extends GTPacketNew {
     }
 
     public GTPacketSendCoverData(CoverInfo info, ICoverable tile) {
-        super(false);
+        super();
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
         this.mZ = tile.getZCoord();
@@ -55,7 +55,7 @@ public class GTPacketSendCoverData extends GTPacketNew {
 
     public GTPacketSendCoverData(ForgeDirection coverSide, int coverID, ISerializableObject coverData,
         ICoverable tile) {
-        super(false);
+        super();
         this.mX = tile.getXCoord();
         this.mY = tile.getYCoord();
         this.mZ = tile.getZCoord();
@@ -82,7 +82,7 @@ public class GTPacketSendCoverData extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         final int coverId;
         return new GTPacketSendCoverData(
             aData.readInt(),
diff --git a/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
index 9db0e9a471..dc9119d80a 100644
--- a/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
@@ -9,16 +9,16 @@ import gregtech.common.GTWorldgenerator;
 import gregtech.common.GTWorldgenerator.OregenPattern;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketSendOregenPattern extends GTPacketNew {
+public class GTPacketSendOregenPattern extends GTPacket {
 
     protected OregenPattern pattern = OregenPattern.AXISSYMMETRICAL;
 
     public GTPacketSendOregenPattern() {
-        super(true);
+        super();
     }
 
     public GTPacketSendOregenPattern(OregenPattern pattern) {
-        super(false);
+        super();
         this.pattern = pattern;
     }
 
@@ -28,7 +28,7 @@ public class GTPacketSendOregenPattern extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         int ordinal = aData.readInt();
         // make sure we get valid data:
         if (ordinal >= 0 && ordinal < OregenPattern.values().length) {
diff --git a/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
index 8984cea509..8aaf291de2 100644
--- a/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
+++ b/src/main/java/gregtech/api/net/GTPacketSetConfigurationCircuit.java
@@ -22,7 +22,7 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server: Update machine configuration data
  */
-public class GTPacketSetConfigurationCircuit extends GTPacketNew {
+public class GTPacketSetConfigurationCircuit extends GTPacket {
 
     protected int mX;
     protected short mY;
@@ -32,7 +32,7 @@ public class GTPacketSetConfigurationCircuit extends GTPacketNew {
     protected ItemStack circuit;
 
     public GTPacketSetConfigurationCircuit() {
-        super(true);
+        super();
     }
 
     public GTPacketSetConfigurationCircuit(IGregTechTileEntity tile, ItemStack circuit) {
@@ -44,7 +44,7 @@ public class GTPacketSetConfigurationCircuit extends GTPacketNew {
     }
 
     public GTPacketSetConfigurationCircuit(int x, short y, int z, ItemStack circuit) {
-        super(false);
+        super();
 
         this.mX = x;
         this.mY = y;
@@ -82,7 +82,7 @@ public class GTPacketSetConfigurationCircuit extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketSetConfigurationCircuit(
             aData.readInt(),
             aData.readShort(),
diff --git a/src/main/java/gregtech/api/net/GTPacketSound.java b/src/main/java/gregtech/api/net/GTPacketSound.java
index 95f95e641d..feaf5abf85 100644
--- a/src/main/java/gregtech/api/net/GTPacketSound.java
+++ b/src/main/java/gregtech/api/net/GTPacketSound.java
@@ -12,7 +12,7 @@ import gregtech.api.util.GTUtility;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 
-public class GTPacketSound extends GTPacketNew {
+public class GTPacketSound extends GTPacket {
 
     private int mX, mZ;
     private short mY;
@@ -20,11 +20,11 @@ public class GTPacketSound extends GTPacketNew {
     private float mSoundStrength, mSoundPitch;
 
     public GTPacketSound() {
-        super(true);
+        super();
     }
 
     public GTPacketSound(String aSoundName, float aSoundStrength, float aSoundPitch, int aX, short aY, int aZ) {
-        super(false);
+        super();
         mX = aX;
         mY = aY;
         mZ = aZ;
@@ -49,7 +49,7 @@ public class GTPacketSound extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketSound(
             aData.readUTF(),
             aData.readFloat(),
diff --git a/src/main/java/gregtech/api/net/GTPacketTileEntity.java b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
index eecb16d6da..e996f32ced 100644
--- a/src/main/java/gregtech/api/net/GTPacketTileEntity.java
+++ b/src/main/java/gregtech/api/net/GTPacketTileEntity.java
@@ -11,20 +11,20 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketTileEntity extends GTPacketNew {
+public class GTPacketTileEntity extends GTPacket {
 
     private int mX, mZ, mC0, mC1, mC2, mC3, mC4, mC5;
     private short mY, mID, mRID;
     private byte mTexture, mTexturePage, mUpdate, mRedstone, mColor;
 
     public GTPacketTileEntity() {
-        super(true);
+        super();
     }
 
     // For multi tiles
     public GTPacketTileEntity(int aX, short aY, int aZ, short aRID, short aID, int aC0, int aC1, int aC2, int aC3,
         int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
-        super(false);
+        super();
         mX = aX;
         mY = aY;
         mZ = aZ;
@@ -95,7 +95,7 @@ public class GTPacketTileEntity extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketTileEntity(
             // Coords
             aData.readInt(),
diff --git a/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
index 57cabcf2bf..df3b579180 100644
--- a/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
+++ b/src/main/java/gregtech/api/net/GTPacketToolSwitchMode.java
@@ -11,12 +11,12 @@ import com.google.common.io.ByteArrayDataInput;
 import gregtech.api.items.MetaGeneratedTool;
 import io.netty.buffer.ByteBuf;
 
-public class GTPacketToolSwitchMode extends GTPacketNew {
+public class GTPacketToolSwitchMode extends GTPacket {
 
     private EntityPlayerMP player;
 
     public GTPacketToolSwitchMode() {
-        super(true);
+        super();
     }
 
     @Override
@@ -30,7 +30,7 @@ public class GTPacketToolSwitchMode extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketToolSwitchMode();
     }
 
diff --git a/src/main/java/gregtech/api/net/GTPacketTypes.java b/src/main/java/gregtech/api/net/GTPacketTypes.java
index 17081ba92e..ed43274434 100644
--- a/src/main/java/gregtech/api/net/GTPacketTypes.java
+++ b/src/main/java/gregtech/api/net/GTPacketTypes.java
@@ -2,6 +2,11 @@ package gregtech.api.net;
 
 import java.util.Arrays;
 
+import bartworks.common.net.PacketBWMetaBlock;
+import bartworks.common.net.PacketBioVatRenderer;
+import bartworks.common.net.PacketEIC;
+import bartworks.common.net.PacketOreDictCache;
+import bartworks.common.net.PacketServerJoined;
 import gregtech.common.blocks.PacketOres;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
@@ -20,20 +25,25 @@ public enum GTPacketTypes {
     UPDATE_ITEM(13, new GTPacketUpdateItem()),
     SEND_COVER_DATA(16, new GTPacketSendCoverData()),
     REQUEST_COVER_DATA(17, new GTPacketRequestCoverData()),
-    MULTI_TILE_ENTITY(18, new GTPacketMultiTileEntity(true)),
+    MULTI_TILE_ENTITY(18, new GTPacketMultiTileEntity()),
     SEND_OREGEN_PATTERN(19, new GTPacketSendOregenPattern()),
     TOOL_SWITCH_MODE(20, new GTPacketToolSwitchMode()),
     MUSIC_SYSTEM_DATA(21, new GTPacketMusicSystemData()),
     INFINITE_SPRAYCAN(22, new GTPacketInfiniteSpraycan()),
+    BIO_VAT_RENDERER(23, new PacketBioVatRenderer()),
+    BW_META_BLOCK(24, new PacketBWMetaBlock()),
+    ORE_DICT_CACHE(25, new PacketOreDictCache()),
+    SERVER_JOINED(26, new PacketServerJoined()),
+    EIC(27, new PacketEIC()),
     // merge conflict prevention comment, keep a trailing comma above
     ;
 
     static {
         // Validate no duplicate IDs
         final GTPacketTypes[] types = values();
-        final Int2ObjectOpenHashMap<GTPacketNew> foundIds = new Int2ObjectOpenHashMap<>(types.length);
+        final Int2ObjectOpenHashMap<GTPacket> foundIds = new Int2ObjectOpenHashMap<>(types.length);
         for (GTPacketTypes type : types) {
-            final GTPacketNew previous = foundIds.get(type.id);
+            final GTPacket previous = foundIds.get(type.id);
             if (previous != null) {
                 throw new IllegalStateException(
                     "Duplicate packet IDs defined: " + type.id
@@ -47,9 +57,9 @@ public enum GTPacketTypes {
     }
 
     public final byte id;
-    public final GTPacketNew referencePacket;
+    public final GTPacket referencePacket;
 
-    GTPacketTypes(int id, GTPacketNew referencePacket) {
+    GTPacketTypes(int id, GTPacket referencePacket) {
         if (((int) (byte) id) != id) {
             throw new IllegalArgumentException("Value outside of byte normal range: " + id);
         }
@@ -57,9 +67,9 @@ public enum GTPacketTypes {
         this.referencePacket = referencePacket;
     }
 
-    public static GTPacketNew[] referencePackets() {
+    public static GTPacket[] referencePackets() {
         return Arrays.stream(values())
             .map(p -> p.referencePacket)
-            .toArray(GTPacketNew[]::new);
+            .toArray(GTPacket[]::new);
     }
 }
diff --git a/src/main/java/gregtech/api/net/GTPacketUpdateItem.java b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
index 54846cdcc9..31e8f35a8e 100644
--- a/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
+++ b/src/main/java/gregtech/api/net/GTPacketUpdateItem.java
@@ -17,17 +17,17 @@ import io.netty.buffer.ByteBuf;
 /**
  * Client -> Server: send arbitrary data to server and update the currently held item.
  */
-public class GTPacketUpdateItem extends GTPacketNew {
+public class GTPacketUpdateItem extends GTPacket {
 
     private NBTTagCompound tag;
     private EntityPlayerMP mPlayer;
 
     public GTPacketUpdateItem() {
-        super(true);
+        super();
     }
 
     public GTPacketUpdateItem(NBTTagCompound tag) {
-        super(false);
+        super();
         this.tag = tag;
     }
 
@@ -49,7 +49,7 @@ public class GTPacketUpdateItem extends GTPacketNew {
     }
 
     @Override
-    public GTPacketNew decode(ByteArrayDataInput aData) {
+    public GTPacket decode(ByteArrayDataInput aData) {
         return new GTPacketUpdateItem(ISerializableObject.readCompoundTagFromGreggyByteBuf(aData));
     }
 
diff --git a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
index 3569317b01..6eb28efdd5 100644
--- a/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
+++ b/src/main/java/gregtech/api/net/IGT_NetworkHandler.java
@@ -5,16 +5,13 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 
-@SuppressWarnings("deprecation")
 public interface IGT_NetworkHandler {
 
     void sendToPlayer(GTPacket aPacket, EntityPlayerMP aPlayer);
 
     void sendToAllAround(GTPacket aPacket, TargetPoint aPosition);
 
-    default void sendToAll(GTPacket aPacket) {
-        throw new UnsupportedOperationException("sendToAll not implemented");
-    }
+    void sendToAll(GTPacket aPacket);
 
     void sendToServer(GTPacket aPacket);