Hopefully this unfucks whatever got fucked.

2 files changed, 166 insertions, 152 deletions

diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 9234dc0..278bd83 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -1,113 +1,128 @@
 package lance5057.tDefense.proxy;
 
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDArmorAddon;
-import lance5057.tDefense.armor.renderers.ModelTinkersGauntlets;
-import lance5057.tDefense.armor.renderers.ModelTinkersTabard;
-import lance5057.tDefense.armor.renderers.cloth.ModelTinkersHood;
-import lance5057.tDefense.armor.renderers.cloth.ModelTinkersRobe;
-import lance5057.tDefense.armor.renderers.cloth.ModelTinkersShawl;
-import lance5057.tDefense.armor.renderers.cloth.ModelTinkersShoes;
-import lance5057.tDefense.armor.renderers.heavy.ModelTinkersBreastplate;
-import lance5057.tDefense.armor.renderers.heavy.ModelTinkersGrieves;
-import lance5057.tDefense.armor.renderers.heavy.ModelTinkersHelm;
-import lance5057.tDefense.armor.renderers.heavy.ModelTinkersSabatons;
-import lance5057.tDefense.armor.renderers.light.ModelTinkersBoots;
-import lance5057.tDefense.armor.renderers.light.ModelTinkersChausses;
-import lance5057.tDefense.armor.renderers.light.ModelTinkersCoif;
-import lance5057.tDefense.armor.renderers.light.ModelTinkersHauberk;
-import lance5057.tDefense.baubles.models.Renderer_JewelersBench;
-import lance5057.tDefense.baubles.tileentities.TileEntity_JewelersBench;
-import lance5057.tDefense.core.blocks.crestMount.Renderer_CrestMount;
-import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
-import lance5057.tDefense.core.renderer.MoreFlexibleToolRenderer;
-import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
+import lance5057.tDefense.Reference;
+import lance5057.tDefense.TD_Commands;
+import lance5057.tDefense.core.CoreItems;
+import lance5057.tDefense.core.tools.TDTools;
+import lance5057.tDefense.holiday.HolidayClientProxy;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.item.Item;
+import net.minecraftforge.client.ClientCommandHandler;
+import net.minecraftforge.client.model.ModelLoader;
+import slimeknights.tconstruct.common.ModelRegisterUtil;
+import slimeknights.tconstruct.library.TinkerRegistryClient;
+import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
+
 //import lance5057.tDefense.core.renderer.TestSkinChanger;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Renderer_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil;
-import net.minecraftforge.client.MinecraftForgeClient;
-import tconstruct.client.FlexibleToolRenderer;
-import cpw.mods.fml.client.registry.ClientRegistry;
 
