Added Tainted and Blessed Pickaxe Classes, Cleaned up old Classes.

src/divine_equipment/Divine_Equipment.java

@@ -1,22 +1,23 @@
- /**
+/**
  * Author: Orthus
  * Date: 9/29/13
  */
 
- import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod;
- import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.Mod.Instance;
- import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
- import cpw.mods.fml.common.network.NetworkMod;
+import cpw.mods.fml.common.network.NetworkMod;
- import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
- import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
- import items.*;
+import net.minecraft.block.Block;
- import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
- import net.minecraft.block.material.Material;
+import net.minecraft.item.EnumToolMaterial;
- import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.Item;
- import net.minecraft.item.Item;
+import net.minecraftforge.common.EnumHelper;
- import net.minecraftforge.common.EnumHelper;
+import blocks.*;
- import blocks.*;
+import items.*;
 
+@SuppressWarnings("ALL")
 @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5")
 @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" })
 public class Divine_Equipment
@@ -33,14 +34,12 @@ public class Divine_Equipment
     // @SidedProxy(clientSide = "divine_equipment.client.ClientProxy", serverSide = "divine_equipment.common.CommonProxy")
     // public  static CommonProxy proxy;
 
-    public static String imageFolder = "resources/textures";
-
     // Init all new Tool materials
 
     // Init All Tainted materials
     EnumToolMaterial TaintedDiamond;
     EnumToolMaterial TaintedGold;
-    EnumToolMaterial TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19);
+    EnumToolMaterial TaintedIron;
     EnumToolMaterial TaintedStone;
     EnumToolMaterial TaintedWood;
 
@@ -77,21 +76,20 @@ public class Divine_Equipment
          */
         TaintedDiamond = EnumHelper.addToolMaterial("Tainted Diamond", 3, 1003, 8.0F, 4, 15);
         TaintedGold = EnumHelper.addToolMaterial("Tainted Gold", 2, 20, 12.0F, 0, 27);
+        TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 58, 8.0F, 0, 19);
         TaintedStone = EnumHelper.addToolMaterial("Tainted Stone", 1, 88, 4.0F, 0, 10 );
         TaintedWood = EnumHelper.addToolMaterial("Tainted Wood", 0, 40, 2.0F, 0, 20);
 
         // Blessed tool Material Properties (Subject to Change)
-
+        BlessedDiamond = EnumHelper.addToolMaterial("Blessed Diamond", 3, 2850, 10.0F, 3, 22);
-    BlessedDiamond = EnumHelper.addToolMaterial("Blessed Diamond", 3, 2029, 10.0F, 3, 10);
         BlessedGold = EnumHelper.addToolMaterial("Blessed Gold", 2, 32, 14.00F, 0, 22);
         BlessedIron = EnumHelper.addToolMaterial("Blessed Iron", 2, 250, 8.0F, 2, 14);
         BlessedStone = EnumHelper.addToolMaterial("Blessed Stone", 1, 131, 6.0F, 1, 5);
         BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15);
 
         //Telling forge that we are creating stuff
-        // Tainted Swords
+        // Tainted Items
         Item TaintedDiamondSword;{
-    //Create Item + Picture
             TaintedDiamondSword = new TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond");
             LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword");
         }
@@ -107,23 +105,72 @@ public class Divine_Equipment
             TaintedStoneSword = new TaintedStoneSword(2563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone");
             LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword");
         }
