diff --git a/loose redist/assets/divine_equipment/textures/blocks/BlessedStone.png b/loose redist/assets/divine_equipment/textures/blocks/BlessedStone.png index af0deb6..c33af86 100644 Binary files a/loose redist/assets/divine_equipment/textures/blocks/BlessedStone.png and b/loose redist/assets/divine_equipment/textures/blocks/BlessedStone.png differ diff --git a/loose redist/assets/divine_equipment/textures/blocks/BlessedWood.png b/loose redist/assets/divine_equipment/textures/blocks/BlessedWood.png index 3086dcf..af72c8a 100644 Binary files a/loose redist/assets/divine_equipment/textures/blocks/BlessedWood.png and b/loose redist/assets/divine_equipment/textures/blocks/BlessedWood.png differ diff --git a/loose redist/assets/divine_equipment/textures/items/Hidden_Sigil.png b/loose redist/assets/divine_equipment/textures/items/Hidden_Sigil.png new file mode 100644 index 0000000..83d8f96 Binary files /dev/null and b/loose redist/assets/divine_equipment/textures/items/Hidden_Sigil.png differ diff --git a/loose redist/blocks/blessed/BlessedRock.class b/loose redist/blocks/blessed/BlessedRock.class index 6f315bf..e49d425 100644 Binary files a/loose redist/blocks/blessed/BlessedRock.class and b/loose redist/blocks/blessed/BlessedRock.class differ diff --git a/loose redist/blocks/blessed/BlessedWood.class b/loose redist/blocks/blessed/BlessedWood.class index e5e5c5a..9ee14ec 100644 Binary files a/loose redist/blocks/blessed/BlessedWood.class and b/loose redist/blocks/blessed/BlessedWood.class differ diff --git a/loose redist/blocks/tainted/TaintedRock.class b/loose redist/blocks/tainted/TaintedRock.class index 6bdffa4..573161d 100644 Binary files a/loose redist/blocks/tainted/TaintedRock.class and b/loose redist/blocks/tainted/TaintedRock.class differ diff --git a/loose redist/common/Divine_Content.class b/loose redist/common/Divine_Content.class index 2aa71bf..d61a22a 100644 Binary files a/loose redist/common/Divine_Content.class and b/loose redist/common/Divine_Content.class differ diff --git a/loose redist/divine_equipment/Divine_Equipment.class b/loose redist/divine_equipment/Divine_Equipment.class index f43cd4a..05557d5 100644 Binary files a/loose redist/divine_equipment/Divine_Equipment.class and b/loose redist/divine_equipment/Divine_Equipment.class differ diff --git a/loose redist/items/HiddenSigil.class b/loose redist/items/HiddenSigil.class new file mode 100644 index 0000000..2ecd30c Binary files /dev/null and b/loose redist/items/HiddenSigil.class differ diff --git a/redist/Divine Equipment [1.6.4].zip b/redist/Divine Equipment [1.6.4].zip index ab86c31..9c2dfb3 100644 Binary files a/redist/Divine Equipment [1.6.4].zip and b/redist/Divine Equipment [1.6.4].zip differ diff --git a/src/assets/divine_equipment/textures/blocks/BlessedStone.png b/src/assets/divine_equipment/textures/blocks/BlessedStone.png index af0deb6..c33af86 100644 Binary files a/src/assets/divine_equipment/textures/blocks/BlessedStone.png and b/src/assets/divine_equipment/textures/blocks/BlessedStone.png differ diff --git a/src/assets/divine_equipment/textures/blocks/BlessedWood.png b/src/assets/divine_equipment/textures/blocks/BlessedWood.png index 3086dcf..af72c8a 100644 Binary files a/src/assets/divine_equipment/textures/blocks/BlessedWood.png and b/src/assets/divine_equipment/textures/blocks/BlessedWood.png differ diff --git a/src/assets/divine_equipment/textures/items/Hidden_Sigil.png b/src/assets/divine_equipment/textures/items/Hidden_Sigil.png new file mode 100644 index 0000000..83d8f96 Binary files /dev/null and b/src/assets/divine_equipment/textures/items/Hidden_Sigil.png differ diff --git a/src/divine_equipment/blocks/blessed/BlessedRock.java b/src/divine_equipment/blocks/blessed/BlessedRock.java index 89af61b..3bf368b 100644 --- a/src/divine_equipment/blocks/blessed/BlessedRock.java +++ b/src/divine_equipment/blocks/blessed/BlessedRock.java @@ -13,9 +13,9 @@ import net.minecraft.creativetab.CreativeTabs; */ public class BlessedRock extends Block { - public BlessedRock (int id, Material maeterial) + public BlessedRock (int id, Material material) { - super(id, maeterial); + super(id, material); setHardness(1.0F); setStepSound(Block.soundStoneFootstep); setUnlocalizedName("Blessed Stone"); diff --git a/src/divine_equipment/blocks/blessed/BlessedWood.java b/src/divine_equipment/blocks/blessed/BlessedWood.java index 7ed6feb..01c2084 100644 --- a/src/divine_equipment/blocks/blessed/BlessedWood.java +++ b/src/divine_equipment/blocks/blessed/BlessedWood.java @@ -13,9 +13,9 @@ import net.minecraft.creativetab.CreativeTabs; */ public class BlessedWood extends Block { - public BlessedWood (int id, Material maeterial) + public BlessedWood (int id, Material material) { - super(id, maeterial); + super(id, material); setHardness(1.0F); setStepSound(Block.soundWoodFootstep); setUnlocalizedName("Blessed Wood"); diff --git a/src/divine_equipment/blocks/tainted/TaintedRock.java b/src/divine_equipment/blocks/tainted/TaintedRock.java index 95b765a..9baf49f 100644 --- a/src/divine_equipment/blocks/tainted/TaintedRock.java +++ b/src/divine_equipment/blocks/tainted/TaintedRock.java @@ -2,6 +2,7 @@ package blocks.tainted; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import divine_equipment.Divine_Equipment; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -12,10 +13,9 @@ import net.minecraft.creativetab.CreativeTabs; * Date: 10/1/13 */ public class TaintedRock extends Block { - - public TaintedRock (int id, Material maeterial) + public TaintedRock (int id, Material material) { - super(id, maeterial); + super(id, material); setHardness(1.0F); setStepSound(Block.soundStoneFootstep); setUnlocalizedName("Tainted Stone"); diff --git a/src/divine_equipment/common/Divine_Content.java b/src/divine_equipment/common/Divine_Content.java index 4ad7457..09e8700 100644 --- a/src/divine_equipment/common/Divine_Content.java +++ b/src/divine_equipment/common/Divine_Content.java @@ -7,6 +7,7 @@ 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.HiddenSigil; import items.blessed.*; import items.tainted.*; import net.minecraft.block.Block; @@ -25,46 +26,90 @@ import net.minecraftforge.common.EnumHelper; public class Divine_Content { public static String modid = Divine_Equipment.modid; + int TaintedStoneID = Divine_Equipment.TaintedStoneID; + int TaintedWoodID = Divine_Equipment.TaintedWoodID; + int BlesssedStoneID = Divine_Equipment.BlesssedStoneID; + int BlessedWoodID = Divine_Equipment.BlessedWoodID; + int BlankSigilID = Divine_Equipment.BlankSigilID; + int TaintedSigilID = Divine_Equipment.TaintedSigilID; + int BlessedSigilID = Divine_Equipment.BlessedSigilID; + int EnderSigilID = Divine_Equipment.EnderSigilID; + int HiddenSigilID = Divine_Equipment.HiddenSigilID; + int TaintedDiamondSwordID = Divine_Equipment.TaintedDiamondSwordID; + int TaintedGoldSwordID = Divine_Equipment.TaintedGoldSwordID; + int TaintedIronSwordID = Divine_Equipment.TaintedIronSwordID; + int TaintedStoneSwordID = Divine_Equipment.TaintedStoneSwordID; + int TaintedWoodSwordID = Divine_Equipment.TaintedWoodSwordID; + int TaintedDiamondPickaxeID = Divine_Equipment.TaintedDiamondPickaxeID; + int TaintedGoldPickaxeID = Divine_Equipment.TaintedGoldPickaxeID; + int TaintedIronPickaxeID = Divine_Equipment.TaintedIronPickaxeID; + int TaintedStonePickaxeID = Divine_Equipment.TaintedStonePickaxeID; + int TaintedWoodPickaxeID = Divine_Equipment.TaintedWoodPickaxeID; + int BlessedDiamondSwordID = Divine_Equipment.BlessedDiamondSwordID; + int BlessedGoldSwordID = Divine_Equipment.BlessedGoldSwordID; + int BlessedIronSwordID = Divine_Equipment.BlessedIronSwordID; + int BlessedStoneSwordID = Divine_Equipment.BlessedStoneSwordID; + int BlessedWoodSwordID = Divine_Equipment.BlessedWoodSwordID; + int BlessedDiamondPickaxeID = Divine_Equipment.BlessedDiamondPickaxeID; + int BlessedGoldPickaxeID = Divine_Equipment.BlessedGoldPickaxeID; + int BlessedIronPickaxeID = Divine_Equipment.BlessedIronPickaxeID; + int BlessedStonePickaxeID = Divine_Equipment.BlessedStonePickaxeID; + int BlessedWoodPickaxeID = Divine_Equipment.BlessedWoodPickaxeID; + + + //Blessed Blocks public static Block blessedstone; public static Block blessedwood; - public static Block blessedalter; - // Tainted Blocks + + // Tainted Blocks public static Block taintedstone; public static Block taintedwood; - public static Block taintedalter; - // Ender Blocks - public static Block enderalter; + // Sigils public static Item BlankSigil; public static Item BlessedSigil; public static Item TaintedSigil; public static Item EnderSigil; + public static Item HiddenSigil; + + // Alters + public static Block BlessedAlter; + public static Block TaintedAlter; + 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; + // Blessed Swords public static Item BlessedDiamondSword; public static Item BlessedGoldSword; public static Item BlessedIronSword; public static Item BlessedStoneSword; 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; + // Ender + // Hidden + // Init All Tainted materials EnumToolMaterial TaintedDiamond; EnumToolMaterial TaintedGold; @@ -87,17 +132,18 @@ public class Divine_Content { public void registerBlocks() { - blessedstone = new BlessedRock(2551, Material.rock).setUnlocalizedName("Blessed Stone").setTextureName("divine_equipment:BlessedStone"); + // Blessed Blocks + blessedstone = new BlessedRock(BlesssedStoneID, 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(2552, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood"); + blessedwood = new BlessedWood(BlessedWoodID, Material.wood).setUnlocalizedName("Blessed Wood").setTextureName("divine_equipment:BlessedWood"); GameRegistry.registerBlock(blessedwood, modid+ blessedwood.getUnlocalizedName().substring(5)); LanguageRegistry.addName(blessedwood, "Blessed Wood"); -// blessedalter = new BlessedAlter(2554, Material.rock).setUnlocalizedName("Blessed Alter"); - taintedstone = new TaintedRock(2550, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone"); + // Tainted Blocks + taintedstone = new TaintedRock(TaintedStoneID, 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(2553, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood"); + taintedwood = new TaintedWood(TaintedWoodID, Material.wood).setUnlocalizedName("Tainted Wood").setTextureName("divine_equipment:TaintedWood"); GameRegistry.registerBlock(taintedwood, modid+ taintedwood.getUnlocalizedName().substring(5)); LanguageRegistry.addName(taintedwood, "Tainted Wood"); } @@ -117,9 +163,9 @@ public class Divine_Content { */ TaintedDiamond = EnumHelper.addToolMaterial("Tainted Diamond", 3, 1003, 8.0F, 4, 15); TaintedGold = EnumHelper.addToolMaterial("Tainted Gold", 2, 20, 12.0F, 1, 27); - TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 58, 8.0F, 2, 19); - TaintedStone = EnumHelper.addToolMaterial("Tainted Stone", 1, 88, 4.0F, 1, 10 ); - TaintedWood = EnumHelper.addToolMaterial("Tainted Wood", 0, 40, 2.0F, 0, 20); + TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 58, 8.0F, 3, 19); + TaintedStone = EnumHelper.addToolMaterial("Tainted Stone", 1, 88, 4.0F, 2, 10 ); + TaintedWood = EnumHelper.addToolMaterial("Tainted Wood", 0, 40, 2.0F, 1, 20); // Blessed tool Material Properties (Subject to Change) BlessedDiamond = EnumHelper.addToolMaterial("Blessed Diamond", 3, 2850, 10.0F, 3, 22); @@ -129,122 +175,114 @@ public class Divine_Content { BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15); //Telling forge that we are creating stuff - // Blank Sigil + // Sigils - BlankSigil = new items.BlankSigil(2558).setUnlocalizedName("Blank_Sigil").setTextureName("divine_equipment:Blank_Sigil"); + BlankSigil = new items.BlankSigil(BlankSigilID).setUnlocalizedName("Blank_Sigil").setTextureName("divine_equipment:Blank_Sigil"); LanguageRegistry.addName(BlankSigil, "Blank Sigil"); GameRegistry.addRecipe(new ItemStack(BlankSigil), " s ", "sgs", " s ", 's', Block.stone, 'g', Item.gunpowder); - - // Tainted Items - TaintedSigil = new items.tainted.TaintedSigil(2559).setUnlocalizedName("Tainted_Sigil").setTextureName("divine_equipment:Tainted_Sigil"); + TaintedSigil = new items.tainted.TaintedSigil(TaintedSigilID).setUnlocalizedName("Tainted_Sigil").setTextureName("divine_equipment:Tainted_Sigil"); LanguageRegistry.addName(TaintedSigil, "Tainted Sigil"); GameRegistry.addRecipe(new ItemStack(TaintedSigil), "rrr", "rbr", "rrr", 'b', BlankSigil , 'r', Item.blazeRod); + BlessedSigil = new items.blessed.BlessedSigil(BlessedSigilID).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil"); + LanguageRegistry.addName(BlessedSigil, "Blessed Sigil"); + GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil, 'g', Item.ingotGold); + + EnderSigil = new items.ender.EnderSigil(EnderSigilID).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil"); + LanguageRegistry.addName(EnderSigil, "Ender Sigil"); + GameRegistry.addRecipe(new ItemStack(EnderSigil), "eee", "ebe", "eee", 'b', BlankSigil , 'e', Item.eyeOfEnder); + + HiddenSigil = new HiddenSigil(HiddenSigilID).setUnlocalizedName("Hidden_Sigil").setTextureName("divine_equipment: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 items.tainted.TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); + TaintedDiamondSword = new items.tainted.TaintedDiamondSword(TaintedDiamondSwordID, TaintedDiamond).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 items.tainted.TaintedGoldSword(2561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); + TaintedGoldSword = new items.tainted.TaintedGoldSword(TaintedGoldSwordID, TaintedGold).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 TaintedIronSword(2562, TaintedIron).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); + TaintedIronSword = new TaintedIronSword(TaintedIronSwordID, TaintedIron).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 TaintedStoneSword(2563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); + TaintedStoneSword = new TaintedStoneSword(TaintedStoneSwordID, TaintedStone).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 TaintedWoodSword(2564, TaintedWood).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood"); + TaintedWoodSword = new TaintedWoodSword(TaintedWoodSwordID, TaintedWood).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.wood, 's', Item.stick); // Pickaxes - TaintedDiamondPickaxe = new items.tainted.TaintedDiamondPickaxe(2565, TaintedDiamond).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond"); + TaintedDiamondPickaxe = new items.tainted.TaintedDiamondPickaxe(TaintedDiamondPickaxeID, TaintedDiamond).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 items.tainted.TaintedGoldPickaxe(2566, TaintedGold).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold"); + TaintedGoldPickaxe = new items.tainted.TaintedGoldPickaxe(TaintedGoldPickaxeID, TaintedGold).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 items.tainted.TaintedIronPickaxe(2567, TaintedIron).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron"); + TaintedIronPickaxe = new items.tainted.TaintedIronPickaxe(TaintedIronPickaxeID, TaintedIron).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 TaintedStonePickaxe(2568, TaintedStone).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone"); + TaintedStonePickaxe = new TaintedStonePickaxe(TaintedStonePickaxeID, TaintedStone).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 TaintedWoodPickaxe(2569, TaintedWood).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood"); + TaintedWoodPickaxe = new TaintedWoodPickaxe(TaintedWoodPickaxeID, TaintedWood).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.wood, 's', Item.stick); - // Blessed Items - - - BlessedSigil = new items.blessed.BlessedSigil(2579).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil"); - LanguageRegistry.addName(BlessedSigil, "Blessed Sigil"); - GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil, 'g', Item.ingotGold); - + // Blessed Items // Blessed Swords - BlessedDiamondSword = new items.blessed.BlessedDiamondSword(2580, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); + BlessedDiamondSword = new items.blessed.BlessedDiamondSword(BlessedDiamondSwordID, BlessedDiamond).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 items.blessed.BlessedGoldSword(2581, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); + BlessedGoldSword = new items.blessed.BlessedGoldSword(BlessedGoldSwordID, BlessedGold).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 BlessedIronSword(2582, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); + BlessedIronSword = new BlessedIronSword(BlessedIronSwordID, BlessedIron).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 BlessedStoneSword(2583, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); + BlessedStoneSword = new BlessedStoneSword(BlessedStoneSwordID, BlessedStone).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 BlessedWoodSword(2584, BlessedWood).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood"); + BlessedWoodSword = new BlessedWoodSword(BlessedWoodSwordID, BlessedWood).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.wood, 's', Item.stick); // Pickaxes - BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(2585, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); + BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(BlessedDiamondPickaxeID, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedDiamondPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.diamond, 's', Item.stick); - BlessedGoldPickaxe = new items.blessed.BlessedGoldPickaxe(2586, BlessedGold).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold"); + BlessedGoldPickaxe = new items.blessed.BlessedGoldPickaxe(BlessedGoldPickaxeID, BlessedGold).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold"); LanguageRegistry.addName(BlessedGoldPickaxe, "Blessed Gold Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedWoodPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotGold, 's', Item.stick); - BlessedIronPickaxe = new items.blessed.BlessedIronPickaxe(2587, BlessedIron).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron"); + BlessedIronPickaxe = new items.blessed.BlessedIronPickaxe(BlessedIronPickaxeID, BlessedIron).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron"); LanguageRegistry.addName(BlessedIronPickaxe, "Blessed Iron Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedWoodPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Item.ingotIron, 's', Item.stick); - BlessedStonePickaxe = new BlessedStonePickaxe(2588, BlessedStone).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone"); + BlessedStonePickaxe = new BlessedStonePickaxe(BlessedStonePickaxeID, BlessedStone).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone"); LanguageRegistry.addName(BlessedStonePickaxe, "Blessed Stone Pickaxe"); GameRegistry.addRecipe(new ItemStack(TaintedStonePickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.stone, 's', Item.stick); - BlessedWoodPickaxe = new BlessedWoodPickaxe(2589, BlessedWood).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood"); + BlessedWoodPickaxe = new BlessedWoodPickaxe(BlessedWoodPickaxeID, BlessedWood).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.wood, 's', Item.stick); - - // Ender Items - - - EnderSigil = new items.ender.EnderSigil(2600).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil"); - LanguageRegistry.addName(EnderSigil, "Ender Sigil"); - GameRegistry.addRecipe(new ItemStack(EnderSigil), "eee", "ebe", "eee", 'b', BlankSigil , 'e', Item.eyeOfEnder); - - - - - } } diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java index 21dde5d..6339125 100644 --- a/src/divine_equipment/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/divine_equipment/Divine_Equipment.java @@ -9,6 +9,10 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; +import net.minecraftforge.common.Configuration; + + + @SuppressWarnings("ALL") @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" }) @@ -16,17 +20,78 @@ public class Divine_Equipment { public static final String modid = "divine_equipment"; + public static int TaintedStoneID; + public static int TaintedWoodID; + public static int BlesssedStoneID; + public static int BlessedWoodID; + public static int BlankSigilID; + public static int TaintedSigilID; + public static int BlessedSigilID; + public static int EnderSigilID; + public static int HiddenSigilID; + public static int TaintedDiamondSwordID; + public static int TaintedGoldSwordID; + public static int TaintedIronSwordID; + public static int TaintedStoneSwordID; + public static int TaintedWoodSwordID; + public static int TaintedDiamondPickaxeID; + public static int TaintedGoldPickaxeID; + public static int TaintedIronPickaxeID; + public static int TaintedStonePickaxeID; + public static int TaintedWoodPickaxeID; + public static int BlessedDiamondSwordID; + public static int BlessedGoldSwordID; + public static int BlessedIronSwordID; + public static int BlessedStoneSwordID; + public static int BlessedWoodSwordID; + public static int BlessedDiamondPickaxeID; + public static int BlessedGoldPickaxeID; + public static int BlessedIronPickaxeID; + public static int BlessedStonePickaxeID; + public static int BlessedWoodPickaxeID; + @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event){ - content = new Divine_Content(); - achivements = new Divine_Achievements(); -} - + Configuration Divine_Equipment = new Configuration(event.getSuggestedConfigurationFile()); + Divine_Equipment.load(); + TaintedStoneID = Divine_Equipment.getBlock("tainted stone", 2550).getInt(); + TaintedWoodID = Divine_Equipment.getBlock("tainted wood", 2551).getInt(); + BlesssedStoneID = Divine_Equipment.getBlock("blessed stone", 2552).getInt(); + BlessedWoodID = Divine_Equipment.getBlock("blessed wood", 2553).getInt(); + BlankSigilID = Divine_Equipment.getItem("Blank Sigil", 6557).getInt(); + TaintedSigilID = Divine_Equipment.getItem("Tainted Sigil", 6558).getInt(); + BlessedSigilID = Divine_Equipment.getItem("Blessed Sigil", 2559).getInt(); + EnderSigilID = Divine_Equipment.getItem("Ender Sigil", 6560).getInt(); + HiddenSigilID = Divine_Equipment.getItem("Hidden Sigil", 6561).getInt(); + TaintedDiamondSwordID = Divine_Equipment.getItem("Tainted Diamond Sword", 6570).getInt(); + TaintedGoldSwordID = Divine_Equipment.getItem("Tainted Gold Sword", 6571).getInt(); + TaintedIronSwordID = Divine_Equipment.getItem("Tainted Iron Sword", 6572).getInt(); + TaintedStoneSwordID = Divine_Equipment.getItem("Tainted Stone Sword", 6573).getInt(); + TaintedWoodSwordID = Divine_Equipment.getItem("Tainted Wood Sword", 6574).getInt(); + TaintedDiamondPickaxeID = Divine_Equipment.getItem("Tainted Diamond Pickaxe", 6575).getInt(); + TaintedGoldPickaxeID = Divine_Equipment.getItem("Tainted Gold Pickaxe", 6576).getInt(); + TaintedIronPickaxeID = Divine_Equipment.getItem("Tainted Iron Pickaxe", 6577).getInt(); + TaintedStonePickaxeID = Divine_Equipment.getItem("Tainted Stone Pickaxe", 6578).getInt(); + TaintedWoodPickaxeID = Divine_Equipment.getItem("Tainted Wood Pickaxe", 6579).getInt(); + BlessedDiamondSwordID = Divine_Equipment.getItem("Blessed Diamond Sword", 6593).getInt(); + BlessedGoldSwordID = Divine_Equipment.getItem("Blessed Gold Sword", 6594).getInt(); + BlessedIronSwordID = Divine_Equipment.getItem("Blessed Iron Sword", 6595).getInt(); + BlessedStoneSwordID = Divine_Equipment.getItem("Blessed Stone Sword", 6596).getInt(); + BlessedWoodSwordID = Divine_Equipment.getItem("Blessed Wood Sword", 6597).getInt(); + BlessedDiamondPickaxeID = Divine_Equipment.getItem("Blessed Diamond Pickaxe", 6598).getInt(); + BlessedGoldPickaxeID = Divine_Equipment.getItem("Blessed Gold Pickaxe", 6599).getInt(); + BlessedIronPickaxeID = Divine_Equipment.getItem("Blessed Iron Pickaxe", 6600).getInt(); + BlessedStonePickaxeID = Divine_Equipment.getItem("Blessed Stone Pickaxe", 6601).getInt(); + BlessedWoodPickaxeID = Divine_Equipment.getItem("Blessed Wood Pickaxe", 6902).getInt(); + Divine_Equipment.save(); + content = new Divine_Content(); + achivements = new Divine_Achievements(); + } public static Divine_Content content; public static Divine_Achievements achivements; } \ No newline at end of file diff --git a/src/divine_equipment/items/HiddenSigil.java b/src/divine_equipment/items/HiddenSigil.java new file mode 100644 index 0000000..ceee595 --- /dev/null +++ b/src/divine_equipment/items/HiddenSigil.java @@ -0,0 +1,15 @@ +package items; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +/** + * User: Orthus + * Date: 10/7/13 + */ +public class HiddenSigil extends Item { + public HiddenSigil(int id){ + super(id); + setCreativeTab(CreativeTabs.tabMaterials); + } +}