-public class ClientProxy extends CommonProxy
+public class ClientProxy extends CommonProxy 
 {
+	//static final ToolModelLoader toolmodel = new ToolModelLoader();
 	//public static final ModelSheath sheath = new ModelSheath();
 	//ModifierSoulHandler						SoulHandler;
 
-	public static ModelTinkersTabard		sheath;
-
-	public static ModelTinkersHelm			helm;
-	public static ModelTinkersBreastplate	breastplate;
-	public static ModelTinkersGrieves		grieves;
-	public static ModelTinkersSabatons		sabatons;
-	public static ModelTinkersGauntlets		gauntlets;
-
-	public static ModelTinkersHood			hood;
-	public static ModelTinkersShawl			shawl;
-	public static ModelTinkersRobe			robe;
-	public static ModelTinkersShoes			shoes;
-
-	public static ModelTinkersCoif			coif;
-	public static ModelTinkersHauberk		hauberk;
-	public static ModelTinkersChausses		chausses;
-	public static ModelTinkersBoots			boots;
-
+//	public static ModelTinkersTabard		sheath;
+//
+//	public static ModelTinkersHelm			helm;
+//	public static ModelTinkersBreastplate	breastplate;
+//	public static ModelTinkersGrieves		grieves;
+//	public static ModelTinkersSabatons		sabatons;
+//	public static ModelTinkersGauntlets		gauntlets;
+//
+//	public static ModelTinkersHood			hood;
+//	public static ModelTinkersShawl			shawl;
+//	public static ModelTinkersRobe			robe;
+//	public static ModelTinkersShoes			shoes;
+//
+//	public static ModelTinkersCoif			coif;
+//	public static ModelTinkersHauberk		hauberk;
+//	public static ModelTinkersChausses		chausses;
+//	public static ModelTinkersBoots			boots;
+	
+	ToolBuildGuiInfo roundshieldGUI;
+	ToolBuildGuiInfo heatershieldGUI;
+	
+	HolidayClientProxy holiProxy = new HolidayClientProxy();
+	
 	@Override
-	public void registerRenderers()
+	public void preInit()
 	{
-		SoulHandler = new ModifierSoulHandler(2, "Steve");
-
-		sheath = new ModelTinkersTabard();
-
-		helm = new ModelTinkersHelm();
-		breastplate = new ModelTinkersBreastplate();
-		grieves = new ModelTinkersGrieves();
-		sabatons = new ModelTinkersSabatons();
-		gauntlets = new ModelTinkersGauntlets();
-
-		hood = new ModelTinkersHood();
-		shawl = new ModelTinkersShawl();
-		robe = new ModelTinkersRobe();
-		shoes = new ModelTinkersShoes();
-
-		coif = new ModelTinkersCoif();
-		hauberk = new ModelTinkersHauberk();
-		chausses = new ModelTinkersChausses();
-		boots = new ModelTinkersBoots();
-
-		//		final FlexibleToolRenderer renderer = new FlexibleToolRenderer();
-		//		final FlexibleToolRenderer bigrenderer = new MoreFlexibleToolRenderer(2);
-		//		final FlexibleToolRenderer smallrenderer = new MoreFlexibleToolRenderer(
-		//				1.0f);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_roundShield, new MoreFlexibleToolRenderer(
-				0.75f, 0.0f, 0.2f, 0f));
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_heaterShield, new FlexibleToolRenderer());
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_wrench, new FlexibleToolRenderer());
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_shears, new FlexibleToolRenderer());
-		//MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_hookshot, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_zweihander, new MoreFlexibleToolRenderer(
-				1.5f, -0.325f, -0.025f, 0f));
-		//MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_hookshot, renderer);
-
-		//RenderingRegistry.registerEntityRenderingHandler(EntityHookshotHook.class, new HookRenderer());
-
-		if(TinkersDefense.config.ArmorAddon)
-		{
-			TDArmorAddon.clientProxy(new FlexibleToolRenderer());
-		}
-
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_CrestMount.class, new Renderer_CrestMount());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_FinishingAnvil.class, new Renderer_FinishingAnvil());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_JewelersBench.class, new Renderer_JewelersBench());
-
-		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
-		//				TinkersDefense.block_ArmorAnvil), new CustomModelItemRenderer(
-		//				new Renderer_FinishingAnvil(), new TileEntity_FinishingAnvil()));
-		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
-		//				TinkersDefense.block_CrestMount), new CustomModelItemRenderer(
-		//				new Renderer_CrestMount(), new TileEntity_CrestMount()));
-		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
-		//				TinkersDefense.block_JewelersBench), new CustomModelItemRenderer(
-		//				new Renderer_JewelersBench(), new TileEntity_JewelersBench()));
+		ClientCommandHandler.instance.registerCommand(new TD_Commands());
+		registerToolRenderers();
+		
+	}
+	
+	@Override
+	public void Init()
+	{
+//		Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
+//	    .register(TDTools.heatershield, 0, new ModelResourceLocation("modid:itemname", "inventory"));
+//		
+		
+		createToolGuis();
+		setupToolGuis();
+		registerToolGuis();
+		
+		registerItemRenderer(CoreItems.item_aeonsteelIngot, 0, CoreItems.item_aeonsteelIngot.getUnlocalizedName());
+		registerItemRenderer(CoreItems.item_dogbeariumIngot, 0, CoreItems.item_dogbeariumIngot.getUnlocalizedName());
+		registerItemRenderer(CoreItems.item_queensgoldIngot, 0, CoreItems.item_queensgoldIngot.getUnlocalizedName());
+		
+		holiProxy.Init();
+	}
+	
+	public void registerToolRenderers()
+	{
+		ModelRegisterUtil.registerToolModel(TDTools.roundshield);
+		ModelRegisterUtil.registerToolModel(TDTools.heatershield);
+		
+		
+	}
+	
+	public void createToolGuis()
+	{
+		roundshieldGUI = new ToolBuildGuiInfo(TDTools.roundshield);
+		heatershieldGUI = new ToolBuildGuiInfo(TDTools.heatershield);
+	}
+	
+	public void setupToolGuis()
+	{
+		roundshieldGUI.addSlotPosition(34, 15+8);
+		roundshieldGUI.addSlotPosition(34, 33+8);
+		roundshieldGUI.addSlotPosition(34, 51+8);
+		
+		heatershieldGUI.addSlotPosition(34, 15+8);
+		heatershieldGUI.addSlotPosition(25, 33+8);
+		heatershieldGUI.addSlotPosition(43, 33+8);
+		heatershieldGUI.addSlotPosition(34, 51+8);
+	}
+	
+	public void registerToolGuis()
+	{
+		TinkerRegistryClient.addToolBuilding(roundshieldGUI);
+		TinkerRegistryClient.addToolBuilding(heatershieldGUI);
+	}
+	
+	@Override
+	public void reloadRenderers()
+	{
+		setToolGuis();
+	}
+	
+	public void setToolGuis()
+	{
+		roundshieldGUI.positions.clear();
+		roundshieldGUI.addSlotPosition(34, 15);
+		roundshieldGUI.addSlotPosition(34, 33);
+		roundshieldGUI.addSlotPosition(34, 51);
+		
+		heatershieldGUI.positions.clear();
+		heatershieldGUI.addSlotPosition(34, 15);
+		heatershieldGUI.addSlotPosition(25, 33);
+		heatershieldGUI.addSlotPosition(43, 33);
+		heatershieldGUI.addSlotPosition(34, 51);
 	}
