Gui系統全部作りなおすためファイル一新

[chemicraft/chemicraft.git] / common / chemicraft / system / PacketHandler.java

diff --git a/common/chemicraft/system/PacketHandler.java b/common/chemicraft/system/PacketHandler.java
index 608b1bc..7f13fdd 100644 (file)
--- a/common/chemicraft/system/PacketHandler.java
+++ b/common/chemicraft/system/PacketHandler.java
@@ -11,10 +11,7 @@ import net.minecraft.src.Packet250CustomPayload;
 import net.minecraft.src.TileEntity;\r
 import net.minecraft.src.World;\r
 import chemicraft.ChemiCraft;\r
-import chemicraft.tileentity.TileEntityChemicalCombinationTable;\r
-import chemicraft.tileentity.TileEntityDecompositionTable;\r
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;\r
-import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;\r
 \r
 import com.google.common.io.ByteArrayDataInput;\r
 import com.google.common.io.ByteStreams;\r
@@ -38,7 +35,6 @@ public class PacketHandler implements IPacketHandler {
                        World worldClient;\r
                        World worldServer;\r
                        TileEntity var1;\r
-                       TileEntityDecompositionTable var2;\r
 \r
                        // TileEntityのx, y, z座標\r
                        int x, y, z;\r
@@ -48,28 +44,22 @@ public class PacketHandler implements IPacketHandler {
                        y = badi.readInt();\r
                        z = badi.readInt();\r
 \r
-                       worldClient = ChemiCraft.instance.proxy.getClientWorld();\r
+                       worldClient = ChemiCraft.proxy.getClientWorld();\r
                        worldServer = ((EntityPlayer)player).worldObj;\r
                        if(worldClient != null && worldServer == null){\r
                                var1 = worldClient.getBlockTileEntity(x, y, z);\r
-                               if (var1 instanceof TileEntityDecompositionTable) {\r
-                                       var2 = (TileEntityDecompositionTable) var1;\r
-                                       var2.readPacket(badi, (EntityPlayer)player);\r
-                               }\r
                                return;\r
                        }\r
                        if(worldServer != null){\r
                                var1 = worldServer.getBlockTileEntity(x, y, z);\r
-                               if (var1 instanceof TileEntityDecompositionTable) {\r
-                                       var2 = (TileEntityDecompositionTable) var1;\r
-                                       var2.readPacket(badi, (EntityPlayer)player);\r
-                               }\r
-                               return;\r
                        }\r
+                       return;\r
                }\r
        }\r
 \r
 \r
+       /*\r
+        * Commented by mozipi.\r
        public static Packet getPacket(TileEntityDecompositionTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
@@ -77,9 +67,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -111,9 +98,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -145,9 +129,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r
@@ -171,7 +152,7 @@ public class PacketHandler implements IPacketHandler {
                packet.isChunkDataPacket = true;\r
                return packet;\r
        }\r
-\r
+        */\r
        public static Packet getPacket(TileEntityChemicalCraftingTable tileEntity) {\r
                ByteArrayOutputStream var1 = new ByteArrayOutputStream(128);\r
                DataOutputStream var2 = new DataOutputStream(var1);\r
@@ -179,9 +160,6 @@ public class PacketHandler implements IPacketHandler {
                // Blockのx, y, z座標\r
                int x, y, z;\r
 \r
-               // activeTab\r
-               String activeTab;\r
-\r
                // x, y, z座標を代入\r
                x = tileEntity.xCoord;\r
                y = tileEntity.yCoord;\r