ChemiCraft.java修正

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

diff --git a/common/chemicraft/system/CommonProxy.java b/common/chemicraft/system/CommonProxy.java
index a9bc77c..7edcb3a 100644 (file)
--- a/common/chemicraft/system/CommonProxy.java
+++ b/common/chemicraft/system/CommonProxy.java
@@ -1,11 +1,22 @@
 package chemicraft.system;
 
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.World;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import chemicraft.container.ContainerChemicalCombinationTable;
 import chemicraft.container.ContainerChemicalCraftingTable;
+import chemicraft.container.ContainerElectrolysisTable;
+import chemicraft.container.ContainerPyrolysisTable;
+import chemicraft.container.ContainerToolAndWeaponCraftingTable;
+import chemicraft.debug.DebugTick;
+import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
+import chemicraft.tileentity.TileEntityElectrolysisTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
+import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.common.registry.TickRegistry;
+import cpw.mods.fml.relauncher.Side;
 
 public class CommonProxy implements IGuiHandler {
 
@@ -23,20 +34,16 @@ public class CommonProxy implements IGuiHandler {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               /*
-                * Commented by mozipi.
-               if (tileEntity instanceof TileEntityDecompositionTable) {
-                       return new ContainerDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
+               if(tileEntity instanceof TileEntityChemicalCombinationTable){
                        return new ContainerChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
                        return new ContainerToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
-               }
-                */
-               if (tileEntity instanceof TileEntityChemicalCraftingTable) {
-                       return new ContainerChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
+               }else if(tileEntity instanceof TileEntityElectrolysisTable){
+                       return new ContainerElectrolysisTable(player, (TileEntityElectrolysisTable)tileEntity);
+               } else if(tileEntity instanceof TileEntityPyrolysisTable) {
+                       return new ContainerPyrolysisTable(player, (TileEntityPyrolysisTable)tileEntity);
                }
                return null;
        }
@@ -51,4 +58,8 @@ public class CommonProxy implements IGuiHandler {
                return null;
        }
 
+       public void registerTickHandler() {
+               TickRegistry.registerTickHandler(new DebugTick(), Side.SERVER);
+       }
+
 }
\ No newline at end of file