diff options
Diffstat (limited to 'src/main/java/gmail/Lance5057/items/tools')
| -rw-r--r-- | src/main/java/gmail/Lance5057/items/tools/HeaterShield.java | 14 | ||||
| -rw-r--r-- | src/main/java/gmail/Lance5057/items/tools/Shield.java | 2 |
2 files changed, 2 insertions, 14 deletions
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; } @@ -242,17 +240,7 @@ 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, |