From a918009626db55c1fc5f359c557f0e848da15f46 Mon Sep 17 00:00:00 2001
From: Lance5057 <Lance5057@gmail.com>
Date: Fri, 26 Jun 2015 05:40:18 -0500
Subject: Added parts of Mirrors, Feathers, Vampirism, and Legends crests

---
 .../java/gmail/Lance5057/items/tools/HeaterShield.java     | 14 +-------------
 src/main/java/gmail/Lance5057/items/tools/Shield.java      |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/main/java/gmail/Lance5057/items')

diff --git a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
index 8455bc2..8f20f48 100644
--- a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
@@ -185,13 +185,11 @@ public class HeaterShield extends Shield {
 
 	@Override
 	public int getBashTimer(ItemStack arg0) {
-		// TODO Auto-generated method stub
 		return 10;
 	}
 
 	@Override
 	public float getBlockAngle(ItemStack arg0) {
-		// TODO Auto-generated method stub
 		return 60;
 	}
 
@@ -241,18 +239,8 @@ public class HeaterShield extends Shield {
 		}
 	}
 
-	@Override
-	protected Material[] getEffectiveMaterials() {
-		return materials;
-	}
-
-	static Material[] materials = new Material[] { Material.rock,
-			Material.iron, Material.ice, Material.glass, Material.piston,
-			Material.anvil, Material.circuits };
-
 	@Override
 	protected String getHarvestType() {
-		// TODO Auto-generated method stub
-		return "pickaxe";
+		return "shield";
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/Shield.java b/src/main/java/gmail/Lance5057/items/tools/Shield.java
index af33f84..90b5dd4 100644
--- a/src/main/java/gmail/Lance5057/items/tools/Shield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/Shield.java
@@ -116,7 +116,7 @@ public class Shield extends ToolCore implements IShield, ISheathed,
 
 	@Override
 	public String[] getTraits() {
-		return new String[] { "shield", "melee" };
+		return new String[] { "shield", "blocking" };
 	}
 
 	public static Material[] web = new Material[] { Material.web,
-- 
cgit v1.2.3