-    // Item TaintedWoodSword;{}
+        Item TaintedWoodSword;{
-    // Blessed Swords
+            TaintedWoodSword = new TaintedWoodSword(2564, TaintedWood).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood");
+            LanguageRegistry.addName(TaintedWoodSword, "Tainted Wood Sword");
+        }
+
+        Item TaintedDiamondPickaxe;{
+            TaintedDiamondPickaxe = new TaintedDiamondPickaxe(565, TaintedDiamond).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond");
+            LanguageRegistry.addName(TaintedDiamondPickaxe, "Tainted Diamond Pickaxe");
+        }
+        Item TaintedGoldPickaxe;{
+            TaintedGoldPickaxe = new TaintedGoldPickaxe(566, TaintedGold).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold");
+            LanguageRegistry.addName(TaintedGoldPickaxe, "Tainted Gold Pickaxe");
+        }
+        Item TaintedIronPickaxe;{
+            TaintedIronPickaxe = new TaintedIronPickaxe(567, TaintedIron).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron");
+            LanguageRegistry.addName(TaintedIronPickaxe, "Tainted Iron Pickaxe");
+        }
+        Item TaintedStonePickaxe;{
+            TaintedStonePickaxe = new TaintedStonePickaxe(568, TaintedStone).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone");
+            LanguageRegistry.addName(TaintedStonePickaxe, "Tainted Stone Pickaxe");
+        }
+        Item TaintedWoodPickaxe;{
+            TaintedWoodPickaxe = new TaintedWoodPickaxe(569, TaintedWood).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood");
+            LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wood Pickaxe");
+        }
+        // Blessed Items
         Item BlessedDiamondSword;{
             //Create Item + Picture
-        BlessedDiamondSword = new BlessedDiamondSword(2555, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
+            BlessedDiamondSword = new BlessedDiamondSword(2580, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
             LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword");
-    }
+}
         Item BlessedGoldSword;{
-        BlessedGoldSword = new BlessedGoldSword(2556, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
+            BlessedGoldSword = new BlessedGoldSword(2581, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
             LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword");
         }
         Item BlessedIronSword;{
-        BlessedIronSword = new BlessedIronSword(2557, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron");
+            BlessedIronSword = new BlessedIronSword(2582, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron");
             LanguageRegistry.addName(BlessedIronSword, "Blessed Iron Sword");
         }
         Item BlessedStoneSword;{
-        BlessedStoneSword = new BlessedStoneSword(2558, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone");
+            BlessedStoneSword = new BlessedStoneSword(2583, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone");
             LanguageRegistry.addName(BlessedStoneSword, "Blessed Stone Sword");
-
+        }
-    }}}
+        Item BlessedWoodSword;{
+            BlessedWoodSword = new BlessedWoodSword(2584, BlessedWood).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood");
+            LanguageRegistry.addName(BlessedWoodSword, "Blessed Wood Sword");
+        }
+        Item BlessedDiamondPickaxe;{
+            BlessedDiamondPickaxe = new BlessedDiamondPickaxe(585, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond");
+            LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe");
+        }
+        Item BlessedGoldPickaxe;{
+            BlessedGoldPickaxe = new BlessedGoldPickaxe(586, BlessedGold).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold");
+            LanguageRegistry.addName(BlessedGoldPickaxe, "Blessed Gold Pickaxe");
+        }
+        Item BlessedIronPickaxe;{
+            BlessedIronPickaxe = new BlessedIronPickaxe(587, BlessedIron).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron");
+            LanguageRegistry.addName(BlessedIronPickaxe, "Blessed Iron Pickaxe");
+        }
+        Item BlessedStonePickaxe;{
+            BlessedStonePickaxe = new BlessedStonePickaxe(588, BlessedStone).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone");
+            LanguageRegistry.addName(BlessedStonePickaxe, "Blessed Stone Pickaxe");
+        }
+        Item BlessedWoodPickaxe;{
+            BlessedWoodPickaxe = new BlessedWoodPickaxe(589, BlessedWood).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood");
+            LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wood Pickaxe");
+        }
+}
+}

src/divine_equipment/items/BlessedDiamondPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedDiamondPickaxe extends ItemPickaxe {
+    public BlessedDiamondPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/BlessedGold.java

@@ -1,4 +1,4 @@
-package divine_equipment.items;
+package items;
 
 /**
  * User: Orthus

src/divine_equipment/items/BlessedGoldPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedGoldPickaxe extends ItemPickaxe {
+    public BlessedGoldPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/BlessedIronPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedIronPickaxe extends ItemPickaxe {
+    public BlessedIronPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/BlessedStonePickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedStonePickaxe extends ItemPickaxe {
+    public BlessedStonePickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/BlessedWood.java

@@ -1,4 +1,4 @@
-package divine_equipment.items;
+package items;
 
 /**
  * User: Orthus

src/divine_equipment/items/BlessedWoodPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedWoodPickaxe extends ItemPickaxe {
+    public BlessedWoodPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/BlessedWoodSword.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemSword;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class BlessedWoodSword extends ItemSword {
+    public BlessedWoodSword(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabCombat);
+    }
+}

src/divine_equipment/items/ItemBSword.java

@@ -1,18 +0,0 @@
-package items;
-
-/**
- * Author: Orthus
- * Date: 9/29/13
- */
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-public class ItemBSword extends Item {
-    public ItemBSword(int id) {
-        super(id);
-        // Constructor Configuration
-        setMaxStackSize(1);
-        setCreativeTab(CreativeTabs.tabMisc);
-        setUnlocalizedName("genericItem");
-    }}

src/divine_equipment/items/ItemTSword.java

@@ -1,18 +0,0 @@
-package divine_equipment.items;
-
-/**
- * Author: Orthus
- * Date: 9/29/13
- */
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-public class ItemTSword extends Item {
-    public ItemTSword(int id) {
-        super(id);
-        // Constructor Configuration
-        setMaxStackSize(1);
-        setCreativeTab(CreativeTabs.tabMisc);
-        setUnlocalizedName("genericItem");
-}}

src/divine_equipment/items/TaintedDiamondPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedDiamondPickaxe extends ItemPickaxe {
+    public TaintedDiamondPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/TaintedDiamondSword.java

@@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword;
  * Date: 9/29/13
  */
 public class TaintedDiamondSword extends ItemSword {
-    public TaintedDiamondSword(int par1, EnumToolMaterial TaintedDiamond){
+    public TaintedDiamondSword(int id, EnumToolMaterial material){
-        super(par1, TaintedDiamond);
+        super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
 
     }

src/divine_equipment/items/TaintedGoldPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedGoldPickaxe extends ItemPickaxe {
+    public TaintedGoldPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/TaintedGoldSword.java

@@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword;
  * Date: 9/29/13
  */
 public class TaintedGoldSword extends ItemSword {
-    public TaintedGoldSword(int par1, EnumToolMaterial EMERALD){
+    public TaintedGoldSword(int id, EnumToolMaterial material){
-        super(par1, EMERALD);
+        super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
     }
 }

src/divine_equipment/items/TaintedIronPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedIronPickaxe extends ItemPickaxe {
+    public TaintedIronPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/TaintedIronSword.java

@@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword;
  * Date: 9/30/13
  */
 public class TaintedIronSword extends ItemSword {
-    public TaintedIronSword(int par1, EnumToolMaterial EMERALD){
+    public TaintedIronSword(int id, EnumToolMaterial material){
-        super(par1, EMERALD);
+        super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
     }
 }

src/divine_equipment/items/TaintedStonePickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedStonePickaxe extends ItemPickaxe {
+    public TaintedStonePickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/TaintedStoneSword.java

@@ -9,8 +9,8 @@ import net.minecraft.item.ItemSword;
  * Date: 9/30/13
  */
 public class TaintedStoneSword extends ItemSword {
-    public TaintedStoneSword(int par1, EnumToolMaterial EMERALD){
+    public TaintedStoneSword(int id, EnumToolMaterial material){
-        super(par1, EMERALD);
+        super(id, material);
         setCreativeTab(CreativeTabs.tabCombat);
     }
 }

src/divine_equipment/items/TaintedWoodPickaxe.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemPickaxe;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedWoodPickaxe extends ItemPickaxe {
+    public TaintedWoodPickaxe(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabTools);
+    }
+}

src/divine_equipment/items/TaintedWoodSword.java

@@ -0,0 +1,16 @@
+package items;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.ItemSword;
+
+/**
+ * User: Orthus
+ * Date: 9/30/13
+ */
+public class TaintedWoodSword extends ItemSword {
+    public TaintedWoodSword(int id, EnumToolMaterial material){
+        super(id, material);
+        setCreativeTab(CreativeTabs.tabCombat);
+    }
+}