diff options
Diffstat (limited to 'src/main/java/gmail/Lance5057/proxy')
| -rw-r--r-- | src/main/java/gmail/Lance5057/proxy/ClientProxy.java | 8 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/proxy/CommonProxy.java | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java index a1738cb..0bae0b8 100644 --- a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java +++ b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java @@ -2,14 +2,13 @@ package gmail.Lance5057.proxy; import gmail.Lance5057.TinkersDefense; import gmail.Lance5057.armor.renderers.ModelChainArmor; -import gmail.Lance5057.armor.renderers.ModelClothArmor; import gmail.Lance5057.armor.renderers.ModelSheath; import gmail.Lance5057.armor.renderers.ModelTinkerArmor; import gmail.Lance5057.models.Renderer_ArmorAnvil; import gmail.Lance5057.models.Renderer_CrestMount; import gmail.Lance5057.models.Renderer_JewelersBench; +import gmail.Lance5057.tileentities.TileEntity_ArmorAnvil; import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; import gmail.Lance5057.tileentities.TileEntity_JewelersBench; import net.minecraft.client.model.ModelBiped; import net.minecraftforge.client.MinecraftForgeClient; @@ -17,10 +16,9 @@ import tconstruct.client.FlexibleToolRenderer; import cpw.mods.fml.client.registry.ClientRegistry; public class ClientProxy extends CommonProxy { - public static final ModelTinkerArmor tutChest = new ModelTinkerArmor(1.0f); + private static final ModelTinkerArmor tutChest = new ModelTinkerArmor(1.0f); public static final ModelSheath sheath = new ModelSheath(); public static final ModelChainArmor chain = new ModelChainArmor(0.1f); - public static final ModelClothArmor cloth = new ModelClothArmor(); @Override public void registerRenderers() { @@ -35,7 +33,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer( TileEntity_CrestMount.class, new Renderer_CrestMount()); ClientRegistry.bindTileEntitySpecialRenderer( - TileEntity_FinishingAnvil.class, new Renderer_ArmorAnvil()); + TileEntity_ArmorAnvil.class, new Renderer_ArmorAnvil()); ClientRegistry.bindTileEntitySpecialRenderer( TileEntity_JewelersBench.class, new Renderer_JewelersBench()); diff --git a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java index 981ab0f..5f21484 100644 --- a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java +++ b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java @@ -3,9 +3,7 @@ package gmail.Lance5057.proxy; import gmail.Lance5057.TinkersDefense; import gmail.Lance5057.containers.Container_CrestMount; import gmail.Lance5057.gui.Gui_CrestMount; -import gmail.Lance5057.gui.Gui_FinishingAnvil; import gmail.Lance5057.tileentities.TileEntity_CrestMount; -import gmail.Lance5057.tileentities.TileEntity_FinishingAnvil; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -42,7 +40,7 @@ public class CommonProxy implements IGuiHandler { public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { // Hooray, no 'magic' numbers - we know exactly which Gui this refers to - if (ID == TinkersDefense.GUI_CREST_INV) + if (ID == TinkersDefense.GUI_ITEM_INV) { // Use the player's held item to create the inventory return new Container_CrestMount(player.inventory, (TileEntity_CrestMount)world.getTileEntity(x, y, z)); @@ -54,14 +52,12 @@ public class CommonProxy implements IGuiHandler { public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - if (ID == TinkersDefense.GUI_CREST_INV) + if (ID == TinkersDefense.GUI_ITEM_INV) { + // We have to cast the new container as our custom class + return new Gui_CrestMount(player.inventory, (TileEntity_CrestMount)world.getTileEntity(x, y, z)); } - if (ID == TinkersDefense.GUI_ANVIL_INV) - { - return new Gui_FinishingAnvil(player.inventory, (TileEntity_FinishingAnvil)world.getTileEntity(x, y, z)); - } return null; } }
\ No newline at end of file |