ChemiCraft.java修正

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

diff --git a/common/chemicraft/client/ClientProxy.java b/common/chemicraft/client/ClientProxy.java
index d001c82..5ec9032 100644 (file)
--- a/common/chemicraft/client/ClientProxy.java
+++ b/common/chemicraft/client/ClientProxy.java
@@ -6,8 +6,19 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
 import chemicraft.debug.DebugTick;
 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.GuiElectrolysisTable;

 import chemicraft.gui.GuiPyrolysisTable;
 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.TileEntityElectrolysisTable;

 import chemicraft.tileentity.TileEntityPyrolysisTable;
 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.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;


@@ -17,14 +28,14 @@ public class ClientProxy extends CommonProxy {
 
        @Override
        public void registerRenderInformation() {
 
        @Override
        public void registerRenderInformation() {

-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.blockChemicalCraftingTableTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemAtomsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_ATOMS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_COMPOUNDS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCOMBINATION_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_PYROLYSIS_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCRAFTING_TEXTURE);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE);

                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 
                RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 


@@ -43,6 +54,8 @@ public class ClientProxy extends CommonProxy {
                        return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
                }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
                        return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                        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;
        }
                }
                return null;
        }