summaryrefslogtreecommitdiff
path: root/src/main/java/gmail/Lance5057/proxy
diff options
context:
space:
mode:
authorLance5057 <Lance5057@gmail.com>2015-07-09 01:59:36 -0500
committerLance5057 <Lance5057@gmail.com>2015-07-09 01:59:36 -0500
commite9c02857b01d7c4afe887c612fc3a1a70a973837 (patch)
tree05b2b6af6d2795bea9b8dee9cbdb49b37733d1ff /src/main/java/gmail/Lance5057/proxy
parenta918009626db55c1fc5f359c557f0e848da15f46 (diff)
Worked on the Finishing Anvil
Diffstat (limited to 'src/main/java/gmail/Lance5057/proxy')
-rw-r--r--src/main/java/gmail/Lance5057/proxy/ClientProxy.java8
-rw-r--r--src/main/java/gmail/Lance5057/proxy/CommonProxy.java12
2 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
index 0bae0b8..a1738cb 100644
--- a/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/ClientProxy.java
@@ -2,13 +2,14 @@ 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;
@@ -16,9 +17,10 @@ import tconstruct.client.FlexibleToolRenderer;
import cpw.mods.fml.client.registry.ClientRegistry;
public class ClientProxy extends CommonProxy {
- private static final ModelTinkerArmor tutChest = new ModelTinkerArmor(1.0f);
+ public 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() {
@@ -33,7 +35,7 @@ public class ClientProxy extends CommonProxy {
ClientRegistry.bindTileEntitySpecialRenderer(
TileEntity_CrestMount.class, new Renderer_CrestMount());
ClientRegistry.bindTileEntitySpecialRenderer(
- TileEntity_ArmorAnvil.class, new Renderer_ArmorAnvil());
+ TileEntity_FinishingAnvil.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 5f21484..981ab0f 100644
--- a/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
+++ b/src/main/java/gmail/Lance5057/proxy/CommonProxy.java
@@ -3,7 +3,9 @@ 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;
@@ -40,7 +42,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_ITEM_INV)
+ if (ID == TinkersDefense.GUI_CREST_INV)
{
// Use the player's held item to create the inventory
return new Container_CrestMount(player.inventory, (TileEntity_CrestMount)world.getTileEntity(x, y, z));
@@ -52,12 +54,14 @@ public class CommonProxy implements IGuiHandler {
public Object getClientGuiElement(int ID, EntityPlayer player,
World world, int x, int y, int z)
{
- if (ID == TinkersDefense.GUI_ITEM_INV)
+ if (ID == TinkersDefense.GUI_CREST_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