パケット関連の修正

Signed-off-by: lilly <lillyo_o@users.sourceforge.jp>

diff --git a/common/chemicraft/CommonProxy.java b/common/chemicraft/CommonProxy.java
index 2ca4e7c..f827ab2 100644 (file)
--- a/common/chemicraft/CommonProxy.java
+++ b/common/chemicraft/CommonProxy.java
@@ -7,32 +7,27 @@ import cpw.mods.fml.common.network.IGuiHandler;
 
 public class CommonProxy implements IGuiHandler {
 
-       public void registerRenderInformation(){}
+    public void registerRenderInformation() {
+    }
 
 
+    @Override
+    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+       if (!world.blockExists(x, y, z))
+           return null;
 
-       @Override
-       public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z){
-               if(!world.blockExists(x, y, z)) return null;
+       TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
 
-               TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-
-               if(tileEntity instanceof TileEntityScienceCraftingTable){
-                       return new ContainerScienceCraftingTable(player.inventory, (TileEntityScienceCraftingTable)tileEntity);
-               }
-               return null;
-       }
-
-
-
-       @Override
-       public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z){
-               return null;
+       if (tileEntity instanceof TileEntityScienceCraftingTable) {
+           return new ContainerScienceCraftingTable(player.inventory, (TileEntityScienceCraftingTable) tileEntity);
        }
+       return null;
+    }
 
 
+    @Override
+    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+       return null;
+    }
 
-       public World getClientWorld(){
-               return null;
-       }
 }
\ No newline at end of file

diff --git a/common/chemicraft/PacketHandler.java b/common/chemicraft/PacketHandler.java
index 7da20a6..e46debf 100644 (file)
--- a/common/chemicraft/PacketHandler.java
+++ b/common/chemicraft/PacketHandler.java
@@ -47,14 +47,6 @@ public class PacketHandler implements IPacketHandler {
            // activeTab読み込み\r
            activeTab = var1.readUTF();\r
 \r
-           // TileEntityを取得し読み込んだデータを送る\r
-           // from Server to Client\r
-           world = ChemiCraft.proxy.getClientWorld();\r
-           tileEntity = world.getBlockTileEntity(x, y, z);\r
-           if (tileEntity instanceof TileEntityScienceCraftingTable) {\r
-               var2 = (TileEntityScienceCraftingTable) tileEntity;\r
-               \r
-           }\r
            // from Client to Server\r
            world = ((EntityPlayer) player).worldObj;\r
            tileEntity = world.getBlockTileEntity(x, y, z);\r

diff --git a/common/chemicraft/TileEntityScienceCraftingTable.java b/common/chemicraft/TileEntityScienceCraftingTable.java
index 3bd80db..515d7fa 100644 (file)
--- a/common/chemicraft/TileEntityScienceCraftingTable.java
+++ b/common/chemicraft/TileEntityScienceCraftingTable.java
@@ -1,5 +1,6 @@
 package chemicraft;
 
+import cpw.mods.fml.common.network.PacketDispatcher;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -56,6 +57,7 @@ public class TileEntityScienceCraftingTable extends TileEntity implements IInven
 
     public void setActiveTab(String activeTab) {
        this.activeTab = activeTab;
+       PacketDispatcher.sendPacketToServer(getDescriptionPacket());
     }
 
 

diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
index b0fb46a..6c0538f 100644 (file)
--- a/src/chemicraft/client/ClientProxy.java
+++ b/src/chemicraft/client/ClientProxy.java
@@ -8,33 +8,24 @@ import chemicraft.GuiScienceCraftingTable;
 import chemicraft.TileEntityScienceCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 
-public class ClientProxy extends CommonProxy
-{
+public class ClientProxy extends CommonProxy {
 
-       @Override
-       public void registerRenderInformation(){}
+    @Override
+    public void registerRenderInformation() {
+    }
 
 
+    @Override
+    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+       if (!world.blockExists(x, y, z))
+           return null;
 
-       @Override
-       public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-       {
-               if(!world.blockExists(x, y, z)) return null;
+       TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
 
-               TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-
-               if(tileEntity instanceof TileEntityScienceCraftingTable){
-                       return new GuiScienceCraftingTable(player.inventory, (TileEntityScienceCraftingTable)tileEntity);
-               }
-               return null;
-       }
-
-
-
-       @Override
-       public World getClientWorld()
-       {
-               return FMLClientHandler.instance().getClient().theWorld;
+       if (tileEntity instanceof TileEntityScienceCraftingTable) {
+           return new GuiScienceCraftingTable(player.inventory, (TileEntityScienceCraftingTable) tileEntity);
        }
+       return null;
+    }
 
 }