unfinished refactoring

src/divine_equipment/common/Divine_Content.java

@@ -89,100 +89,93 @@ public class Divine_Content {
     int BlessedWoodHoeID = Divine_Equipment.BlessedWoodHoeID;
     int EnderSwordID = Divine_Equipment.EnderSwordID;
 
-
+    public static Block blessedstone, blessedwood, taintedstone, taintedwood, BlessedAlter, TaintedAlter;
-    //Blessed Blocks
-    public static Block blessedstone;
-    public static Block blessedwood;
-
-   // Tainted Blocks
-    public static Block taintedstone;
-    public static Block taintedwood;
 
     // Sigils
-    public static Item BlankSigil;
+    public static Item BlankSigil, BlessedSigil, TaintedSigil, EnderSigil, HiddenSigil, TaintedDiamondSword, TaintedGoldSword, TaintedIronSword, TaintedStoneSword, TaintedWoodSword, TaintedDiamondPickaxe;
-    public static Item BlessedSigil;
+;
-    public static Item TaintedSigil;
+;
-    public static Item EnderSigil;
+;
-    public static Item HiddenSigil;
+;
 
     // Alters
-    public static Block BlessedAlter;
+    public static Block ;
-    public static Block TaintedAlter;
+    public static Block ;
     public static Block EnderAlter;
     public static Block HiddenAlter;
 
     // Tainted Sword
-    public static Item TaintedDiamondSword;
+;
-    public static Item TaintedGoldSword;
+;
-    public static Item TaintedIronSword;
+;
-    public static Item TaintedStoneSword;
+;
-    public static Item TaintedWoodSword;
+;
 
     // Tainted Pickaxes
-    public static Item TaintedDiamondPickaxe;
+;
-    public static Item TaintedGoldPickaxe;
+TaintedGoldPickaxe;
-    public static Item TaintedIronPickaxe;
+TaintedIronPickaxe;
-    public static Item TaintedStonePickaxe;
+TaintedStonePickaxe;
-    public static Item TaintedWoodPickaxe;
+TaintedWoodPickaxe;
 
-    // Tainted Axes
-    public static Item TaintedDiamondAxe;
-    public static Item TaintedGoldAxe;
-    public static Item TaintedIronAxe;
-    public static Item TaintedStoneAxe;
-    public static Item TaintedWoodAxe;
 
-    // Tainted Shovel
+TaintedDiamondAxe;
-    public static Item TaintedDiamondShovel;
+TaintedGoldAxe;
-    public static Item TaintedGoldShovel;
+TaintedIronAxe;
-    public static Item TaintedIronShovel;
+TaintedStoneAxe;
-    public static Item TaintedStoneShovel;
+TaintedWoodAxe;
-    public static Item TaintedWoodShovel;
 
-    // Tainted Hoes
-    public static Item TaintedDiamondHoe;
-    public static Item TaintedGoldHoe;
-    public static Item TaintedIronHoe;
-    public static Item TaintedStoneHoe;
-    public static Item TaintedWoodHoe;
 
-    // Blessed Swords
+TaintedDiamondShovel;
-    public static Item BlessedDiamondSword;
+TaintedGoldShovel;
-    public static Item BlessedGoldSword;
+TaintedIronShovel;
-    public static Item BlessedIronSword;
+TaintedStoneShovel;
-    public static Item BlessedStoneSword;
+TaintedWoodShovel;
-    public static Item BlessedWoodSword;
 
-    // Blessed Pickaxes
-    public static Item BlessedDiamondPickaxe;
-    public static Item BlessedGoldPickaxe;
-    public static Item BlessedIronPickaxe;
-    public static Item BlessedStonePickaxe;
-    public static Item BlessedWoodPickaxe;
 
-    // Blessed Axe
+TaintedDiamondHoe;
-    public static Item BlessedDiamondAxe;
+TaintedGoldHoe;
-    public static Item BlessedGoldAxe;
+TaintedIronHoe;
-    public static Item BlessedIronAxe;
+TaintedStoneHoe;
-    public static Item BlessedStoneAxe;
+TaintedWoodHoe;
-    public static Item BlessedWoodAxe;
 
-    // Blessed Shovel
-    public static Item BlessedDiamondShovel;
-    public static Item BlessedGoldShovel;
-    public static Item BlessedIronShovel;
-    public static Item BlessedStoneShovel;
-    public static Item BlessedWoodShovel;
 
-    // Blessed Hoes
+BlessedDiamondSword;
-    public static Item BlessedDiamondHoe;
+BlessedGoldSword;
-    public static Item BlessedGoldHoe;
+BlessedIronSword;
-    public static Item BlessedIronHoe;
+BlessedStoneSword;
-    public static Item BlessedStoneHoe;
+BlessedWoodSword;
-    public static Item BlessedWoodHoe;
 
-    // Ender
+
-    public static Item EnderSword;
+BlessedDiamondPickaxe;
+BlessedGoldPickaxe;
+BlessedIronPickaxe;
+BlessedStonePickaxe;
+BlessedWoodPickaxe;
+
+
+BlessedDiamondAxe;
+BlessedGoldAxe;
+BlessedIronAxe;
+BlessedStoneAxe;
+BlessedWoodAxe;
+
+
+BlessedDiamondShovel;
+BlessedGoldShovel;
+BlessedIronShovel;
+BlessedStoneShovel;
+BlessedWoodShovel;
+
+
+BlessedDiamondHoe;
+BlessedGoldHoe;
+BlessedIronHoe;
+BlessedStoneHoe;
+BlessedWoodHoe;
+
+
+EnderSword;
     // Hidden
 
     // Init All Tainted materials

src/divine_equipment/divine_equipment/Divine_Equipment.java

@@ -19,9 +19,15 @@ import common.Special_Mentions;
 @SuppressWarnings("ALL")
 @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.3")
 @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" })
-public class Divine_Equipment
+public class Divine_Equipment {
-{
     public static final String modid = "divine_equipment";
+
+
+    @Instance("Divine_Equipment")
+    public static Divine_Equipment INSTANCE;
+    @SidedProxy (clientSide ="common.ClientProxy", serverSide ="common.CommonProxy")
+    public static CommonProxy proxy;
+
     // Blocks
     public static int TaintedStoneID;
     public static int TaintedWoodID;
@@ -97,8 +103,7 @@ public class Divine_Equipment
     // Ender Items
     public static int EnderSwordID;
 
-    @Instance("Divine_Equipment")
+
-    public static Divine_Equipment INSTANCE;
     public Divine_Equipment()
    {
        mentions = new Special_Mentions();