Updated to TiCo 2.6.3

Added Zweihander
Partially added Sheathe
Partially added Crest Mount
Partially added materials

1 files changed, 29 insertions, 3 deletions

diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 278bd83..800ba02 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -2,6 +2,8 @@ package lance5057.tDefense.proxy;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TD_Commands;
+import lance5057.tDefense.baubles.BaublesClientProxy;
+import lance5057.tDefense.core.CoreClientProxy;
 import lance5057.tDefense.core.CoreItems;
 import lance5057.tDefense.core.tools.TDTools;
 import lance5057.tDefense.holiday.HolidayClientProxy;
@@ -39,10 +41,15 @@ public class ClientProxy extends CommonProxy
 //	public static ModelTinkersChausses		chausses;
 //	public static ModelTinkersBoots			boots;
 	
+	public static BaublesClientProxy baubles = new BaublesClientProxy();;
+	
 	ToolBuildGuiInfo roundshieldGUI;
 	ToolBuildGuiInfo heatershieldGUI;
 	
-	HolidayClientProxy holiProxy = new HolidayClientProxy();
+	ToolBuildGuiInfo zweihanderGUI;
+	
+	public static CoreClientProxy coreProxy = new CoreClientProxy();
+	public static HolidayClientProxy holiProxy = new HolidayClientProxy();
 	
 	@Override
 	public void preInit()
@@ -50,10 +57,12 @@ public class ClientProxy extends CommonProxy
 		ClientCommandHandler.instance.registerCommand(new TD_Commands());
 		registerToolRenderers();
 		
+		coreProxy.preInit();
+		baubles.preInit();
 	}
 	
 	@Override
-	public void Init()
+	public void init()
 	{
 //		Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
 //	    .register(TDTools.heatershield, 0, new ModelResourceLocation("modid:itemname", "inventory"));
@@ -67,14 +76,16 @@ public class ClientProxy extends CommonProxy
 		registerItemRenderer(CoreItems.item_dogbeariumIngot, 0, CoreItems.item_dogbeariumIngot.getUnlocalizedName());
 		registerItemRenderer(CoreItems.item_queensgoldIngot, 0, CoreItems.item_queensgoldIngot.getUnlocalizedName());
 		
+		coreProxy.init();
 		holiProxy.Init();
+		baubles.init();
 	}
 	
 	public void registerToolRenderers()
 	{
 		ModelRegisterUtil.registerToolModel(TDTools.roundshield);
 		ModelRegisterUtil.registerToolModel(TDTools.heatershield);
-		
+		ModelRegisterUtil.registerToolModel(TDTools.zweihander);
 		
 	}
 	
@@ -82,6 +93,7 @@ public class ClientProxy extends CommonProxy
 	{
 		roundshieldGUI = new ToolBuildGuiInfo(TDTools.roundshield);
 		heatershieldGUI = new ToolBuildGuiInfo(TDTools.heatershield);
+		zweihanderGUI = new ToolBuildGuiInfo(TDTools.zweihander);
 	}
 	
 	public void setupToolGuis()
@@ -94,18 +106,26 @@ public class ClientProxy extends CommonProxy
 		heatershieldGUI.addSlotPosition(25, 33+8);
 		heatershieldGUI.addSlotPosition(43, 33+8);
 		heatershieldGUI.addSlotPosition(34, 51+8);
+		
+		zweihanderGUI.addSlotPosition(34, 15+8);
+		zweihanderGUI.addSlotPosition(25, 33+8);
+		zweihanderGUI.addSlotPosition(43, 33+8);
+		zweihanderGUI.addSlotPosition(34, 51+8);
 	}
 	
 	public void registerToolGuis()
 	{
 		TinkerRegistryClient.addToolBuilding(roundshieldGUI);
 		TinkerRegistryClient.addToolBuilding(heatershieldGUI);
+		TinkerRegistryClient.addToolBuilding(zweihanderGUI);
 	}
 	
 	@Override
 	public void reloadRenderers()
 	{
 		setToolGuis();
+		
+		baubles.reloadRenderers();
 	}
 	
 	public void setToolGuis()
@@ -120,6 +140,12 @@ public class ClientProxy extends CommonProxy
 		heatershieldGUI.addSlotPosition(25, 33);
 		heatershieldGUI.addSlotPosition(43, 33);
 		heatershieldGUI.addSlotPosition(34, 51);
+		
+		zweihanderGUI.positions.clear();
+		zweihanderGUI.addSlotPosition(34, 15);
+		zweihanderGUI.addSlotPosition(25, 33);
+		zweihanderGUI.addSlotPosition(43, 33);
+		zweihanderGUI.addSlotPosition(34, 51);
 	}
 	
 	 public static void registerItemRenderer(Item item, int meta, String id) {