Prelaunch backup

2 files changed, 75 insertions, 54 deletions

diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index dbd2492..2fd44ac 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -1,13 +1,14 @@
 package lance5057.tDefense.proxy;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.renderers.ModelMask;
-import lance5057.tDefense.armor.renderers.ModelSheath;
+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.ModelTinkersGauntlets;
 import lance5057.tDefense.armor.renderers.heavy.ModelTinkersGrieves;
 import lance5057.tDefense.armor.renderers.heavy.ModelTinkersHelm;
 import lance5057.tDefense.armor.renderers.heavy.ModelTinkersSabatons;
@@ -15,13 +16,15 @@ 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.BigFlexibleToolRenderer;
+import lance5057.tDefense.core.renderer.MoreFlexibleToolRenderer;
+import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
+//import lance5057.tDefense.core.renderer.TestSkinChanger;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Renderer_FinishingAnvil;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil;
-import lance5057.tDefense.models.Renderer_JewelersBench;
-import lance5057.tDefense.tileentities.TileEntity_JewelersBench;
 import net.minecraftforge.client.MinecraftForgeClient;
 import tconstruct.client.FlexibleToolRenderer;
 import cpw.mods.fml.client.registry.ClientRegistry;
@@ -29,53 +32,69 @@ import cpw.mods.fml.client.registry.ClientRegistry;
 public class ClientProxy extends CommonProxy
 {
 	//public static final ModelSheath sheath = new ModelSheath();
+	//ModifierSoulHandler						SoulHandler;
 
-	public static ModelMask					mask		= new ModelMask(null);
-	public static ModelSheath				sheath		= new ModelSheath();
+	public static ModelTinkersTabard		sheath;
 
-	public static ModelTinkersHelm			helm		= new ModelTinkersHelm();
-	public static ModelTinkersBreastplate	breastplate	= new ModelTinkersBreastplate();
-	public static ModelTinkersGrieves		grieves		= new ModelTinkersGrieves();
-	public static ModelTinkersSabatons		sabatons	= new ModelTinkersSabatons();
-	public static ModelTinkersGauntlets		gauntlets	= new ModelTinkersGauntlets();
+	public static ModelTinkersHelm			helm;
+	public static ModelTinkersBreastplate	breastplate;
+	public static ModelTinkersGrieves		grieves;
+	public static ModelTinkersSabatons		sabatons;
+	public static ModelTinkersGauntlets		gauntlets;
 
-	public static ModelTinkersHood			hood		= new ModelTinkersHood();
-	public static ModelTinkersShawl			shawl		= new ModelTinkersShawl();
-	public static ModelTinkersRobe			robe		= new ModelTinkersRobe();
-	public static ModelTinkersBoots			shoes		= new ModelTinkersBoots();
+	public static ModelTinkersHood			hood;
+	public static ModelTinkersShawl			shawl;
+	public static ModelTinkersRobe			robe;
+	public static ModelTinkersShoes			shoes;
 
-	public static ModelTinkersCoif			coif		= new ModelTinkersCoif();
-	public static ModelTinkersHauberk		hauberk		= new ModelTinkersHauberk();
-	public static ModelTinkersChausses		chausses	= new ModelTinkersChausses();
-	public static ModelTinkersBoots			boots		= new ModelTinkersBoots();
+	public static ModelTinkersCoif			coif;
+	public static ModelTinkersHauberk		hauberk;
+	public static ModelTinkersChausses		chausses;
+	public static ModelTinkersBoots			boots;
 
 	@Override
 	public void registerRenderers()
 	{
-		FlexibleToolRenderer renderer = new FlexibleToolRenderer();
-		FlexibleToolRenderer bigrenderer = new BigFlexibleToolRenderer();
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_roundShield, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_heaterShield, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_wrench, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_shears, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_zweihander, bigrenderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.tool_sheath, renderer);
+		SoulHandler = new ModifierSoulHandler(2, "Steve");
 
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerHelm, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerBreastplate, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerGrieves, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerSabatons, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerGauntlets, renderer);
+		sheath = new ModelTinkersTabard();
 
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerRobe, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerShawl, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerHood, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerShoes, renderer);
+		helm = new ModelTinkersHelm();
+		breastplate = new ModelTinkersBreastplate();
+		grieves = new ModelTinkersGrieves();
+		sabatons = new ModelTinkersSabatons();
+		gauntlets = new ModelTinkersGauntlets();
 
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerCoif, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerHalberd, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerChausses, renderer);
-		MinecraftForgeClient.registerItemRenderer(TinkersDefense.armor_TinkerBoots, renderer);
+		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());
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index 7b39954..0caa0e0 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -4,6 +4,8 @@ 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.gui.GuiTDGuideBook;
+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;
@@ -15,6 +17,8 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 
 public class CommonProxy implements IGuiHandler
 {
+	public static ModifierSoulHandler	SoulHandler	= null;
+
 	public void registerRenderers()
 	{
 	}
@@ -43,13 +47,11 @@ public class CommonProxy implements IGuiHandler
 	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));
-		}
+			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 new Container_FinishingAnvil(player.inventory,
+					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
 
 		return null;
 	}
@@ -58,13 +60,13 @@ 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)
-		{
-			return new Gui_CrestMount(player.inventory, (TileEntity_CrestMount) world.getTileEntity(x, y, z));
-		}
+			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 new Gui_FinishingAnvil(player.inventory,
+					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+		if(ID == TinkersDefense.GUI_GUIDEBOOK)
+			return new GuiTDGuideBook();
 		return null;
 	}
 }