A whole mess of graphic updates

53 files changed, 11 insertions, 12 deletions

diff --git a/src/main/java/gmail/Lance5057/com/HeaterShield.java b/src/main/java/gmail/Lance5057/com/HeaterShield.java
index 13875bc..063eb66 100644
--- a/src/main/java/gmail/Lance5057/com/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/com/HeaterShield.java
@@ -1,32 +1,30 @@
 package gmail.Lance5057.com;
 
 import java.util.List;
-import java.util.Random;
 
 import mods.battlegear2.api.ISheathed;
 import mods.battlegear2.api.shield.IArrowCatcher;
 import mods.battlegear2.api.shield.IArrowDisplay;
 import mods.battlegear2.api.shield.IShield;
-import mods.battlegear2.api.shield.ShieldType;
-import mods.battlegear2.utils.BattlegearConfig;
-import cpw.mods.fml.relauncher.*;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.*;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.*;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import tconstruct.library.tools.*;
+import tconstruct.library.tools.AbilityHelper;
+import tconstruct.library.tools.HarvestTool;
 import tconstruct.tools.TinkerTools;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+
 public class HeaterShield extends HarvestTool implements IShield, ISheathed, IArrowCatcher, IArrowDisplay
 {
 	int induceDamage = 0;
diff --git a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
index 60e4ee1..014edcd 100644
--- a/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
+++ b/src/main/java/gmail/Lance5057/com/mod_TinkersDefense.java
@@ -3,6 +3,7 @@ package gmail.Lance5057.com;
 
 
 
+
 import static net.minecraft.util.EnumChatFormatting.DARK_RED;
 import static net.minecraft.util.EnumChatFormatting.GOLD;
 import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE;
@@ -247,7 +248,7 @@ public void init(FMLInitializationEvent e)
 
 	    // Tool Materials: id, name, harvestlevel, durability, speed, damage, handlemodifier, reinforced, shoddy, style color, primary color for block use
 	  //Dogbearium
-	    TConstructClientRegistry.addMaterialRenderMapping(201, "tinker", "Dogbearium", true);
+	    TConstructClientRegistry.addMaterialRenderMapping(203, "tinker", "Dogbearium", true);
 	    TConstructRegistry.addToolMaterial(203, "Dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
 	    TinkerTools.registerPatternMaterial("DogbeariumIngot", 2, "Dogbearium");
 	    TConstructRegistry.addDefaultToolPartMaterial(203);	    
diff --git a/src/main/java/gmail/Lance5057/items/TinkerArmor.java b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
index dd632d4..95d776c 100644
--- a/src/main/java/gmail/Lance5057/items/TinkerArmor.java
+++ b/src/main/java/gmail/Lance5057/items/TinkerArmor.java
@@ -20,7 +20,7 @@ public class TinkerArmor extends ItemArmor
 	@Override 
 	@SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) 
 	{ 
-		String itemName = "tinkersdefense:textures/armor/TinkerArmor.png";
+		String itemName = "tinkersdefense:textures/armor/TinkerArmor";
 		this.itemIcon = par1IconRegister.registerIcon(itemName); 
 	}
 	
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png
index e002312..48b9bee 100644
--- a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png
index aa2c757..5d422a4 100644
--- a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png
new file mode 100644
index 0000000..c6fd97a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_binding.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png
new file mode 100644
index 0000000..7cf091d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png
new file mode 100644
index 0000000..2a3485d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face.png
diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png
new file mode 100644
index 0000000..6db407e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/heatershield/wooden_shield_face_other.png
diff --git a/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png b/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png
new file mode 100644
index 0000000..2975dc2
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/longsword/dogbearium_longsword_blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png
new file mode 100644
index 0000000..8ae1f0e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png
new file mode 100644
index 0000000..a244a96
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/aeonsteel_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png
new file mode 100644
index 0000000..0f3a71a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png
new file mode 100644
index 0000000..d359096
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png
new file mode 100644
index 0000000..3cd6127
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/alumite_shield_shield.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png
new file mode 100644
index 0000000..8d5cdb1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png
new file mode 100644
index 0000000..1db11c1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/ardite_shield_shield.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png
new file mode 100644
index 0000000..f4e204d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png
new file mode 100644
index 0000000..ea39ba8
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/blueslime_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png
new file mode 100644
index 0000000..51f848c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png
new file mode 100644
index 0000000..9a7b2c4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/bone_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png
new file mode 100644
index 0000000..723a489
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png
new file mode 100644
index 0000000..3551d8c
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/bronze_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png
new file mode 100644
index 0000000..3f42899
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png
new file mode 100644
index 0000000..1fc1b5e
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cactus_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png
new file mode 100644
index 0000000..858f96f
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png
new file mode 100644
index 0000000..0871efb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/cobalt_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png
new file mode 100644
index 0000000..51c42de
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png
new file mode 100644
index 0000000..131f870
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/copper_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png
new file mode 100644
index 0000000..4434fd3
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png
new file mode 100644
index 0000000..bd27fd5
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/dogbearium_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png
new file mode 100644
index 0000000..e2b3de4
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png
new file mode 100644
index 0000000..541f5e1
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/flint_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png
new file mode 100644
index 0000000..ad4de8d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png
new file mode 100644
index 0000000..9bd5887
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/manyullyn_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png
new file mode 100644
index 0000000..14fcee8
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png
new file mode 100644
index 0000000..16989ed
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/netherrack_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png
new file mode 100644
index 0000000..2cf28a3
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png
new file mode 100644
index 0000000..dc1c106
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/obsidian_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png
new file mode 100644
index 0000000..c986e26
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png
new file mode 100644
index 0000000..aa0a0e6
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/paper_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png
new file mode 100644
index 0000000..cb177fa
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png
new file mode 100644
index 0000000..afa4b02
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/pigiron_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png
new file mode 100644
index 0000000..4052ddb
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png
new file mode 100644
index 0000000..948f699
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/queensgold_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png
new file mode 100644
index 0000000..a3e231a
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png
new file mode 100644
index 0000000..891760b
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/slime_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png
index 0b68181..02ee488 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png
+++ b/src/main/resources/assets/tinker/textures/items/shield/steel_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png
new file mode 100644
index 0000000..39209c0
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png
new file mode 100644
index 0000000..f15da9d
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/stone_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png
new file mode 100644
index 0000000..c423014
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_boss.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png
new file mode 100644
index 0000000..a8627ac
--- /dev/null
+++ b/src/main/resources/assets/tinker/textures/items/shield/thaumium_shield_edge.png
diff --git a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png b/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png
index acbd23d..9626ddd 100644
--- a/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png
+++ b/src/main/resources/assets/tinker/textures/items/shield/wood_shield_boss.png