diff --git a/src/divine_equipment/common/Config.java b/src/divine_equipment/common/Config.java new file mode 100644 index 0000000..0ce1ede --- /dev/null +++ b/src/divine_equipment/common/Config.java @@ -0,0 +1,98 @@ +package common; + +import net.minecraftforge.common.Configuration; +/** + * User: Orthus + * Date: 11/25/13 + */ +public class Config { + + + // Common + private int BaseBlockID = 500; + private int BaseID = 1200; + // Blocks + public final int TaintedStone, TaintedWood, BlessedStone, BlessedWood; + + // Sigils + public final int BlankSigil, TaintedSigil, BlessedSigil, EnderSigil, HiddenSigil; + // Tainted + public final int TaintedDiamondSword, TaintedGoldSword, TaintedIronSword, TaintedStoneSword, TaintedWoodSword, TaintedDiamondPickaxe, TaintedGoldPickaxe, TaintedIronPickaxe, TaintedStonePickaxe, TaintedWoodPickaxe, TaintedDiamondAxe, TaintedGoldAxe, TaintedIronAxe, TaintedStoneAxe, TaintedWoodAxe, TaintedDiamondShovel, TaintedGoldShovel, TaintedIronShovel, TaintedStoneShovel, TaintedWoodShovel, TaintedDiamondHoe, TaintedGoldHoe, TaintedIronHoe, TaintedStoneHoe, TaintedWoodHoe; + // Blessed + public final int BlessedDiamondSword, BlessedGoldSword, BlessedIronSword, BlessedStoneSword, BlessedWoodSword, BlessedDiamondPickaxe, BlessedGoldPickaxe, BlessedIronPickaxe, BlessedStonePickaxe, BlessedWoodPickaxe, BlessedDiamondAxe, BlessedGoldAxe, BlessedIronAxe, BlessedStoneAxe, BlessedWoodAxe, BlessedDiamondShovel, BlessedGoldShovel, BlessedIronShovel, BlessedStoneShovel, BlessedWoodShovel, BlessedDiamondHoe, BlessedGoldHoe, BlessedIronHoe, BlessedStoneHoe, BlessedWoodHoe; + // Ender Items + public final int EnderSword; + + public Config(Configuration config) + { + config.load(); + TaintedStone = config.get("tainted stone", "BlockID", BaseBlockID).getInt(BaseBlockID); + TaintedWood = config.get("tainted wood", "BlockID", BaseBlockID+ 1).getInt(BaseBlockID+1); + BlessedStone = config.get("blessed stone", "BlockID", BaseBlockID+2).getInt(BaseBlockID+2); + BlessedWood = config.get("blessed wood", "BlockID", BaseBlockID+3).getInt(BaseBlockID+3); + BlankSigil = config.get("Blank Sigil", "ItemID", BaseID+4).getInt(BaseID+4); + TaintedSigil = config.get("Tainted Sigil", "ItemID", BaseID+5).getInt(BaseID+5); + BlessedSigil = config.get("Blessed Sigil", "ItemID", BaseID+6).getInt(BaseID+6); + EnderSigil = config.get("Ender Sigil", "ItemID", BaseID+7).getInt(BaseID+7); + HiddenSigil = config.get("Hidden Sigil", "ItemID", BaseID+8).getInt(BaseID+8); + + TaintedDiamondSword = config.get("Tainted Diamond Sword", "ItemID", BaseID+9).getInt(BaseID+9); + TaintedGoldSword = config.get("Tainted Gold Sword", "ItemID", BaseID+10).getInt(BaseID+10); + TaintedIronSword = config.get("Tainted Iron Sword", "ItemID", BaseID+11).getInt(BaseID+11); + TaintedStoneSword = config.get("Tainted Stone Sword", "ItemID", BaseID+12).getInt(BaseID+12); + TaintedWoodSword = config.get("Tainted Wood Sword", "ItemID", BaseID+13).getInt(BaseID+13); + TaintedDiamondPickaxe = config.get("Tainted Diamond Pickaxe", "ItemID", BaseID+14).getInt(BaseID+14); + TaintedGoldPickaxe = config.get("Tainted Gold Pickaxe", "ItemID", BaseID+15).getInt(BaseID+15); + TaintedIronPickaxe = config.get("Tainted Iron Pickaxe", "ItemID", BaseID+16).getInt(BaseID+16); + TaintedStonePickaxe = config.get("Tainted Stone Pickaxe", "ItemID", BaseID+17).getInt(BaseID+17); + TaintedWoodPickaxe = config.get("Tainted Wood Pickaxe", "ItemID", BaseID+18).getInt(BaseID+18); + TaintedDiamondAxe = config.get("Tainted Diamond Axe", "ItemID", BaseID+19).getInt(BaseID+19); + TaintedGoldAxe = config.get("Tainted Gold Axe", "ItemID", BaseID+20).getInt(BaseID+20); + TaintedIronAxe = config.get("Tainted Iron Axe", "ItemID", BaseID+21).getInt(BaseID+21); + TaintedStoneAxe = config.get("Tainted Stone Axe", "ItemID", BaseID+22).getInt(BaseID+22); + TaintedWoodAxe = config.get("Tainted Wood Axe", "ItemID", BaseID+23).getInt(BaseID+23); + TaintedDiamondShovel = config.get("Tainted Diamond Shovel", "ItemID", BaseID+24).getInt(BaseID+24); + TaintedGoldShovel = config.get("Tainted Gold Shovel", "ItemID", BaseID+25).getInt(BaseID+25); + TaintedIronShovel = config.get("Tainted Iron Shovel", "ItemID", BaseID+26).getInt(BaseID+26); + TaintedStoneShovel = config.get("Tainted Stone Shovel", "ItemID", BaseID+27).getInt(BaseID+27); + TaintedWoodShovel = config.get("Tainted Wood Shovel", "ItemID", BaseID+28).getInt(BaseID+28); + TaintedDiamondHoe = config.get("Tainted Diamond Hoe", "ItemID", BaseID+29).getInt(BaseID+29); + TaintedGoldHoe = config.get("Tainted Gold Hoe", "ItemID", BaseID+30).getInt(BaseID+30); + TaintedIronHoe = config.get("Tainted Iron Hoe", "ItemID", BaseID+31).getInt(BaseID+31); + TaintedStoneHoe = config.get("Tainted Stone Hoe", "ItemID", BaseID+32).getInt(BaseID+32); + TaintedWoodHoe = config.get("Tainted Wood Hoe", "ItemID", BaseID+33).getInt(BaseID+33); + + BlessedDiamondSword = config.get("Blessed Diamond Sword", "ItemID", BaseID+34).getInt(BaseID+34); + BlessedGoldSword = config.get("Blessed Gold Sword", "ItemID", BaseID+35).getInt(BaseID+35); + BlessedIronSword = config.get("Blessed Iron Sword", "ItemID", BaseID+36).getInt(BaseID+36); + BlessedStoneSword = config.get("Blessed Stone Sword", "ItemID", BaseID+37).getInt(BaseID+37); + BlessedWoodSword = config.get("Blessed Wood Sword", "ItemID", BaseID+38).getInt(BaseID+38); + BlessedDiamondPickaxe = config.get("Blessed Diamond Pickaxe", "ItemID", BaseID+39).getInt(BaseID+39); + BlessedGoldPickaxe = config.get("Blessed Gold Pickaxe", "ItemID", BaseID+40).getInt(BaseID+40); + BlessedIronPickaxe = config.get("Blessed Iron Pickaxe", "ItemID", BaseID+41).getInt(BaseID+41); + BlessedStonePickaxe = config.get("Blessed Stone Pickaxe", "ItemID", BaseID+42).getInt(BaseID+42); + BlessedWoodPickaxe = config.get("Blessed Wood Pickaxe", "ItemID", BaseID+43).getInt(BaseID+43); + BlessedDiamondAxe = config.get("Blessed Diamond Axe", "ItemID", BaseID+44).getInt(BaseID+44); + BlessedGoldAxe = config.get("Blessed Gold Axe", "ItemID", BaseID+45).getInt(BaseID+45); + BlessedIronAxe = config.get("Blessed Iron Axe", "ItemID", BaseID+46).getInt(BaseID+46); + BlessedStoneAxe = config.get("Blessed Stone Axe", "ItemID", BaseID+47).getInt(BaseID+47); + BlessedWoodAxe = config.get("Blessed Wood Axe", "ItemID", BaseID+48).getInt(BaseID+48); + BlessedDiamondShovel = config.get("Blessed Diamond Shovel", "ItemID", BaseID+49).getInt(BaseID+49); + BlessedGoldShovel = config.get("Blessed Gold Shovel", "ItemID", BaseID+50).getInt(BaseID+50); + BlessedIronShovel = config.get("Blessed Iron Shovel", "ItemID", BaseID+51).getInt(BaseID+51); + BlessedStoneShovel = config.get("Blessed Stone Shovel", "ItemID", BaseID+52).getInt(BaseID+52); + BlessedWoodShovel = config.get("Blessed Wood Shovel", "ItemID", BaseID+53).getInt(BaseID+53); + BlessedDiamondHoe = config.get("Blessed Diamond Hoe", "ItemID", BaseID+54).getInt(BaseID+54); + BlessedGoldHoe = config.get("Blessed Gold Hoe", "ItemID", BaseID+55).getInt(BaseID+55); + BlessedIronHoe = config.get("Blessed Iron Hoe", "ItemID", BaseID+56).getInt(BaseID+56); + BlessedStoneHoe = config.get("Blessed Stone Hoe", "ItemID", BaseID+57).getInt(BaseID+57); + BlessedWoodHoe = config.get("Blessed Wood Hoe", "ItemID", BaseID+58).getInt(BaseID+58); + + EnderSword = config.get("Ender Sword", "ItemID", BaseID+59).getInt(BaseID+59); + if (config.hasChanged()) { + config.save(); + } + } + + +} diff --git a/src/divine_equipment/common/Divine_Content.java b/src/divine_equipment/common/Divine_Content.java index 326ec5d..9416f27 100644 --- a/src/divine_equipment/common/Divine_Content.java +++ b/src/divine_equipment/common/Divine_Content.java @@ -18,6 +18,7 @@ import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.EnumHelper; +import common.Config; /** * User: Orthus @@ -28,6 +29,8 @@ import net.minecraftforge.common.EnumHelper; public class Divine_Content { public static String modid = Divine_Equipment.modid; + + public static Config config; // Blocks public static Block blessedstone, blessedwood, taintedstone, taintedwood, BlessedAlter, TaintedAlter, EnderAlter, HiddenAlter; // Items @@ -47,23 +50,23 @@ public class Divine_Content { public void registerBlocks() { // Blessed Blocks - blessedstone = new BlessedRock(Divine_Equipment.BlessedSigil, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone"); + blessedstone = new BlessedRock(config.BlessedStone, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone"); GameRegistry.registerBlock(blessedstone, modid+ blessedstone.getUnlocalizedName().substring(5)); LanguageRegistry.addName(blessedstone, "Blessed Stone"); - blessedwood = new BlessedWood(Divine_Equipment.BlessedWood, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood"); + blessedwood = new BlessedWood(config.BlessedWood, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood"); GameRegistry.registerBlock(blessedwood, modid+ blessedwood.getUnlocalizedName().substring(5)); LanguageRegistry.addName(blessedwood, "Blessed Wood"); // Tainted Blocks - taintedstone = new TaintedRock(Divine_Equipment.TaintedStone, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone"); + taintedstone = new TaintedRock(config.TaintedStone, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone"); GameRegistry.registerBlock(taintedstone, modid+ taintedstone.getUnlocalizedName().substring(5)); LanguageRegistry.addName(taintedstone, "Tainted Stone"); - taintedwood = new TaintedWood(Divine_Equipment.TaintedWood, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood"); + taintedwood = new TaintedWood(config.TaintedWood, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood"); GameRegistry.registerBlock(taintedwood, modid+ taintedwood.getUnlocalizedName().substring(5)); LanguageRegistry.addName(taintedwood, "Tainted Wood"); } - void registerMaterials() + public void registerMaterials() { // Tainted Tool Material Properties (Subject to Change) // Name, Harvest Level, Uses, Dig Speed, Damage, Enchantablity @@ -87,146 +90,146 @@ public class Divine_Content { BlessedIronTool = EnumHelper.addToolMaterial("Blessed Iron", 2, 250, 8.0F, 2, 14); BlessedStoneTool = EnumHelper.addToolMaterial("Blessed Stone", 1, 131, 6.0F, 1, 5); BlessedWoodTool = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15); - + } // Ender Materials - + public void registerItems(){ //Telling forge that we are creating stuff // Sigils - BlankSigil = new Sigil(Divine_Equipment.BlankSigil, "Blank_Sigil", "divine_equipment:Blank_Sigil"); + BlankSigil = new Sigil(config.BlankSigil, "Blank_Sigil", "divine_equipment:Blank_Sigil"); LanguageRegistry.addName(BlankSigil, "Blank Sigil"); GameRegistry.addRecipe(new ItemStack(BlankSigil), " s ", "sgs", " s ", 's', Block.stone, 'g', Item.gunpowder); - TaintedSigil = new Sigil(Divine_Equipment.TaintedSigil, "Tainted_Sigil", "divine_equipment:Tainted_Sigil"); + TaintedSigil = new Sigil(config.TaintedSigil, "Tainted_Sigil", "divine_equipment:Tainted_Sigil"); LanguageRegistry.addName(TaintedSigil, "Tainted Sigil"); GameRegistry.addRecipe(new ItemStack(TaintedSigil), "rrr", "rbr", "rrr", 'b', BlankSigil , 'r', Item.blazeRod); - BlessedSigil = new Sigil(Divine_Equipment.BlessedSigil, "Blessed_Sigil", "divine_equipment:Blessed_Sigil"); + BlessedSigil = new Sigil(config.BlessedSigil, "Blessed_Sigil", "divine_equipment:Blessed_Sigil"); LanguageRegistry.addName(BlessedSigil, "Blessed Sigil"); GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil, 'g', Item.ingotGold); - EnderSigil = new Sigil(Divine_Equipment.EnderSigil, "Ender_Sigil", "divine_equipment:Ender_Sigil"); + EnderSigil = new Sigil(config.EnderSigil, "Ender_Sigil", "divine_equipment:Ender_Sigil"); LanguageRegistry.addName(EnderSigil, "Ender Sigil"); GameRegistry.addRecipe(new ItemStack(EnderSigil), "eee", "ebe", "eee", 'b', BlankSigil , 'e', Item.eyeOfEnder); - HiddenSigil = new Sigil(Divine_Equipment.HiddenSigil, "Hidden_Sigil", "Hidden_Sigil"); + HiddenSigil = new Sigil(config.HiddenSigil, "Hidden_Sigil", "Hidden_Sigil"); LanguageRegistry.addName(HiddenSigil, "Hidden Sigil"); GameRegistry.addRecipe(new ItemStack(HiddenSigil), "beb", "ene", "tet", 'b', BlessedSigil, 'n', Item.netherStar, 'e', EnderSigil, 't', TaintedSigil ); // Tainted Items // Tainted Swords - TaintedDiamondSword = new TaintedSword(Divine_Equipment.TaintedDiamondSword, TaintedDiamondTool).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); + TaintedDiamondSword = new TaintedSword(config.TaintedDiamondSword, TaintedDiamondTool).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); - TaintedGoldSword = new TaintedSword(Divine_Equipment.TaintedGoldSword, TaintedGoldTool).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); + TaintedGoldSword = new TaintedSword(config.TaintedGoldSword, TaintedGoldTool).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword"); GameRegistry.addRecipe(new ItemStack(TaintedGoldSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedIronSword = new TaintedSword(Divine_Equipment.TaintedIronSword, TaintedIronTool).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); + TaintedIronSword = new TaintedSword(config.TaintedIronSword, TaintedIronTool).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); LanguageRegistry.addName(TaintedIronSword, "Tainted Iron Sword"); GameRegistry.addRecipe(new ItemStack(TaintedIronSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick); - TaintedStoneSword = new TaintedSword(Divine_Equipment.TaintedStoneSword, TaintedStoneTool).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); + TaintedStoneSword = new TaintedSword(config.TaintedStoneSword, TaintedStoneTool).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); GameRegistry.addRecipe(new ItemStack(TaintedStoneSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); - TaintedWoodSword = new TaintedSword(Divine_Equipment.TaintedWoodSword, TaintedWoodTool).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood"); + TaintedWoodSword = new TaintedSword(config.TaintedWoodSword, TaintedWoodTool).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood"); LanguageRegistry.addName(TaintedWoodSword, "Tainted Wooden Sword"); GameRegistry.addRecipe(new ItemStack(TaintedWoodSword), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); // Pickaxes - TaintedDiamondPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedDiamondPickaxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond"); + TaintedDiamondPickaxe = new TaintedPickaxe(config.TaintedDiamondPickaxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond"); LanguageRegistry.addName(TaintedDiamondPickaxe, "Tainted Diamond Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); - TaintedGoldPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedGoldPickaxe, TaintedGoldTool).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold"); + TaintedGoldPickaxe = new TaintedPickaxe(config.TaintedGoldPickaxe, TaintedGoldTool).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold"); LanguageRegistry.addName(TaintedGoldPickaxe, "Tainted Gold Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedGoldPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedIronPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedIronPickaxe, TaintedIronTool).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron"); + TaintedIronPickaxe = new TaintedPickaxe(config.TaintedIronPickaxe, TaintedIronTool).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron"); LanguageRegistry.addName(TaintedIronPickaxe, "Tainted Iron Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedIronPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick); - TaintedStonePickaxe = new TaintedPickaxe(Divine_Equipment.TaintedStonePickaxe, TaintedStoneTool).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone"); + TaintedStonePickaxe = new TaintedPickaxe(config.TaintedStonePickaxe, TaintedStoneTool).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone"); LanguageRegistry.addName(TaintedStonePickaxe, "Tainted Stone Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedStonePickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); - TaintedWoodPickaxe = new TaintedPickaxe(Divine_Equipment.TaintedWoodPickaxe, TaintedWoodTool).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood"); + TaintedWoodPickaxe = new TaintedPickaxe(config.TaintedWoodPickaxe, TaintedWoodTool).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood"); LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wooden Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedWoodPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); // Axes - TaintedDiamondAxe = new TaintedAxe(Divine_Equipment.TaintedDiamondAxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Axe_Diamond").setTextureName("divine_equipment:Tainted_Axe_Diamond"); + TaintedDiamondAxe = new TaintedAxe(config.TaintedDiamondAxe, TaintedDiamondTool).setUnlocalizedName("Tainted_Axe_Diamond").setTextureName("divine_equipment:Tainted_Axe_Diamond"); LanguageRegistry.addName(TaintedDiamondAxe, "Tainted Diamond Axe"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedDiamondAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); - TaintedGoldAxe = new TaintedAxe(Divine_Equipment.TaintedGoldAxe, TaintedGoldTool).setUnlocalizedName("Tainted_Axe_Gold").setTextureName("divine_equipment:Tainted_Axe_Gold"); + TaintedGoldAxe = new TaintedAxe(config.TaintedGoldAxe, TaintedGoldTool).setUnlocalizedName("Tainted_Axe_Gold").setTextureName("divine_equipment:Tainted_Axe_Gold"); LanguageRegistry.addName(TaintedGoldAxe, "Tainted Gold Axe"); GameRegistry.addRecipe(new ItemStack(TaintedGoldAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedIronAxe = new TaintedAxe(Divine_Equipment.TaintedIronAxe, TaintedIronTool).setUnlocalizedName("Tainted_Axe_Iron").setTextureName("divine_equipment:Tainted_Axe_Iron"); + TaintedIronAxe = new TaintedAxe(config.TaintedIronAxe, TaintedIronTool).setUnlocalizedName("Tainted_Axe_Iron").setTextureName("divine_equipment:Tainted_Axe_Iron"); LanguageRegistry.addName(TaintedIronAxe, "Tainted Iron Axe"); GameRegistry.addRecipe(new ItemStack(TaintedIronAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedGoldAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedStoneAxe = new TaintedAxe(Divine_Equipment.TaintedStoneAxe, TaintedStoneTool).setUnlocalizedName("Tainted_Axe_Stone").setTextureName("divine_equipment:Tainted_Axe_Stone"); + TaintedStoneAxe = new TaintedAxe(config.TaintedStoneAxe, TaintedStoneTool).setUnlocalizedName("Tainted_Axe_Stone").setTextureName("divine_equipment:Tainted_Axe_Stone"); LanguageRegistry.addName(TaintedStoneAxe, "Tainted Stone Axe"); GameRegistry.addRecipe(new ItemStack(TaintedStoneAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedStoneAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); - TaintedWoodAxe = new TaintedAxe(Divine_Equipment.TaintedWoodAxe, TaintedWoodTool).setUnlocalizedName("Tainted_Axe_Wood").setTextureName("divine_equipment:Tainted_Axe_Wood"); + TaintedWoodAxe = new TaintedAxe(config.TaintedWoodAxe, TaintedWoodTool).setUnlocalizedName("Tainted_Axe_Wood").setTextureName("divine_equipment:Tainted_Axe_Wood"); LanguageRegistry.addName(TaintedWoodAxe, "Tainted Wooden Axe"); GameRegistry.addRecipe(new ItemStack(TaintedWoodAxe), "mS ", "ms ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedWoodAxe), " Sm", " sm", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); // Shovels - TaintedDiamondShovel = new TaintedShovel(Divine_Equipment.TaintedDiamondShovel, TaintedDiamondTool).setUnlocalizedName("Tainted_Shovel_Diamond").setTextureName("divine_equipment:Tainted_Shovel_Diamond"); + TaintedDiamondShovel = new TaintedShovel(config.TaintedDiamondShovel, TaintedDiamondTool).setUnlocalizedName("Tainted_Shovel_Diamond").setTextureName("divine_equipment:Tainted_Shovel_Diamond"); LanguageRegistry.addName(TaintedDiamondShovel, "Tainted Diamond Shovel"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); - TaintedGoldShovel = new TaintedShovel(Divine_Equipment.TaintedGoldShovel, TaintedGoldTool).setUnlocalizedName("Tainted_Shovel_Gold").setTextureName("divine_equipment:Tainted_Shovel_Gold"); + TaintedGoldShovel = new TaintedShovel(config.TaintedGoldShovel, TaintedGoldTool).setUnlocalizedName("Tainted_Shovel_Gold").setTextureName("divine_equipment:Tainted_Shovel_Gold"); LanguageRegistry.addName(TaintedGoldShovel, "Tainted Gold Shovel"); GameRegistry.addRecipe(new ItemStack(TaintedGoldShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedIronShovel = new TaintedShovel(Divine_Equipment.TaintedIronShovel, TaintedIronTool).setUnlocalizedName("Tainted_Shovel_Iron").setTextureName("divine_equipment:Tainted_Shovel_Iron"); + TaintedIronShovel = new TaintedShovel(config.TaintedIronShovel, TaintedIronTool).setUnlocalizedName("Tainted_Shovel_Iron").setTextureName("divine_equipment:Tainted_Shovel_Iron"); LanguageRegistry.addName(TaintedIronShovel, "Tainted Iron Shovel"); GameRegistry.addRecipe(new ItemStack(TaintedIronShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick); - TaintedStoneShovel = new TaintedShovel(Divine_Equipment.TaintedStoneShovel, TaintedStoneTool).setUnlocalizedName("Tainted_Shovel_Stone").setTextureName("divine_equipment:Tainted_Shovel_Stone"); + TaintedStoneShovel = new TaintedShovel(config.TaintedStoneShovel, TaintedStoneTool).setUnlocalizedName("Tainted_Shovel_Stone").setTextureName("divine_equipment:Tainted_Shovel_Stone"); LanguageRegistry.addName(TaintedStoneShovel, "Tainted Stone Shovel"); GameRegistry.addRecipe(new ItemStack(TaintedStoneShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); - TaintedWoodShovel = new TaintedShovel(Divine_Equipment.TaintedWoodShovel, TaintedWoodTool).setUnlocalizedName("Tainted_Shovel_Wood").setTextureName("divine_equipment:Tainted_Shovel_Wood"); + TaintedWoodShovel = new TaintedShovel(config.TaintedWoodShovel, TaintedWoodTool).setUnlocalizedName("Tainted_Shovel_Wood").setTextureName("divine_equipment:Tainted_Shovel_Wood"); LanguageRegistry.addName(TaintedWoodShovel, "Tainted Wooden Shovel"); GameRegistry.addRecipe(new ItemStack(TaintedWoodShovel), " m ", " S ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); // Tainted Hoes - TaintedDiamondHoe = new TaintedHoe(Divine_Equipment.TaintedDiamondHoe, TaintedDiamondTool).setUnlocalizedName("Tainted_Hoe_Diamond").setTextureName("divine_equipment:Tainted_Hoe_Diamond"); + TaintedDiamondHoe = new TaintedHoe(config.TaintedDiamondHoe, TaintedDiamondTool).setUnlocalizedName("Tainted_Hoe_Diamond").setTextureName("divine_equipment:Tainted_Hoe_Diamond"); LanguageRegistry.addName(TaintedDiamondHoe, "Tainted Diamond Hoe"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedDiamondHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Item.diamond, 's', Item.stick); - TaintedGoldHoe = new TaintedHoe(Divine_Equipment.TaintedGoldHoe, TaintedGoldTool).setUnlocalizedName("Tainted_Hoe_Gold").setTextureName("divine_equipment:Tainted_Hoe_Gold"); + TaintedGoldHoe = new TaintedHoe(config.TaintedGoldHoe, TaintedGoldTool).setUnlocalizedName("Tainted_Hoe_Gold").setTextureName("divine_equipment:Tainted_Hoe_Gold"); LanguageRegistry.addName(TaintedGoldHoe, "Tainted Gold Hoe"); GameRegistry.addRecipe(new ItemStack(TaintedGoldHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedIronHoe = new TaintedHoe(Divine_Equipment.TaintedIronHoe, TaintedIronTool).setUnlocalizedName("Tainted_Hoe_Iron").setTextureName("divine_equipment:Tainted_Hoe_Iron"); + TaintedIronHoe = new TaintedHoe(config.TaintedIronHoe, TaintedIronTool).setUnlocalizedName("Tainted_Hoe_Iron").setTextureName("divine_equipment:Tainted_Hoe_Iron"); LanguageRegistry.addName(TaintedIronHoe, "Tainted Iron Hoe"); GameRegistry.addRecipe(new ItemStack(TaintedIronHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotIron, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedGoldHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Item.ingotGold, 's', Item.stick); - TaintedStoneHoe = new TaintedHoe(Divine_Equipment.TaintedStoneHoe, TaintedStoneTool).setUnlocalizedName("Tainted_Hoe_Stone").setTextureName("divine_equipment:Tainted_Hoe_Stone"); + TaintedStoneHoe = new TaintedHoe(config.TaintedStoneHoe, TaintedStoneTool).setUnlocalizedName("Tainted_Hoe_Stone").setTextureName("divine_equipment:Tainted_Hoe_Stone"); LanguageRegistry.addName(TaintedStoneHoe, "Tainted Stone Hoe"); GameRegistry.addRecipe(new ItemStack(TaintedStoneHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedStoneHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Block.stone, 's', Item.stick); - TaintedWoodHoe = new TaintedHoe(Divine_Equipment.TaintedWoodHoe, TaintedWoodTool).setUnlocalizedName("Tainted_Hoe_Wood").setTextureName("divine_equipment:Tainted_Hoe_Wood"); + TaintedWoodHoe = new TaintedHoe(config.TaintedWoodHoe, TaintedWoodTool).setUnlocalizedName("Tainted_Hoe_Wood").setTextureName("divine_equipment:Tainted_Hoe_Wood"); LanguageRegistry.addName(TaintedWoodHoe, "Tainted Wooden Hoe"); GameRegistry.addRecipe(new ItemStack(TaintedWoodHoe), "mS ", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(TaintedWoodHoe), " Sm", " s ", " s ", 'S', TaintedSigil, 'm', Block.planks, 's', Item.stick); @@ -235,127 +238,127 @@ public class Divine_Content { // Blessed Swords - BlessedDiamondSword = new BlessedSword(Divine_Equipment.BlessedDiamondSword, BlessedDiamondTool).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); + BlessedDiamondSword = new BlessedSword(config.BlessedDiamondSword, BlessedDiamondTool).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword"); GameRegistry.addRecipe(new ItemStack(BlessedDiamondSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldSword = new BlessedSword(Divine_Equipment.BlessedGoldSword, BlessedGoldTool).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); + BlessedGoldSword = new BlessedSword(config.BlessedGoldSword, BlessedGoldTool).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword"); GameRegistry.addRecipe(new ItemStack(BlessedGoldSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronSword = new BlessedSword(Divine_Equipment.BlessedIronSword, BlessedIronTool).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); + BlessedIronSword = new BlessedSword(config.BlessedIronSword, BlessedIronTool).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); LanguageRegistry.addName(BlessedIronSword, "Blessed Iron Sword"); GameRegistry.addRecipe(new ItemStack(BlessedIronSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); - BlessedStoneSword = new BlessedSword(Divine_Equipment.BlessedStoneSword, BlessedStoneTool).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); + BlessedStoneSword = new BlessedSword(config.BlessedStoneSword, BlessedStoneTool).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); LanguageRegistry.addName(BlessedStoneSword, "Blessed Stone Sword"); GameRegistry.addRecipe(new ItemStack(BlessedStoneSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodSword = new BlessedSword(Divine_Equipment.BlessedWoodSword, BlessedWoodTool).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood"); + BlessedWoodSword = new BlessedSword(config.BlessedWoodSword, BlessedWoodTool).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood"); LanguageRegistry.addName(BlessedWoodSword, "Blessed Wooden Sword"); GameRegistry.addRecipe(new ItemStack(BlessedWoodSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); // Pickaxes - BlessedDiamondPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedDiamondPickaxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); + BlessedDiamondPickaxe = new BlessedPickaxe(config.BlessedDiamondPickaxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe"); GameRegistry.addRecipe(new ItemStack(BlessedDiamondPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedGoldPickaxe, BlessedGoldTool).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold"); + BlessedGoldPickaxe = new BlessedPickaxe(config.BlessedGoldPickaxe, BlessedGoldTool).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold"); LanguageRegistry.addName(BlessedGoldPickaxe, "Blessed Gold Pickaxe"); GameRegistry.addRecipe(new ItemStack(BlessedGoldPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedIronPickaxe, BlessedIronTool).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron"); + BlessedIronPickaxe = new BlessedPickaxe(config.BlessedIronPickaxe, BlessedIronTool).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron"); LanguageRegistry.addName(BlessedIronPickaxe, "Blessed Iron Pickaxe"); GameRegistry.addRecipe(new ItemStack(BlessedIronPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); - BlessedStonePickaxe = new BlessedPickaxe(Divine_Equipment.BlessedStonePickaxe, BlessedStoneTool).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone"); + BlessedStonePickaxe = new BlessedPickaxe(config.BlessedStonePickaxe, BlessedStoneTool).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone"); LanguageRegistry.addName(BlessedStonePickaxe, "Blessed Stone Pickaxe"); GameRegistry.addRecipe(new ItemStack(BlessedStonePickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodPickaxe = new BlessedPickaxe(Divine_Equipment.BlessedWoodPickaxe, BlessedWoodTool).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood"); + BlessedWoodPickaxe = new BlessedPickaxe(config.BlessedWoodPickaxe, BlessedWoodTool).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood"); LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wooden Pickaxe"); GameRegistry.addRecipe(new ItemStack(BlessedWoodPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); // Axes - BlessedDiamondAxe = new BlessedAxe(Divine_Equipment.BlessedDiamondAxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Axe_Diamond").setTextureName("divine_equipment:Blessed_Axe_Diamond"); + BlessedDiamondAxe = new BlessedAxe(config.BlessedDiamondAxe, BlessedDiamondTool).setUnlocalizedName("Blessed_Axe_Diamond").setTextureName("divine_equipment:Blessed_Axe_Diamond"); LanguageRegistry.addName(BlessedDiamondAxe, "Blessed Diamond Axe"); GameRegistry.addRecipe(new ItemStack(BlessedDiamondAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedDiamondAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldAxe = new BlessedAxe(Divine_Equipment.BlessedGoldAxe, BlessedGoldTool).setUnlocalizedName("Blessed_Axe_Gold").setTextureName("divine_equipment:Blessed_Axe_Gold"); + BlessedGoldAxe = new BlessedAxe(config.BlessedGoldAxe, BlessedGoldTool).setUnlocalizedName("Blessed_Axe_Gold").setTextureName("divine_equipment:Blessed_Axe_Gold"); LanguageRegistry.addName(BlessedGoldAxe, "Blessed Gold Axe"); GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronAxe = new BlessedAxe(Divine_Equipment.BlessedIronAxe, BlessedIronTool).setUnlocalizedName("Blessed_Axe_Iron").setTextureName("divine_equipment:Blessed_Axe_Iron"); + BlessedIronAxe = new BlessedAxe(config.BlessedIronAxe, BlessedIronTool).setUnlocalizedName("Blessed_Axe_Iron").setTextureName("divine_equipment:Blessed_Axe_Iron"); LanguageRegistry.addName(BlessedIronAxe, "Blessed Iron Axe"); GameRegistry.addRecipe(new ItemStack(BlessedIronAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedGoldAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedStoneAxe = new BlessedAxe(Divine_Equipment.BlessedStoneAxe, BlessedStoneTool).setUnlocalizedName("Blessed_Axe_Stone").setTextureName("divine_equipment:Blessed_Axe_Stone"); + BlessedStoneAxe = new BlessedAxe(config.BlessedStoneAxe, BlessedStoneTool).setUnlocalizedName("Blessed_Axe_Stone").setTextureName("divine_equipment:Blessed_Axe_Stone"); LanguageRegistry.addName(BlessedStoneAxe, "Blessed Stone Axe"); GameRegistry.addRecipe(new ItemStack(BlessedStoneAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedStoneAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodAxe = new BlessedAxe(Divine_Equipment.BlessedWoodAxe, BlessedWoodTool).setUnlocalizedName("Blessed_Axe_Wood").setTextureName("divine_equipment:Blessed_Axe_Wood"); + BlessedWoodAxe = new BlessedAxe(config.BlessedWoodAxe, BlessedWoodTool).setUnlocalizedName("Blessed_Axe_Wood").setTextureName("divine_equipment:Blessed_Axe_Wood"); LanguageRegistry.addName(BlessedWoodAxe, "Blessed Wooden Axe"); GameRegistry.addRecipe(new ItemStack(BlessedWoodAxe), "mS ", "ms ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedWoodAxe), " Sm", " sm", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); // Shovels - BlessedDiamondShovel = new BlessedShovel(Divine_Equipment.BlessedDiamondShovel, BlessedDiamondTool).setUnlocalizedName("Blessed_Shovel_Diamond").setTextureName("divine_equipment:Blessed_Shovel_Diamond"); + BlessedDiamondShovel = new BlessedShovel(config.BlessedDiamondShovel, BlessedDiamondTool).setUnlocalizedName("Blessed_Shovel_Diamond").setTextureName("divine_equipment:Blessed_Shovel_Diamond"); LanguageRegistry.addName(BlessedDiamondShovel, "Blessed Diamond Shovel"); GameRegistry.addRecipe(new ItemStack(BlessedDiamondShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldShovel = new BlessedShovel(Divine_Equipment.BlessedGoldShovel, BlessedGoldTool).setUnlocalizedName("Blessed_Shovel_Gold").setTextureName("divine_equipment:Blessed_Shovel_Gold"); + BlessedGoldShovel = new BlessedShovel(config.BlessedGoldShovel, BlessedGoldTool).setUnlocalizedName("Blessed_Shovel_Gold").setTextureName("divine_equipment:Blessed_Shovel_Gold"); LanguageRegistry.addName(BlessedGoldShovel, "Blessed Gold Shovel"); GameRegistry.addRecipe(new ItemStack(BlessedGoldShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronShovel = new BlessedShovel(Divine_Equipment.BlessedIronShovel, BlessedIronTool).setUnlocalizedName("Blessed_Shovel_Iron").setTextureName("divine_equipment:Blessed_Shovel_Iron"); + BlessedIronShovel = new BlessedShovel(config.BlessedIronShovel, BlessedIronTool).setUnlocalizedName("Blessed_Shovel_Iron").setTextureName("divine_equipment:Blessed_Shovel_Iron"); LanguageRegistry.addName(BlessedIronShovel, "Blessed Iron Shovel"); GameRegistry.addRecipe(new ItemStack(BlessedIronShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); - BlessedStoneShovel = new BlessedShovel(Divine_Equipment.BlessedStoneShovel, BlessedStoneTool).setUnlocalizedName("Blessed_Shovel_Stone").setTextureName("divine_equipment:Blessed_Shovel_Stone"); + BlessedStoneShovel = new BlessedShovel(config.BlessedStoneShovel, BlessedStoneTool).setUnlocalizedName("Blessed_Shovel_Stone").setTextureName("divine_equipment:Blessed_Shovel_Stone"); LanguageRegistry.addName(BlessedStoneShovel, "Blessed Stone Shovel"); GameRegistry.addRecipe(new ItemStack(BlessedStoneShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodShovel = new BlessedShovel(Divine_Equipment.BlessedWoodShovel, BlessedWoodTool).setUnlocalizedName("Blessed_Shovel_Wood").setTextureName("divine_equipment:Blessed_Shovel_Wood"); + BlessedWoodShovel = new BlessedShovel(config.BlessedWoodShovel, BlessedWoodTool).setUnlocalizedName("Blessed_Shovel_Wood").setTextureName("divine_equipment:Blessed_Shovel_Wood"); LanguageRegistry.addName(BlessedWoodShovel, "Blessed Wooden Shovel"); GameRegistry.addRecipe(new ItemStack(BlessedWoodShovel), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); // Blessed Hoes - BlessedDiamondHoe = new BlessedHoe(Divine_Equipment.BlessedDiamondHoe, BlessedDiamondTool).setUnlocalizedName("Blessed_Hoe_Diamond").setTextureName("divine_equipment:Blessed_Hoe_Diamond"); + BlessedDiamondHoe = new BlessedHoe(config.BlessedDiamondHoe, BlessedDiamondTool).setUnlocalizedName("Blessed_Hoe_Diamond").setTextureName("divine_equipment:Blessed_Hoe_Diamond"); LanguageRegistry.addName(BlessedDiamondHoe, "Blessed Diamond Hoe"); GameRegistry.addRecipe(new ItemStack(BlessedDiamondHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedDiamondHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldHoe = new BlessedHoe(Divine_Equipment.BlessedGoldHoe, BlessedGoldTool).setUnlocalizedName("Blessed_Hoe_Gold").setTextureName("divine_equipment:Blessed_Hoe_Gold"); + BlessedGoldHoe = new BlessedHoe(config.BlessedGoldHoe, BlessedGoldTool).setUnlocalizedName("Blessed_Hoe_Gold").setTextureName("divine_equipment:Blessed_Hoe_Gold"); LanguageRegistry.addName(BlessedGoldHoe, "Blessed Gold Hoe"); GameRegistry.addRecipe(new ItemStack(BlessedGoldHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronHoe = new BlessedHoe(Divine_Equipment.BlessedIronHoe, BlessedIronTool).setUnlocalizedName("Blessed_Hoe_Iron").setTextureName("divine_equipment:Blessed_Hoe_Iron"); + BlessedIronHoe = new BlessedHoe(config.BlessedIronHoe, BlessedIronTool).setUnlocalizedName("Blessed_Hoe_Iron").setTextureName("divine_equipment:Blessed_Hoe_Iron"); LanguageRegistry.addName(BlessedIronHoe, "Blessed Iron Hoe"); GameRegistry.addRecipe(new ItemStack(BlessedIronHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedGoldHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedStoneHoe = new BlessedHoe(Divine_Equipment.BlessedStoneHoe, BlessedStoneTool).setUnlocalizedName("Blessed_Hoe_Stone").setTextureName("divine_equipment:Blessed_Hoe_Stone"); + BlessedStoneHoe = new BlessedHoe(config.BlessedStoneHoe, BlessedStoneTool).setUnlocalizedName("Blessed_Hoe_Stone").setTextureName("divine_equipment:Blessed_Hoe_Stone"); LanguageRegistry.addName(BlessedStoneHoe, "Blessed Stone Hoe"); GameRegistry.addRecipe(new ItemStack(BlessedStoneHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedStoneHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodHoe = new BlessedHoe(Divine_Equipment.BlessedWoodHoe, BlessedWoodTool).setUnlocalizedName("Blessed_Hoe_Wood").setTextureName("divine_equipment:Blessed_Hoe_Wood"); + BlessedWoodHoe = new BlessedHoe(config.BlessedWoodHoe, BlessedWoodTool).setUnlocalizedName("Blessed_Hoe_Wood").setTextureName("divine_equipment:Blessed_Hoe_Wood"); LanguageRegistry.addName(BlessedWoodHoe, "Blessed Wooden Hoe"); GameRegistry.addRecipe(new ItemStack(BlessedWoodHoe), "mS ", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); GameRegistry.addRecipe(new ItemStack(BlessedWoodHoe), " Sm", " s ", " s ", 'S', BlessedSigil, 'm', Block.planks, 's', Item.stick); // Ender Items - EnderSword = new items.ender.EnderSword(Divine_Equipment.EnderSword, EnumToolMaterial.EMERALD).setUnlocalizedName("Ender_Sword").setTextureName("divine_equipment:EnderSword"); + EnderSword = new items.ender.EnderSword(config.EnderSword, EnumToolMaterial.EMERALD).setUnlocalizedName("Ender_Sword").setTextureName("divine_equipment:EnderSword"); LanguageRegistry.addName(EnderSword, "Ender Sword"); GameRegistry.addRecipe(new ItemStack(EnderSword), " s ", " s ", " S ", 's', EnderSigil, 'S', Item.stick); } diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java index 8be0aca..25514af 100644 --- a/src/divine_equipment/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/divine_equipment/Divine_Equipment.java @@ -3,16 +3,16 @@ package divine_equipment; /** * Date: 9/29/13 */ +import common.Config; import common.Divine_Achievements; import common.Divine_Content; -import cpw.mods.fml.common.Loader; +import common.Special_Mentions; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import net.minecraftforge.common.Configuration; -import common.Special_Mentions; @@ -26,102 +26,27 @@ public class Divine_Equipment { @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; - // Common - private int BaseBlockID = 500; - private int BaseID = 1200; - // Blocks - public static int TaintedStone, TaintedWood, BlesssedStone, BlessedWood; + public static Config config; - // Sigils - public static int BlankSigil, TaintedSigil, BlessedSigil, EnderSigil, HiddenSigil; - // Tainted - public static int TaintedDiamondSword, TaintedGoldSword, TaintedIronSword, TaintedStoneSword, TaintedWoodSword, TaintedDiamondPickaxe, TaintedGoldPickaxe, TaintedIronPickaxe, TaintedStonePickaxe, TaintedWoodPickaxe, TaintedDiamondAxe, TaintedGoldAxe, TaintedIronAxe, TaintedStoneAxe, TaintedWoodAxe, TaintedDiamondShovel, TaintedGoldShovel, TaintedIronShovel, TaintedStoneShovel, TaintedWoodShovel, TaintedDiamondHoe, TaintedGoldHoe, TaintedIronHoe, TaintedStoneHoe, TaintedWoodHoe; - // Blessed - public static int BlessedDiamondSword, BlessedGoldSword, BlessedIronSword, BlessedStoneSword, BlessedWoodSword, BlessedDiamondPickaxe, BlessedGoldPickaxe, BlessedIronPickaxe, BlessedStonePickaxe, BlessedWoodPickaxe, BlessedDiamondAxe, BlessedGoldAxe, BlessedIronAxe, BlessedStoneAxe, BlessedWoodAxe, BlessedDiamondShovel, BlessedGoldShovel, BlessedIronShovel, BlessedStoneShovel, BlessedWoodShovel, BlessedDiamondHoe, BlessedGoldHoe, BlessedIronHoe, BlessedStoneHoe, BlessedWoodHoe; - // Ender Items - public static int EnderSword; public Divine_Equipment() { mentions = new Special_Mentions(); + } @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event){ - - Configuration Config = new Configuration(event.getSuggestedConfigurationFile()); - - Config.load(); - TaintedStone = Config.get("tainted stone", "BlockID", BaseBlockID).getInt(BaseBlockID); - TaintedWood = Config.get("tainted wood", "BlockID", BaseBlockID+ 1).getInt(BaseBlockID+1); - BlessedSigil = Config.get("blessed stone", "BlockID", BaseBlockID+2).getInt(BaseBlockID+2); - BlessedWood = Config.get("blessed wood", "BlockID", BaseBlockID+3).getInt(BaseBlockID+3); - BlankSigil = Config.get("Blank Sigil", "ItemID", BaseID+4).getInt(BaseID+4); - TaintedSigil = Config.get("Tainted Sigil", "ItemID", BaseID+5).getInt(BaseID+5); - BlessedSigil = Config.get("Blessed Sigil", "ItemID", BaseID+6).getInt(BaseID+6); - EnderSigil = Config.get("Ender Sigil", "ItemID", BaseID+7).getInt(BaseID+7); - HiddenSigil = Config.get("Hidden Sigil", "ItemID", BaseID+8).getInt(BaseID+8); - - TaintedDiamondSword = Config.get("Tainted Diamond Sword", "ItemID", BaseID+9).getInt(BaseID+9); - TaintedGoldSword = Config.get("Tainted Gold Sword", "ItemID", BaseID+10).getInt(BaseID+10); - TaintedIronSword = Config.get("Tainted Iron Sword", "ItemID", BaseID+11).getInt(BaseID+11); - TaintedStoneSword = Config.get("Tainted Stone Sword", "ItemID", BaseID+12).getInt(BaseID+12); - TaintedWoodSword = Config.get("Tainted Wood Sword", "ItemID", BaseID+13).getInt(BaseID+13); - TaintedDiamondPickaxe = Config.get("Tainted Diamond Pickaxe", "ItemID", BaseID+14).getInt(BaseID+14); - TaintedGoldPickaxe = Config.get("Tainted Gold Pickaxe", "ItemID", BaseID+15).getInt(BaseID+15); - TaintedIronPickaxe = Config.get("Tainted Iron Pickaxe", "ItemID", BaseID+16).getInt(BaseID+16); - TaintedStonePickaxe = Config.get("Tainted Stone Pickaxe", "ItemID", BaseID+17).getInt(BaseID+17); - TaintedWoodPickaxe = Config.get("Tainted Wood Pickaxe", "ItemID", BaseID+18).getInt(BaseID+18); - TaintedDiamondAxe = Config.get("Tainted Diamond Axe", "ItemID", BaseID+19).getInt(BaseID+19); - TaintedGoldAxe = Config.get("Tainted Gold Axe", "ItemID", BaseID+20).getInt(BaseID+20); - TaintedIronAxe = Config.get("Tainted Iron Axe", "ItemID", BaseID+21).getInt(BaseID+21); - TaintedStoneAxe = Config.get("Tainted Stone Axe", "ItemID", BaseID+22).getInt(BaseID+22); - TaintedWoodAxe = Config.get("Tainted Wood Axe", "ItemID", BaseID+23).getInt(BaseID+23); - TaintedDiamondShovel = Config.get("Tainted Diamond Shovel", "ItemID", BaseID+24).getInt(BaseID+24); - TaintedGoldShovel = Config.get("Tainted Gold Shovel", "ItemID", BaseID+25).getInt(BaseID+25); - TaintedIronShovel = Config.get("Tainted Iron Shovel", "ItemID", BaseID+26).getInt(BaseID+26); - TaintedStoneShovel = Config.get("Tainted Stone Shovel", "ItemID", BaseID+27).getInt(BaseID+27); - TaintedWoodShovel = Config.get("Tainted Wood Shovel", "ItemID", BaseID+28).getInt(BaseID+28); - TaintedDiamondHoe = Config.get("Tainted Diamond Hoe", "ItemID", BaseID+29).getInt(BaseID+29); - TaintedGoldHoe = Config.get("Tainted Gold Hoe", "ItemID", BaseID+30).getInt(BaseID+30); - TaintedIronHoe = Config.get("Tainted Iron Hoe", "ItemID", BaseID+31).getInt(BaseID+31); - TaintedStoneHoe = Config.get("Tainted Stone Hoe", "ItemID", BaseID+32).getInt(BaseID+32); - TaintedWoodHoe = Config.get("Tainted Wood Hoe", "ItemID", BaseID+33).getInt(BaseID+33); - - BlessedDiamondSword = Config.get("Blessed Diamond Sword", "ItemID", BaseID+34).getInt(BaseID+34); - BlessedGoldSword = Config.get("Blessed Gold Sword", "ItemID", BaseID+35).getInt(BaseID+35); - BlessedIronSword = Config.get("Blessed Iron Sword", "ItemID", BaseID+36).getInt(BaseID+36); - BlessedStoneSword = Config.get("Blessed Stone Sword", "ItemID", BaseID+37).getInt(BaseID+37); - BlessedWoodSword = Config.get("Blessed Wood Sword", "ItemID", BaseID+38).getInt(BaseID+38); - BlessedDiamondPickaxe = Config.get("Blessed Diamond Pickaxe", "ItemID", BaseID+39).getInt(BaseID+39); - BlessedGoldPickaxe = Config.get("Blessed Gold Pickaxe", "ItemID", BaseID+40).getInt(BaseID+40); - BlessedIronPickaxe = Config.get("Blessed Iron Pickaxe", "ItemID", BaseID+41).getInt(BaseID+41); - BlessedStonePickaxe = Config.get("Blessed Stone Pickaxe", "ItemID", BaseID+42).getInt(BaseID+42); - BlessedWoodPickaxe = Config.get("Blessed Wood Pickaxe", "ItemID", BaseID+43).getInt(BaseID+43); - BlessedDiamondAxe = Config.get("Blessed Diamond Axe", "ItemID", BaseID+44).getInt(BaseID+44); - BlessedGoldAxe = Config.get("Blessed Gold Axe", "ItemID", BaseID+45).getInt(BaseID+45); - BlessedIronAxe = Config.get("Blessed Iron Axe", "ItemID", BaseID+46).getInt(BaseID+46); - BlessedStoneAxe = Config.get("Blessed Stone Axe", "ItemID", BaseID+47).getInt(BaseID+47); - BlessedWoodAxe = Config.get("Blessed Wood Axe", "ItemID", BaseID+48).getInt(BaseID+48); - BlessedDiamondShovel = Config.get("Blessed Diamond Shovel", "ItemID", BaseID+49).getInt(BaseID+49); - BlessedGoldShovel = Config.get("Blessed Gold Shovel", "ItemID", BaseID+50).getInt(BaseID+50); - BlessedIronShovel = Config.get("Blessed Iron Shovel", "ItemID", BaseID+51).getInt(BaseID+51); - BlessedStoneShovel = Config.get("Blessed Stone Shovel", "ItemID", BaseID+52).getInt(BaseID+52); - BlessedWoodShovel = Config.get("Blessed Wood Shovel", "ItemID", BaseID+53).getInt(BaseID+53); - BlessedDiamondHoe = Config.get("Blessed Diamond Hoe", "ItemID", BaseID+54).getInt(BaseID+54); - BlessedGoldHoe = Config.get("Blessed Gold Hoe", "ItemID", BaseID+55).getInt(BaseID+55); - BlessedIronHoe = Config.get("Blessed Iron Hoe", "ItemID", BaseID+56).getInt(BaseID+56); - BlessedStoneHoe = Config.get("Blessed Stone Hoe", "ItemID", BaseID+57).getInt(BaseID+57); - BlessedWoodHoe = Config.get("Blessed Wood Hoe", "ItemID", BaseID+58).getInt(BaseID+58); - - EnderSword = Config.get("Ender Sword", "ItemID", BaseID+59).getInt(BaseID+59); - if (Config.hasChanged()) { - Config.save(); - } + public void preInit(FMLPreInitializationEvent fEvent) + { + config = new Config(new Configuration(fEvent.getSuggestedConfigurationFile())); + } + @Mod.EventHandler + public void load(FMLInitializationEvent fEvent) + { content = new Divine_Content(); achivements = new Divine_Achievements(); } - public static Divine_Content content; - public static Divine_Achievements achivements; - public static Special_Mentions mentions; + public Divine_Content content; + public Divine_Achievements achivements; + public Special_Mentions mentions; } \ No newline at end of file