Added Sigils, Additional Refactoring.

src/divine_equipment/blocks/blessed/BlessedRock.java

@@ -1,4 +1,4 @@
-package blocks;
+package blocks.blessed;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/divine_equipment/blocks/blessed/BlessedWood.java

@@ -1,4 +1,4 @@
-package blocks;
+package blocks.blessed;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/divine_equipment/blocks/tainted/TaintedRock.java

@@ -1,4 +1,4 @@
-package blocks;
+package blocks.tainted;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/divine_equipment/blocks/tainted/TaintedWood.java

@@ -1,4 +1,4 @@
-package blocks;
+package blocks.tainted;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/divine_equipment/common/Divine_Content.java

@@ -1,13 +1,14 @@
 package common;
 
-import blocks.BlessedRock;
-import blocks.BlessedWood;
-import blocks.TaintedRock;
-import blocks.TaintedWood;
+import blocks.blessed.BlessedRock;
+import blocks.blessed.BlessedWood;
+import blocks.tainted.TaintedRock;
+import blocks.tainted.TaintedWood;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import divine_equipment.Divine_Equipment;
-import items.*;
+import items.blessed.*;
+import items.tainted.*;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumToolMaterial;
@@ -91,12 +92,18 @@ public class Divine_Content {
 
     //Telling forge that we are creating stuff
     // Tainted Items
+    Item TaintedSigil;{
+        TaintedSigil = new items.tainted.TaintedSigil(2559).setUnlocalizedName("Tainted_Sigil").setTextureName("divine_equipment:Tainted_Sigil");
+        LanguageRegistry.addName(TaintedSigil, "Tainted Sigil");
+    }
+
+    // Tainted Swords
     Item TaintedDiamondSword;{
-        TaintedDiamondSword = new TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond");
+        TaintedDiamondSword = new items.tainted.TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond");
         LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword");
     }
     Item TaintedGoldSword;{
-        TaintedGoldSword = new TaintedGoldSword(2561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold");
+        TaintedGoldSword = new items.tainted.TaintedGoldSword(2561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold");
         LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword");
     }
     Item TaintedIronSword;{
@@ -113,33 +120,38 @@ public class Divine_Content {
     }
     // Pickaxes
     Item TaintedDiamondPickaxe;{
-        TaintedDiamondPickaxe = new TaintedDiamondPickaxe(565, TaintedDiamond).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond");
+        TaintedDiamondPickaxe = new items.tainted.TaintedDiamondPickaxe(2565, 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");
+        TaintedGoldPickaxe = new items.tainted.TaintedGoldPickaxe(2566, 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");
+        TaintedIronPickaxe = new items.tainted.TaintedIronPickaxe(2567, 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");
+        TaintedStonePickaxe = new TaintedStonePickaxe(2568, 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");
+        TaintedWoodPickaxe = new TaintedWoodPickaxe(2569, TaintedWood).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood");
         LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wood Pickaxe");
     }
     // Blessed Items
+
+    Item BlessedSigil;{
+        BlessedSigil = new items.blessed.BlessedSigil(2579).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil");
+        LanguageRegistry.addName(BlessedSigil, "Blessed Sigil");
+    }
+       // Blessed Swords
     Item BlessedDiamondSword;{
-        //Create Item + Picture
-        BlessedDiamondSword = new BlessedDiamondSword(2580, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
+        BlessedDiamondSword = new items.blessed.BlessedDiamondSword(2580, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond");
         LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword");
     }
     Item BlessedGoldSword;{
-        BlessedGoldSword = new BlessedGoldSword(2581, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
+        BlessedGoldSword = new items.blessed.BlessedGoldSword(2581, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold");
         LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword");
     }
     Item BlessedIronSword;{
@@ -157,26 +169,34 @@ public class Divine_Content {
     // Pickaxes
 
     Item BlessedDiamondPickaxe;{
-        BlessedDiamondPickaxe = new BlessedDiamondPickaxe(585, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond");
+        BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(2585, 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");
+        BlessedGoldPickaxe = new items.blessed.BlessedGoldPickaxe(2586, 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");
+        BlessedIronPickaxe = new items.blessed.BlessedIronPickaxe(2587, 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");
+        BlessedStonePickaxe = new BlessedStonePickaxe(2588, 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");
+        BlessedWoodPickaxe = new BlessedWoodPickaxe(2589, BlessedWood).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood");
         LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wood Pickaxe");
     }
+    // Ender Items
+
+   Item EnderSigil;{
+        EnderSigil = new items.ender.EnderSigil(2600).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil");
+        LanguageRegistry.addName(EnderSigil, "Ender Sigil");
     }
 
 
+
+
+    }
 }

src/divine_equipment/items/blessed/BlessedDiamond.java

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

src/divine_equipment/items/blessed/BlessedDiamondPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedDiamondSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.*;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedGold.java

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

src/divine_equipment/items/blessed/BlessedGoldPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedGoldSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.*;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedIron.java

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

src/divine_equipment/items/blessed/BlessedIronPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedIronSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedSigil.java

@@ -0,0 +1,15 @@
+package items.blessed;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+/**
+ * User: Orthus
+ * Date: 10/4/13
+ */
+public class BlessedSigil extends Item {
+    public BlessedSigil(int id){
+        super(id);
+        setCreativeTab(CreativeTabs.tabMaterials);
+    }
+}

src/divine_equipment/items/blessed/BlessedStone.java

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

src/divine_equipment/items/blessed/BlessedStonePickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedStoneSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedWoodPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/blessed/BlessedWoodSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.blessed;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/ender/EnderSigil.java

@@ -0,0 +1,15 @@
+package items.ender;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+/**
+ * User: Orthus
+ * Date: 10/4/13
+ */
+public class EnderSigil extends Item {
+    public EnderSigil(int id){
+        super(id);
+        setCreativeTab(CreativeTabs.tabMaterials);
+    }
+}

src/divine_equipment/items/tainted/TaintedDiamond.java

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

src/divine_equipment/items/tainted/TaintedDiamondPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedDiamondSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedGold.java

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

src/divine_equipment/items/tainted/TaintedGoldPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedGoldSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedIron.java

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

src/divine_equipment/items/tainted/TaintedIronPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedIronSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedSigil.java

@@ -0,0 +1,15 @@
+package items.tainted;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+/**
+ * User: Orthus
+ * Date: 10/4/13
+ */
+public class TaintedSigil extends Item {
+    public TaintedSigil(int id){
+        super(id);
+        setCreativeTab(CreativeTabs.tabMaterials);
+    }
+}

src/divine_equipment/items/tainted/TaintedStone.java

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

src/divine_equipment/items/tainted/TaintedStonePickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedStoneSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedWoodPickaxe.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;

src/divine_equipment/items/tainted/TaintedWoodSword.java

@@ -1,4 +1,4 @@
-package items;
+package items.tainted;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumToolMaterial;