Kinda forgot to update github...

11 files changed, 321 insertions, 25 deletions

diff --git a/src/main/java/gmail/Lance5057/TinkersDefense.java b/src/main/java/gmail/Lance5057/TinkersDefense.java
index d125e72..5541e07 100644
--- a/src/main/java/gmail/Lance5057/TinkersDefense.java
+++ b/src/main/java/gmail/Lance5057/TinkersDefense.java
@@ -3,15 +3,19 @@ package gmail.Lance5057;
 import static net.minecraft.util.EnumChatFormatting.DARK_RED;
 import static net.minecraft.util.EnumChatFormatting.GOLD;
 import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE;
+import gmail.Lance5057.armor.blocks.ArmorAnvil;
 import gmail.Lance5057.blocks.AeonSteelBlock;
-import gmail.Lance5057.blocks.ArmorAnvil;
 import gmail.Lance5057.blocks.CrestMount;
 import gmail.Lance5057.blocks.DogbeariumBlock;
 import gmail.Lance5057.blocks.JewelersBench;
 import gmail.Lance5057.blocks.QueensGoldBlock;
 import gmail.Lance5057.items.AeonSteelIngot;
+import gmail.Lance5057.items.Crest_Feathers;
 import gmail.Lance5057.items.DogbeariumIngot;
 import gmail.Lance5057.items.HeaterShield;
+import gmail.Lance5057.items.Item_Cloth;
+import gmail.Lance5057.items.Item_Glowthread;
+import gmail.Lance5057.items.Item_Thread;
 import gmail.Lance5057.items.QueensGoldIngot;
 import gmail.Lance5057.items.RoundShield;
 import gmail.Lance5057.liquids.moltenAeonsteelFluid;
@@ -98,6 +102,13 @@ public static Block block_ArmorAnvil;
 public static Block block_JewelersBench;
 
 public static Item item_TinkerArmor;
+public static Item item_Crest_Feathers;
+public static Item item_Crest_Blades;
+
+public static Item item_thread;
+public static Item item_glowthread;
+public static Item item_cloth;
+
 
 @SidedProxy(clientSide = "gmail.Lance5057.proxy.ClientProxy", serverSide = "gmail.Lance5057.proxy.CommonProxy")
 public static CommonProxy proxy;
@@ -234,11 +245,32 @@ public void preInit(FMLPreInitializationEvent e)
     tool_roundShield = new RoundShield();
     tool_heaterShield = new HeaterShield();
     
+	item_Crest_Feathers = new Item()
+	.setCreativeTab(tabName)
+	.setMaxStackSize(1)
+	.setUnlocalizedName("Crest_Feathers")
+	.setTextureName(Reference.MOD_ID+":Crest_feather");
+	
+	GameRegistry.registerItem(item_Crest_Feathers, "Crest of Feathers");
+	GameRegistry.addRecipe(new ItemStack(item_Crest_Feathers), new Object[] {"---", "f-f","-o-", 'f', Items.feather, 'o', Items.iron_ingot});
+	
+	item_Crest_Blades = new Item()
+	.setCreativeTab(tabName)
+	.setMaxStackSize(1)
+	.setUnlocalizedName("Crest_Blades")
+	.setTextureName(Reference.MOD_ID+":Crest_blades");
+	
+	GameRegistry.registerItem(item_Crest_Blades, "Crest of Blades");
+	GameRegistry.addRecipe(new ItemStack(item_Crest_Blades), new Object[] {"---", "f-f","-o-", 'f', Items.iron_sword, 'o', Items.diamond});
+
     GameRegistry.registerItem(tool_roundShield, "Round Shield");
     GameRegistry.registerItem(tool_heaterShield, "Heater Shield");
     TConstructRegistry.addItemToDirectory("Round Shield", tool_roundShield);
     TConstructRegistry.addItemToDirectory("Heater Shield", tool_heaterShield);  
     
+    GameRegistry.registerItem(item_thread = new Item_Thread(), "thread");
+    GameRegistry.registerItem(item_glowthread = new Item_Glowthread(), "glowthread");
+    GameRegistry.registerItem(item_cloth = new Item_Cloth(), "cloth");
     //Renderers
   	proxy.registerRenderers();
     
diff --git a/src/main/java/gmail/Lance5057/blocks/ArmorAnvil.java b/src/main/java/gmail/Lance5057/armor/blocks/ArmorAnvil.java
index 1c9b153..c6aa286 100644
--- a/src/main/java/gmail/Lance5057/blocks/ArmorAnvil.java
+++ b/src/main/java/gmail/Lance5057/armor/blocks/ArmorAnvil.java
@@ -1,5 +1,7 @@
-package gmail.Lance5057.blocks;
+package gmail.Lance5057.armor.blocks;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gmail.Lance5057.tileentities.TileEntity_ArmorAnvil;
 import gmail.Lance5057.tileentities.TileEntity_CrestMount;
 import net.minecraft.block.Block;
@@ -34,9 +36,10 @@ public class ArmorAnvil extends Block implements ITileEntityProvider
 	}
 	
 	//This is the icon to use for showing the block in your hand.
-	public void registerIcons(IIconRegister icon) {
-		//TODO fix the icon
-	        this.blockIcon = icon.registerIcon("tinkersdefense:textures/items/QueensGoldIngot.png");
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister icon) {
+	        this.blockIcon = icon.registerIcon("tinkersdefense:WIP");
 	}
 	
 	@Override
diff --git a/src/main/java/gmail/Lance5057/blocks/CrestMount.java b/src/main/java/gmail/Lance5057/blocks/CrestMount.java
index d78a216..ccac070 100644
--- a/src/main/java/gmail/Lance5057/blocks/CrestMount.java
+++ b/src/main/java/gmail/Lance5057/blocks/CrestMount.java
@@ -9,6 +9,8 @@ import gmail.Lance5057.tileentities.TileEntity_CrestMount;
 
 import java.util.Random;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -106,8 +108,10 @@ public class CrestMount extends BlockContainer {
     }
    
     //This is the icon to use for showing the block in your hand.
-    public void registerIcons(IIconRegister icon) {
-            this.blockIcon = icon.registerIcon("tinkersdefense:textures/items/QueensGoldIngot.png");
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister icon) {
+            this.blockIcon = icon.registerIcon("tinkersdefense:Item_CrestMount");
     }
 
 	@Override
diff --git a/src/main/java/gmail/Lance5057/blocks/JewelersBench.java b/src/main/java/gmail/Lance5057/blocks/JewelersBench.java
index af9ca1c..8f7580c 100644
--- a/src/main/java/gmail/Lance5057/blocks/JewelersBench.java
+++ b/src/main/java/gmail/Lance5057/blocks/JewelersBench.java
@@ -1,5 +1,7 @@
 package gmail.Lance5057.blocks;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gmail.Lance5057.tileentities.TileEntity_JewelersBench;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
@@ -33,9 +35,10 @@ public class JewelersBench extends Block implements ITileEntityProvider
 	}
 	
 	//This is the icon to use for showing the block in your hand.
-	public void registerIcons(IIconRegister icon) {
-		//TODO fix the icon
-	        this.blockIcon = icon.registerIcon("tinkersdefense:textures/items/QueensGoldIngot.png");
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister icon) {
+	        this.blockIcon = icon.registerIcon("tinkersdefense:WIP");
 	}
 	
 	@Override