+	
+	 public static void registerItemRenderer(Item item, int meta, String id) {
+		 ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(Reference.MOD_ID + ":" + id, "inventory"));
+		 }
 }
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index 643b068..a76da7b 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -1,69 +1,68 @@
 package lance5057.tDefense.proxy;
 
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount;
-import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount;
-import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
-import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Container_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Gui_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import lance5057.tDefense.TD_Commands;
+import net.minecraftforge.client.ClientCommandHandler;
 
-public class CommonProxy implements IGuiHandler
-{
-	public static ModifierSoulHandler	SoulHandler	= null;
-
-	public void registerRenderers()
-	{
-	}
 
-	public void registerTileEntitySpecialRenderer()
+public class CommonProxy// implements IGuiHandler
+{
+	//public static ModifierSoulHandler	SoulHandler	= null;
+	
+	public void preInit()
 	{
-
 	}
 
-	public EntityPlayer getPlayerEntity(MessageContext ctx)
+	public void Init()
 	{
-		return ctx.getServerHandler().playerEntity;
 	}
 
-	public ModelBiped getArmorModel(int id)
+	public void registerTileEntitySpecialRenderer()
 	{
-		return null;
-	}
 
-	public World getClientWorld()
-	{
-		return null;
 	}
-
-	@Override
-	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	
+	public void reloadRenderers()
 	{
-		if(ID == TinkersDefense.GUI_CREST_INV)
-			return new Container_CrestMount(player.inventory,
-					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
-		if(ID == TinkersDefense.GUI_ANVIL_INV)
-			return new Container_FinishingAnvil(player.inventory,
-					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
 
-		return null;
 	}
 
-	@Override
-	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-	{
-		if(ID == TinkersDefense.GUI_CREST_INV)
-			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;
-	}
+//	public EntityPlayer getPlayerEntity(MessageContext ctx)
+//	{
+//		return ctx.getServerHandler().playerEntity;
+//	}
+//
+//	public ModelBiped getArmorModel(int id)
+//	{
+//		return null;
+//	}
+//
+//	public World getClientWorld()
+//	{
+//		return null;
+//	}
+//
+//	@Override
+//	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+//	{
+//		if(ID == TinkersDefense.GUI_CREST_INV)
+//			return new Container_CrestMount(player.inventory,
+//					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
+//		if(ID == TinkersDefense.GUI_ANVIL_INV)
+//			return new Container_FinishingAnvil(player.inventory,
+//					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+//
+//		return null;
+//	}
+//
+//	@Override
+//	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+//	{
+//		if(ID == TinkersDefense.GUI_CREST_INV)
+//			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;
+//	}
 }