MultiTileEntity

1 files changed, 33 insertions, 27 deletions

diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
index 051be672ab..970b0ca156 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java
@@ -3,21 +3,23 @@ package gregtech.api.net;
 import com.google.common.io.ByteArrayDataInput;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.multitileentity.MultiTileEntityBlock;
 import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 
 public class GT_Packet_TileEntity extends GT_Packet_New {
     private int mX, mZ, mC0, mC1, mC2, mC3, mC4, mC5;
-    private short mY, mID;
+    private short mY, mID, mRID;
     private byte mTexture, mTexturePage, mUpdate, mRedstone, mColor;
 
     public GT_Packet_TileEntity() {
         super(true);
     }
 
-    //For tiles
-    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
+    // For multi tiles
+    public GT_Packet_TileEntity(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);
         mX = aX;
         mY = aY;
@@ -28,6 +30,7 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
         mC3 = aC3;
         mC4 = aC4;
         mC5 = aC5;
+        mRID = aRID;
         mID = aID;
         mTexture = aTexture;
         mTexturePage=aTexturePage;
@@ -36,24 +39,14 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
         mColor = aColor;
     }
 
-    //For pipes
+    // For meta tiles
+    public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5, byte aTexture, byte aTexturePage, byte aUpdate, byte aRedstone, byte aColor) {
+        this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, aTexturePage, aUpdate, aRedstone, aColor);
+    }
+
+    // For pipes
     public GT_Packet_TileEntity(int aX, short aY, int aZ, short aID, int aC0, int aC1, int aC2, int aC3, int aC4, int aC5, byte aTexture, byte aUpdate, byte aRedstone, byte aColor) {
-        super(false);
-        mX = aX;
-        mY = aY;
-        mZ = aZ;
-        mC0 = aC0;
-        mC1 = aC1;
-        mC2 = aC2;
-        mC3 = aC3;
-        mC4 = aC4;
-        mC5 = aC5;
-        mID = aID;
-        mTexture = aTexture;
-        mTexturePage=0;
-        mUpdate = aUpdate;
-        mRedstone = aRedstone;
-        mColor = aColor;
+        this(aX, aY, aZ, (short) 0, aID, aC0, aC1, aC2, aC3, aC4, aC5, aTexture, (byte) 0, aUpdate, aRedstone, aColor);
     }
 
     @Override
@@ -61,6 +54,8 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
         aOut.writeInt(mX);
         aOut.writeShort(mY);
         aOut.writeInt(mZ);
+
+        aOut.writeShort(mRID);
         aOut.writeShort(mID);
 
         aOut.writeInt(mC0);
@@ -79,18 +74,29 @@ public class GT_Packet_TileEntity extends GT_Packet_New {
 
     @Override
     public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_TileEntity(aData.readInt(), aData.readShort(), aData.readInt(), aData.readShort(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readByte(), aData.readByte(), aData.readByte(), aData.readByte(), aData.readByte());
+        return new GT_Packet_TileEntity(
+            // Coords
+            aData.readInt(), aData.readShort(), aData.readInt(),
+            // Registry & ID
+            aData.readShort(), aData.readShort(),
+            // Covers
+            aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(),
+            // Everything else
+            aData.readByte(), aData.readByte(), aData.readByte(), aData.readByte(), aData.readByte()
+        );
     }
 
     @Override
     public void process(IBlockAccess aWorld) {
         if (aWorld != null) {
-            TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ);
-            if (tTileEntity != null) {
-                if (tTileEntity instanceof BaseMetaTileEntity)
-                    ((BaseMetaTileEntity) tTileEntity).receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor);
-                else if (tTileEntity instanceof BaseMetaPipeEntity)
-                    ((BaseMetaPipeEntity) tTileEntity).receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
+            final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ);
+            final Block tBlock;
+            if (tTileEntity instanceof BaseMetaTileEntity)
+                ((BaseMetaTileEntity) tTileEntity).receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor);
+            else if (tTileEntity instanceof BaseMetaPipeEntity)
+                ((BaseMetaPipeEntity) tTileEntity).receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor);
+            else if ((tBlock = aWorld.getBlock(mX, mY, mZ)) instanceof MultiTileEntityBlock) {
+                ((MultiTileEntityBlock)tBlock).receiveMultiTileEntityData(aWorld, mX, mY, mZ, mRID, mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mTexturePage, mUpdate, mRedstone, mColor);
             }
         }
     }