diff --git a/src/divine_equipment/common/Divine_Content.java b/src/divine_equipment/common/Divine_Content.java index b5c8cf8..1d1d278 100644 --- a/src/divine_equipment/common/Divine_Content.java +++ b/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; - - //Blessed Blocks - public static Block blessedstone; - public static Block blessedwood; - - // Tainted Blocks - public static Block taintedstone; - public static Block taintedwood; + public static Block blessedstone, blessedwood, taintedstone, taintedwood, BlessedAlter, TaintedAlter; // Sigils - public static Item BlankSigil; - public static Item BlessedSigil; - public static Item TaintedSigil; - public static Item EnderSigil; - public static Item HiddenSigil; + public static Item BlankSigil, BlessedSigil, TaintedSigil, EnderSigil, HiddenSigil, TaintedDiamondSword, TaintedGoldSword, TaintedIronSword, TaintedStoneSword, TaintedWoodSword, TaintedDiamondPickaxe; +; +; +; +; // Alters - public static Block BlessedAlter; - public static Block TaintedAlter; + public static Block ; + 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; - public static Item TaintedIronPickaxe; - public static Item TaintedStonePickaxe; - public static Item TaintedWoodPickaxe; +; +TaintedGoldPickaxe; +TaintedIronPickaxe; +TaintedStonePickaxe; +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 - public static Item TaintedDiamondShovel; - public static Item TaintedGoldShovel; - public static Item TaintedIronShovel; - public static Item TaintedStoneShovel; - public static Item TaintedWoodShovel; +TaintedDiamondAxe; +TaintedGoldAxe; +TaintedIronAxe; +TaintedStoneAxe; +TaintedWoodAxe; - // Tainted Hoes - public static Item TaintedDiamondHoe; - public static Item TaintedGoldHoe; - public static Item TaintedIronHoe; - public static Item TaintedStoneHoe; - public static Item TaintedWoodHoe; - // Blessed Swords - public static Item BlessedDiamondSword; - public static Item BlessedGoldSword; - public static Item BlessedIronSword; - public static Item BlessedStoneSword; - public static Item BlessedWoodSword; +TaintedDiamondShovel; +TaintedGoldShovel; +TaintedIronShovel; +TaintedStoneShovel; +TaintedWoodShovel; - // Blessed Pickaxes - public static Item BlessedDiamondPickaxe; - public static Item BlessedGoldPickaxe; - public static Item BlessedIronPickaxe; - public static Item BlessedStonePickaxe; - public static Item BlessedWoodPickaxe; - // Blessed Axe - public static Item BlessedDiamondAxe; - public static Item BlessedGoldAxe; - public static Item BlessedIronAxe; - public static Item BlessedStoneAxe; - public static Item BlessedWoodAxe; +TaintedDiamondHoe; +TaintedGoldHoe; +TaintedIronHoe; +TaintedStoneHoe; +TaintedWoodHoe; - // Blessed Shovel - public static Item BlessedDiamondShovel; - public static Item BlessedGoldShovel; - public static Item BlessedIronShovel; - public static Item BlessedStoneShovel; - public static Item BlessedWoodShovel; - // Blessed Hoes - public static Item BlessedDiamondHoe; - public static Item BlessedGoldHoe; - public static Item BlessedIronHoe; - public static Item BlessedStoneHoe; - public static Item BlessedWoodHoe; +BlessedDiamondSword; +BlessedGoldSword; +BlessedIronSword; +BlessedStoneSword; +BlessedWoodSword; - // 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 diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java index 84a42de..d334765 100644 --- a/src/divine_equipment/divine_equipment/Divine_Equipment.java +++ b/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();