完全修正。

[chemicraft/chemicraft.git] / src / chemicraft / client / ClientProxy.java

diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
index 85fb428..c1cd215 100644 (file)
--- a/src/chemicraft/client/ClientProxy.java
+++ b/src/chemicraft/client/ClientProxy.java
@@ -5,21 +5,22 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
+import chemicraft.debug.DebugTick;
 import chemicraft.entity.EntityAtomsGrenade;
 import chemicraft.gui.GuiChemicalCombinationTable;
 import chemicraft.gui.GuiChemicalCraftingTable;
-import chemicraft.gui.GuiDecompositionTable;
-import chemicraft.gui.GuiElectrolysisTable;
+import chemicraft.gui.GuiPyrolysisTable;
 import chemicraft.gui.GuiToolAndWeaponCraftingTable;
 import chemicraft.render.RenderAtomsGrenade;
 import chemicraft.system.CommonProxy;
 import chemicraft.tileentity.TileEntityChemicalCombinationTable;
 import chemicraft.tileentity.TileEntityChemicalCraftingTable;
-import chemicraft.tileentity.TileEntityDecompositionTable;
-import chemicraft.tileentity.TileEntityElectrolysisTable;
+import chemicraft.tileentity.TileEntityPyrolysisTable;
 import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.registry.TickRegistry;
+import cpw.mods.fml.relauncher.Side;
 
 public class ClientProxy extends CommonProxy {
 
@@ -30,10 +31,9 @@ public class ClientProxy extends CommonProxy {
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiDecompositionTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiElectrolysisTableTexture);
                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 
@@ -44,16 +44,14 @@ public class ClientProxy extends CommonProxy {
                        return null;
 
                TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
-               if (tileEntity instanceof TileEntityDecompositionTable) {
-                       return new GuiDecompositionTable(player, (TileEntityDecompositionTable) tileEntity);
+               if (tileEntity instanceof TileEntityPyrolysisTable) {
+                       return new GuiPyrolysisTable(player, (TileEntityPyrolysisTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCombinationTable){
                        return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
                        return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityElectrolysisTable){
-                       return new GuiElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity);
                }
                return null;
        }
@@ -64,4 +62,9 @@ public class ClientProxy extends CommonProxy {
                return FMLClientHandler.instance().getClient().theWorld;
        }
 
+       @Override
+       public void registerTickHandler() {
+               TickRegistry.registerTickHandler(new DebugTick(), Side.CLIENT);
+       }
+
 }