誰かEntityAtomGrenadeを登録してくれ...

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

diff --git a/src/chemicraft/client/ClientProxy.java b/src/chemicraft/client/ClientProxy.java
index 151937e..6d9c1df 100644 (file)
--- a/src/chemicraft/client/ClientProxy.java
+++ b/src/chemicraft/client/ClientProxy.java
@@ -5,16 +5,19 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import chemicraft.ChemiCraft;
-import chemicraft.CommonProxy;
-import chemicraft.GuiChemicalCombinationTable;
-import chemicraft.GuiDecompositionTable;
-import chemicraft.GuiMaterialCraftingTable;
-import chemicraft.GuiToolAndWeaponCraftingTable;
-import chemicraft.TileEntityChemicalCombinationTable;
-import chemicraft.TileEntityDecompositionTable;
-import chemicraft.TileEntityMaterialCraftingTable;
-import chemicraft.TileEntityToolAndWeaponCraftingTable;
+import chemicraft.entity.EntityAtomGrenade;
+import chemicraft.gui.GuiChemicalCombinationTable;
+import chemicraft.gui.GuiChemicalCraftingTable;
+import chemicraft.gui.GuiDecompositionTable;
+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.TileEntityToolAndWeaponCraftingTable;
 import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class ClientProxy extends CommonProxy {
 
@@ -23,10 +26,12 @@ public class ClientProxy extends CommonProxy {
                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.guiDecompositionTexture);
-               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiMaterialCraftingTexture);
+               MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture);
                MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture);
+               RenderingRegistry.registerEntityRenderingHandler(EntityAtomGrenade.class, new RenderAtomsGrenade(0.5F));
        }
 
 
@@ -42,8 +47,8 @@ public class ClientProxy extends CommonProxy {
                        return new GuiChemicalCombinationTable(player, (TileEntityChemicalCombinationTable) tileEntity);
                }else if(tileEntity instanceof TileEntityToolAndWeaponCraftingTable){
                        return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity);
-               }else if(tileEntity instanceof TileEntityMaterialCraftingTable){
-                       return new GuiMaterialCraftingTable(player, (TileEntityMaterialCraftingTable) tileEntity);
+               }else if(tileEntity instanceof TileEntityChemicalCraftingTable){
+                       return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity);
                }
                return null;
        }