2 files changed, 17 insertions, 23 deletions
diff --git a/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java b/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java
index 7a0df96c13..c65d7f2be4 100644
--- a/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java
+++ b/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java
@@ -1,10 +1,9 @@
 package gregtech.common.net;
 
 import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-import gregtech.api.net.GT_Packet;
+import gregtech.api.net.GT_Packet_New;
 import gregtech.common.items.GT_VolumetricFlask;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -12,7 +11,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
-public final class MessageSetFlaskCapacity extends GT_Packet {
+public final class MessageSetFlaskCapacity extends GT_Packet_New {
     private int capacity, dimID, playerID;
 
     public MessageSetFlaskCapacity() {
@@ -39,16 +38,14 @@ public final class MessageSetFlaskCapacity extends GT_Packet {
     }
 
     @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(10);
-        tOut.writeInt(capacity);
-        tOut.writeInt(dimID);
-        tOut.writeInt(playerID);
-        return tOut.toByteArray();
+    public void encode(ByteBuf aOut) {
+        aOut.writeInt(capacity);
+        aOut.writeInt(dimID);
+        aOut.writeInt(playerID);
     }
 
     @Override
-    public GT_Packet decode(ByteArrayDataInput aData) {
+    public GT_Packet_New decode(ByteArrayDataInput aData) {
         return new MessageSetFlaskCapacity(aData.readInt(), aData.readInt(), aData.readInt());
     }
 
diff --git a/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java b/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java
index 46af08134d..619f528502 100644
--- a/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java
+++ b/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java
@@ -1,17 +1,16 @@
 package gregtech.common.net;
 
 import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
 import gregtech.api.interfaces.IHasFluidDisplayItem;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.net.GT_Packet;
+import gregtech.api.net.GT_Packet_New;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 
-public class MessageUpdateFluidDisplayItem extends GT_Packet {
+public class MessageUpdateFluidDisplayItem extends GT_Packet_New {
     private int mBlockX, mBlockY, mBlockZ, mDim;
 
     public MessageUpdateFluidDisplayItem() {
@@ -32,17 +31,15 @@ public class MessageUpdateFluidDisplayItem extends GT_Packet {
     }
 
     @Override
-    public byte[] encode() {
-        ByteArrayDataOutput os = ByteStreams.newDataOutput(32);
-        os.writeInt(mBlockX);
-        os.writeInt(mBlockY);
-        os.writeInt(mBlockZ);
-        os.writeInt(mDim);
-        return os.toByteArray();
+    public void encode(ByteBuf aOut) {
+        aOut.writeInt(mBlockX);
+        aOut.writeInt(mBlockY);
+        aOut.writeInt(mBlockZ);
+        aOut.writeInt(mDim);
     }
 
     @Override
-    public GT_Packet decode(ByteArrayDataInput aData) {
+    public GT_Packet_New decode(ByteArrayDataInput aData) {
         return new MessageUpdateFluidDisplayItem(aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt());
     }