Added Zweihander + more alternative graphics

4 files changed, 99 insertions, 5 deletions

diff --git a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
index 14d87bb..94f3e2d 100644
--- a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
@@ -51,7 +51,7 @@ public class HeaterShield extends Shield {
 
 	@Override
 	public Item getExtraItem() {
-		return TinkerTools.toughBinding;
+		return TinkersDefense.partRivet;
 	}
 
 	@Override
@@ -79,7 +79,6 @@ public class HeaterShield extends Shield {
 		return 1.4f;
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
 	public int getPartAmount() {
 		return 4;
diff --git a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java b/src/main/java/gmail/Lance5057/items/tools/RoundShield.java
index d940077..45ea263 100644
--- a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java
+++ b/src/main/java/gmail/Lance5057/items/tools/RoundShield.java
@@ -46,7 +46,7 @@ public class RoundShield extends Shield {
 
 	@Override
 	public Item getAccessoryItem() {
-		return TinkerTools.binding;
+		return TinkerTools.frypanHead;
 	}
 
 	@Override
@@ -74,7 +74,6 @@ public class RoundShield extends Shield {
 		return 0f;
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
 	public int getPartAmount() {
 		return 3;
diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java b/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
index 7ac7799..7435c87 100644
--- a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
+++ b/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
@@ -69,7 +69,6 @@ public class TinkerWrench extends Weapon implements IToolWrench {
 		return 0.4f;
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
 	public int getPartAmount() {
 		return 3;
diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java b/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java
new file mode 100644
index 0000000..980542f
--- /dev/null
+++ b/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java
@@ -0,0 +1,97 @@
+package gmail.Lance5057.items.tools;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.item.Item;
+import tconstruct.library.tools.Weapon;
+import tconstruct.tools.TinkerTools;
+
+public class TinkerZweihander extends Weapon
+{
+
+	public TinkerZweihander(int baseDamage) {
+		super(5);
+        this.setUnlocalizedName("zweihander");
+	}
+
+	@Override
+	public Item getHeadItem() {
+		return TinkerTools.largeSwordBlade;
+	}
+
+	@Override
+	public Item getHandleItem() {
+		return TinkerTools.toughRod;
+	}
+	
+	@Override
+	public Item getAccessoryItem() {
+		return TinkerTools.wideGuard;
+	}
+	
+	@Override
+	public Item getExtraItem() {
+		return TinkerTools.swordBlade;
+	}
+
+
+//	@Override
+//	public int durabilityTypeAccessory() {
+//		return 2;
+//	}
+//	
+//	@Override
+//    public int durabilityTypeExtra ()
+//    {
+//        return 1;
+//    }
+
+	@Override
+	public float getRepairCost() {
+		return 4.0f;
+	}
+
+	@Override
+	public float getDurabilityModifier() {
+		return 2.5f;
+	}
+
+	@Override
+	public float getDamageModifier() {
+		return 1.4f;
+	}
+	
+	
+	@Override
+	public int getPartAmount() {
+		return 4;
+	}
+
+	@Override
+	public String getIconSuffix(int partType) {
+		switch (partType) {
+		case 0:
+			return "_zweihander_blade";
+		case 1:
+			return "_zweihander_blade_broken";
+		case 2:
+			return "_zweihander_handle";
+		case 3:
+			return "_zweihander_guard";
+		case 4:
+			return "_zweihander_core";
+		default:
+			return "";
+		}
+	}
+
+	@Override
+	public String getEffectSuffix() {
+		return "_zweihander_effect";
+	}
+
+	@Override
+	public String getDefaultFolder() {
+		return "zweihander";
+	}
+}