Updated to TiCo 2.6.3

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

4 files changed, 64 insertions, 29 deletions

diff --git a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
index 2728689..45ff00e 100644
--- a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
@@ -2,23 +2,27 @@ package lance5057.tDefense.holiday;
 
 import lance5057.tDefense.holiday.xmas.XmasBase;
 import lance5057.tDefense.util.ModuleBase;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
-public class HolidayBase 
+public class HolidayBase extends ModuleBase
 {
-	ModuleBase xmas;
-	
-	public HolidayBase()
-	{
-		xmas = new XmasBase();
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
-	
-	public void preInit()
-	{
-		xmas.preInit();
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
-	
-	public void init()
-	{
-		xmas.init();
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
index ea6f10e..2c83902 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
@@ -3,21 +3,39 @@ package lance5057.tDefense.holiday.xmas;
 import slimeknights.tconstruct.world.entity.EntityBlueSlime;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.holiday.xmas.gumdropslime.GumDropSlime;
+import lance5057.tDefense.util.ItemsBase;
 import lance5057.tDefense.util.ModuleBase;
 import net.minecraft.world.storage.loot.LootTableList;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
 
 public class XmasBase extends ModuleBase {
+	
+	protected ItemsBase items;
+	
 	public XmasBase() {
 		items = new XmasItems();
 	}
 
 	@Override
-	public void preInit() {
-		
-		items.preInit();
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.preInit(e);
 		EntityRegistry.registerModEntity(GumDropSlime.class, "gumdropslime", 0,
 				TinkersDefense.instance, 64, 5, true, 0x963430, 0xDDDDDD);
 		//LootTableList.register(GumDropSlime.LOOT_TABLE);
 	}
-}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}}
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
index ff51fa0..3ac3d58 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
@@ -3,11 +3,18 @@ package lance5057.tDefense.holiday.xmas;
 import lance5057.tDefense.util.Color16Util;
 import lance5057.tDefense.util.ItemsBase;
 import lance5057.tDefense.util.MetaItem;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import slimeknights.mantle.client.CreativeTab;
 
 public class XmasItems extends ItemsBase {
+	CreativeTab xmas;
+	
 	public static Item item_redmintcane;
 	public static Item item_greenmintcane;
 	public static Item item_redmintIngot;
@@ -16,19 +23,25 @@ public class XmasItems extends ItemsBase {
 
 	public static MetaItem item_gumdrop;
 
-	public void preInit() {
-		setTab("TDefense_Xmas", new ItemStack(Items.SHIELD));
+	public void preInit(FMLPreInitializationEvent e) {
+		xmas = new CreativeTab("TDefense_Xmas", new ItemStack(Items.SHIELD));
 	}
 
-	public void init() {
-		item_redmintcane = register("redmintcane", 64);
-		item_redmintIngot = register("redmintIngot", 64);
-		item_greenmintcane = register("greenmintcane", 64);
-		item_greenmintIngot = register("greenmintIngot", 64);
-		item_gingerbread = register("gingerbread", 64);
+	public void init(FMLInitializationEvent e) {
+		item_redmintcane = register("redmintcane", 64, xmas);
+		item_redmintIngot = register("redmintIngot", 64, xmas);
+		item_greenmintcane = register("greenmintcane", 64, xmas);
+		item_greenmintIngot = register("greenmintIngot", 64, xmas);
+		item_gingerbread = register("gingerbread", 64, xmas);
 		
-		item_gumdrop = registerMeta("gumdrop", Color16Util.colors, 64);
+		item_gumdrop = registerMeta("gumdrop", Color16Util.colors, 64, xmas);
 
-		this.tabName.setDisplayIcon(new ItemStack(item_redmintcane));
+		xmas.setDisplayIcon(new ItemStack(item_redmintcane));
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java b/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
index e6384f6..e17f336 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
@@ -15,7 +15,7 @@ public class GumDropSlimeRenderer extends RenderTinkerSlime
 	public static final Factory FACTORY_GumDropSlime = new Factory();
 	
 	public GumDropSlimeRenderer(RenderManager renderManager) {
-		super(renderManager, Color16Util.colorsHex[Minecraft.getMinecraft().theWorld.rand.nextInt(16)],
+		super(renderManager, Color16Util.colorsHex[Minecraft.getMinecraft().world.rand.nextInt(16)],
 				new ResourceLocation(Reference.MOD_ID,"textures/entity/slime.png"));
 		// TODO Auto-generated constructor stub
 	}