Merge remote-tracking branch 'origin/experimental' into experimental

1 files changed, 13 insertions, 14 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java b/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java
index 4889c87dad..657ac9b934 100644
--- a/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Packet_Ores.java
@@ -1,14 +1,13 @@
 package gregtech.common.blocks;
 
 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 io.netty.buffer.ByteBuf;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class GT_Packet_Ores extends GT_Packet {
+public class GT_Packet_Ores extends GT_Packet_New {
     private int mX;
     private int mZ;
     private short mY;
@@ -26,21 +25,20 @@ public class GT_Packet_Ores extends GT_Packet {
         this.mMetaData = aMetaData;
     }
 
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(12);
-
-        tOut.writeInt(this.mX);
-        tOut.writeShort(this.mY);
-        tOut.writeInt(this.mZ);
-        tOut.writeShort(this.mMetaData);
-
-        return tOut.toByteArray();
+    @Override
+    public void encode(ByteBuf aOut) {
+        aOut.writeInt(this.mX);
+        aOut.writeShort(this.mY);
+        aOut.writeInt(this.mZ);
+        aOut.writeShort(this.mMetaData);
     }
 
-    public GT_Packet decode(ByteArrayDataInput aData) {
+    @Override
+    public GT_Packet_New decode(ByteArrayDataInput aData) {
         return new GT_Packet_Ores(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort());
     }
 
+    @Override
     public void process(IBlockAccess aWorld) {
         if (aWorld != null) {
             TileEntity tTileEntity = aWorld.getTileEntity(this.mX, this.mY, this.mZ);
@@ -53,6 +51,7 @@ public class GT_Packet_Ores extends GT_Packet {
         }
     }
 
+    @Override
     public byte getPacketID() {
         return 3;
     }