diff --git a/src/main/java/gmail/Lance5057/items/Crest_Feathers.java b/src/main/java/gmail/Lance5057/items/Crest_Feathers.java
new file mode 100644
index 0000000..29b2bbf
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/Crest_Feathers.java
@@ -0,0 +1,5 @@
+package gmail.Lance5057.items;
+
+public class Crest_Feathers {
+
+}
diff --git a/src/main/java/gmail/Lance5057/items/HeaterShield.java b/src/main/java/gmail/Lance5057/items/HeaterShield.java
index fe97305..99cbd77 100644
--- a/src/main/java/gmail/Lance5057/items/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/items/HeaterShield.java
@@ -25,7 +25,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 
-public class HeaterShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
+public class HeaterShield extends Shield 
 {
 	int induceDamage = 0;
 public HeaterShield()
diff --git a/src/main/java/gmail/Lance5057/items/Item_Cloth.java b/src/main/java/gmail/Lance5057/items/Item_Cloth.java
new file mode 100644
index 0000000..945fc9a
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/Item_Cloth.java
@@ -0,0 +1,52 @@
+package gmail.Lance5057.items;
+
+import gmail.Lance5057.TinkersDefense;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class Item_Cloth extends Item 
+{
+	public IIcon[] icons = new IIcon[16];
+	public static final String[] colors = new String[] {"black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "grey", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"};
+	
+	public Item_Cloth()
+	{
+		super();
+		this.setHasSubtypes(true);
+		this.setUnlocalizedName("Cloth");
+		this.setCreativeTab(TinkersDefense.tabName);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {
+	    for (int i = 0; i < 16; i ++) {
+	        this.icons[i] = reg.registerIcon("tinkersdefense:" + colors[i] + "_cloth" );
+	    }
+	}
+	
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+	    if (meta > 15)
+	        meta = 0;
+
+	    return this.icons[meta];
+	}
+	
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+	    for (int i = 0; i < 16; i ++) {
+	        list.add(new ItemStack(item, 1, i));
+	    }
+	}
+	
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+	    return colors[stack.getItemDamage()] + "_" + this.getUnlocalizedName();
+	}
+}
diff --git a/src/main/java/gmail/Lance5057/items/Item_Glowthread.java b/src/main/java/gmail/Lance5057/items/Item_Glowthread.java
new file mode 100644
index 0000000..39c5ce4
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/Item_Glowthread.java
@@ -0,0 +1,52 @@
+package gmail.Lance5057.items;
+
+import gmail.Lance5057.TinkersDefense;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class Item_Glowthread extends Item 
+{
+	public IIcon[] icons = new IIcon[16];
+	public static final String[] colors = new String[] {"black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "grey", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"};
+	
+	public Item_Glowthread()
+	{
+		super();
+		this.setHasSubtypes(true);
+		this.setUnlocalizedName("GlowThread");
+		this.setCreativeTab(TinkersDefense.tabName);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {
+	    for (int i = 0; i < 16; i ++) {
+	        this.icons[i] = reg.registerIcon("tinkersdefense:" + colors[i] + "_glowthread" );
+	    }
+	}
+	
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+	    if (meta > 15)
+	        meta = 0;
+
+	    return this.icons[meta];
+	}
+	
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+	    for (int i = 0; i < 16; i ++) {
+	        list.add(new ItemStack(item, 1, i));
+	    }
+	}
+	
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+	    return colors[stack.getItemDamage()] + "_" + this.getUnlocalizedName();
+	}
+}
diff --git a/src/main/java/gmail/Lance5057/items/Item_Thread.java b/src/main/java/gmail/Lance5057/items/Item_Thread.java
new file mode 100644
index 0000000..9277974
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/Item_Thread.java
@@ -0,0 +1,52 @@
+package gmail.Lance5057.items;
+
+import gmail.Lance5057.TinkersDefense;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class Item_Thread extends Item 
+{
+	public IIcon[] icons = new IIcon[16];
+	public static final String[] colors = new String[] {"black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "grey", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"};
+	
+	public Item_Thread()
+	{
+		super();
+		this.setHasSubtypes(true);
+		this.setUnlocalizedName("Thread");
+		this.setCreativeTab(TinkersDefense.tabName);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {
+	    for (int i = 0; i < 16; i ++) {
+	        this.icons[i] = reg.registerIcon("tinkersdefense:" + colors[i] + "_thread" );
+	    }
+	}
+	
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+	    if (meta > 15)
+	        meta = 0;
+
+	    return this.icons[meta];
+	}
+	
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+	    for (int i = 0; i < 16; i ++) {
+	        list.add(new ItemStack(item, 1, i));
+	    }
+	}
+	
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+	    return colors[stack.getItemDamage()] + "_" + this.getUnlocalizedName();
+	}
+}
diff --git a/src/main/java/gmail/Lance5057/items/RoundShield.java b/src/main/java/gmail/Lance5057/items/RoundShield.java
index 59687ef..da59e6b 100644
--- a/src/main/java/gmail/Lance5057/items/RoundShield.java
+++ b/src/main/java/gmail/Lance5057/items/RoundShield.java
@@ -27,7 +27,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import tconstruct.library.tools.*;
 import tconstruct.tools.TinkerTools;
-public class RoundShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
+public class RoundShield extends Shield
 {
 	int induceDamage = 0;
 public RoundShield()
diff --git a/src/main/java/gmail/Lance5057/items/Shield.java b/src/main/java/gmail/Lance5057/items/Shield.java
index acf05fb..85e6864 100644
--- a/src/main/java/gmail/Lance5057/items/Shield.java
+++ b/src/main/java/gmail/Lance5057/items/Shield.java
@@ -2,15 +2,22 @@ package gmail.Lance5057.items;
 
 import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.relauncher.*;
+import mods.battlegear2.api.IEnchantable;
+import mods.battlegear2.api.ISheathed;
+import mods.battlegear2.api.shield.IArrowCatcher;
+import mods.battlegear2.api.shield.IArrowDisplay;
+import mods.battlegear2.api.shield.IShield;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.*;
+import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
-public abstract class Shield extends ToolCore
+public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
 {
 public Shield(int baseDamage)
 {
@@ -95,27 +102,113 @@ return web;
 @SideOnly(Side.CLIENT)
 public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5)
 {
-super.onUpdate(stack, world, entity, par4, par5);
-if (entity instanceof EntityPlayerSP)
-{
-EntityPlayerSP player = (EntityPlayerSP) entity;
-ItemStack usingItem = player.getItemInUse();
-if (usingItem != null && usingItem.getItem() == this)
-{
-player.movementInput.moveForward *= 2.5F;
-player.movementInput.moveStrafe *= 2.5F;
-}
-}
+	super.onUpdate(stack, world, entity, par4, par5);
+	if (entity instanceof EntityPlayerSP)
+	{
+		EntityPlayerSP player = (EntityPlayerSP) entity;
+		ItemStack usingItem = player.getItemInUse();
+		if (usingItem != null && usingItem.getItem() == this)
+		{
+			player.movementInput.moveForward *= 2.5F;
+			player.movementInput.moveStrafe *= 2.5F;
+		}
+	}
 }
 @Override
 public String[] getTraits ()
 {
-return new String[] { "Shield", "melee" };
+return new String[] { "shield", "melee" };
 }
 public static Material[] web = new Material[] { Material.web, Material.cloth, Material.coral, Material.cake };
 public static Material[] none = new Material[0];
+
 protected String getHarvestType() {
 	// TODO Auto-generated method stub
 	return null;
 }
+@Override
+public int getArrowCount(ItemStack arg0) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public void setArrowCount(ItemStack arg0, int arg1) {
+	// TODO Auto-generated method stub
+	
+}
+@Override
+public boolean catchArrow(ItemStack arg0, EntityPlayer arg1, IProjectile arg2) {
+	// TODO Auto-generated method stub
+	return false;
+}
+@Override
+public boolean sheatheOnBack(ItemStack item) {
+	// TODO Auto-generated method stub
+	return false;
+}
+@Override
+public void blockAnimation(EntityPlayer arg0, float arg1) {
+	// TODO Auto-generated method stub
+	
+}
+@Override
+public boolean canBlock(ItemStack arg0, DamageSource arg1) {
+	// TODO Auto-generated method stub
+	return false;
+}
+@Override
+public int getBashTimer(ItemStack arg0) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public float getBlockAngle(ItemStack arg0) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public float getDamageDecayRate(ItemStack arg0, float arg1) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public float getDecayRate(ItemStack arg0) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public float getRecoveryRate(ItemStack arg0) {
+	// TODO Auto-generated method stub
+	return 0;
+}
+@Override
+public Item getAccessoryItem() {
+	// TODO Auto-generated method stub
+	return null;
+}
+@Override
+public String getDefaultFolder() {
+	// TODO Auto-generated method stub
+	return null;
+}
+@Override
+public String getEffectSuffix() {
+	// TODO Auto-generated method stub
+	return null;
+}
+@Override
+public Item getHeadItem() {
+	// TODO Auto-generated method stub
+	return null;
+}
+@Override
+public String getIconSuffix(int arg0) {
+	// TODO Auto-generated method stub
+	return null;
+}
 }
\ No newline at end of file