diff --git a/src/divine_equipment/common/Divine_Achievements.java b/src/divine_equipment/common/Divine_Achievements.java new file mode 100644 index 0000000..cfd4275 --- /dev/null +++ b/src/divine_equipment/common/Divine_Achievements.java @@ -0,0 +1,47 @@ +package common; + +import net.minecraft.item.Item; +import net.minecraft.stats.Achievement; +import net.minecraftforge.common.AchievementPage; + +import static net.minecraftforge.common.AchievementPage.*; + +/** + * User: Orthus + * Date: 10/4/13 + */ + +public class Divine_Achievements { + Item BlessedSigil = Divine_Content.BlessedSigil; + Item BlankSigil = Divine_Content.BlankSigil; + Item TaintedSigil = Divine_Content.TaintedSigil; + Item EnderSigil = Divine_Content.EnderSigil; + + public Divine_Achievements(){ + Divine_Page(); + achievements(); + } + +// Achievements +public static Achievement DivineWill; +public static Achievement HollowBeThyName; +public static Achievement ChildOfTheDamned; +public static Achievement EndersGame; +public static Achievement FallenOne; +public static Achievement Redemption; +public static Achievement ShadowWarrior; +public static AchievementPage Divine_Equipment; + +void achievements(){ + DivineWill = new Achievement(2500, "Divine Will", 0, 0, BlankSigil, null); + HollowBeThyName = new Achievement(2501, "Hollow Be Thy Name", 0, 2, BlessedSigil, DivineWill); + ChildOfTheDamned = new Achievement(2502, "Child Of The Damned", 0, -2, TaintedSigil, DivineWill); + EndersGame = new Achievement(2503, "Enders Game", -2, 0, EnderSigil, DivineWill); +} + +public void Divine_Page() +{ + Divine_Equipment = new AchievementPage("Divine Equipment", HollowBeThyName, ChildOfTheDamned, EndersGame); + registerAchievementPage(Divine_Equipment); +} +} \ No newline at end of file diff --git a/src/divine_equipment/common/Divine_Content.java b/src/divine_equipment/common/Divine_Content.java index 15ae1b2..2ca3446 100644 --- a/src/divine_equipment/common/Divine_Content.java +++ b/src/divine_equipment/common/Divine_Content.java @@ -25,11 +25,46 @@ import net.minecraftforge.common.EnumHelper; public class Divine_Content { public static String modid = Divine_Equipment.modid; - public static Block taintedstone; public static Block blessedstone; public static Block blessedwood; + public static Block blessedalter; + // 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; + // 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 + // Init All Tainted materials EnumToolMaterial TaintedDiamond; EnumToolMaterial TaintedGold; @@ -95,121 +130,99 @@ public class Divine_Content { //Telling forge that we are creating stuff // Blank Sigil - Item BlankSigil;{ BlankSigil = new items.BlankSigil(2558).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 - Item TaintedSigil;{ TaintedSigil = new items.tainted.TaintedSigil(2559).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); - } // Tainted Swords - Item TaintedDiamondSword;{ TaintedDiamondSword = new items.tainted.TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); LanguageRegistry.addName(TaintedDiamondSword, "Tainted Diamond Sword"); - } - Item TaintedGoldSword;{ + TaintedGoldSword = new items.tainted.TaintedGoldSword(2561, TaintedGold).setUnlocalizedName("Tainted_Sword_Gold").setTextureName("divine_equipment:Tainted_Sword_Gold"); LanguageRegistry.addName(TaintedGoldSword, "Tainted Gold Sword"); - } - Item TaintedIronSword;{ + + TaintedIronSword = new TaintedIronSword(2562, TaintedIron).setUnlocalizedName("Tainted_Sword_Iron").setTextureName("divine_equipment:Tainted_Sword_Iron"); LanguageRegistry.addName(TaintedIronSword, "Tainted Iron Sword"); - } - Item TaintedStoneSword;{ + + TaintedStoneSword = new TaintedStoneSword(2563, TaintedStone).setUnlocalizedName("Tainted_Sword_Stone").setTextureName("divine_equipment:Tainted_Sword_Stone"); LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); - } - Item TaintedWoodSword;{ + TaintedWoodSword = new TaintedWoodSword(2564, TaintedWood).setUnlocalizedName("Tainted_Sword_Wood").setTextureName("divine_equipment:Tainted_Sword_Wood"); LanguageRegistry.addName(TaintedWoodSword, "Tainted Wood Sword"); - } + // Pickaxes - Item TaintedDiamondPickaxe;{ + TaintedDiamondPickaxe = new items.tainted.TaintedDiamondPickaxe(2565, TaintedDiamond).setUnlocalizedName("Tainted_Pickaxe_Diamond").setTextureName("divine_equipment:Tainted_Pickaxe_Diamond"); LanguageRegistry.addName(TaintedDiamondPickaxe, "Tainted Diamond Pickaxe"); - } - Item TaintedGoldPickaxe;{ + TaintedGoldPickaxe = new items.tainted.TaintedGoldPickaxe(2566, TaintedGold).setUnlocalizedName("Tainted_Pickaxe_Gold").setTextureName("divine_equipment:Tainted_Pickaxe_Gold"); LanguageRegistry.addName(TaintedGoldPickaxe, "Tainted Gold Pickaxe"); - } - Item TaintedIronPickaxe;{ + TaintedIronPickaxe = new items.tainted.TaintedIronPickaxe(2567, TaintedIron).setUnlocalizedName("Tainted_Pickaxe_Iron").setTextureName("divine_equipment:Tainted_Pickaxe_Iron"); LanguageRegistry.addName(TaintedIronPickaxe, "Tainted Iron Pickaxe"); - } - Item TaintedStonePickaxe;{ + TaintedStonePickaxe = new TaintedStonePickaxe(2568, TaintedStone).setUnlocalizedName("Tainted_Pickaxe_Stone").setTextureName("divine_equipment:Tainted_Pickaxe_Stone"); LanguageRegistry.addName(TaintedStonePickaxe, "Tainted Stone Pickaxe"); - } - Item TaintedWoodPickaxe;{ + TaintedWoodPickaxe = new TaintedWoodPickaxe(2569, TaintedWood).setUnlocalizedName("Tainted_Pickaxe_Wood").setTextureName("divine_equipment:Tainted_Pickaxe_Wood"); LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wood Pickaxe"); - } + // Blessed Items - Item BlessedSigil;{ + BlessedSigil = new items.blessed.BlessedSigil(2579).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil"); LanguageRegistry.addName(BlessedSigil, "Blessed Sigil"); - GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil , 'g', Item.ingotGold); + GameRegistry.addRecipe(new ItemStack(BlessedSigil), "ggg", "gbg", "ggg", 'b', BlankSigil, 'g', Item.ingotGold); - } // Blessed Swords - Item BlessedDiamondSword;{ + BlessedDiamondSword = new items.blessed.BlessedDiamondSword(2580, BlessedDiamond).setUnlocalizedName("Blessed_Sword_Diamond").setTextureName("divine_equipment:Blessed_Sword_Diamond"); LanguageRegistry.addName(BlessedDiamondSword, "Blessed Diamond Sword"); - } - Item BlessedGoldSword;{ + BlessedGoldSword = new items.blessed.BlessedGoldSword(2581, BlessedGold).setUnlocalizedName("Blessed_Sword_Gold").setTextureName("divine_equipment:Blessed_Sword_Gold"); LanguageRegistry.addName(BlessedGoldSword, "Blessed Gold Sword"); - } - Item BlessedIronSword;{ + BlessedIronSword = new BlessedIronSword(2582, BlessedIron).setUnlocalizedName("Blessed_Sword_Iron").setTextureName("divine_equipment:Blessed_Sword_Iron"); LanguageRegistry.addName(BlessedIronSword, "Blessed Iron Sword"); - } - Item BlessedStoneSword;{ + BlessedStoneSword = new BlessedStoneSword(2583, BlessedStone).setUnlocalizedName("Blessed_Sword_Stone").setTextureName("divine_equipment:Blessed_Sword_Stone"); LanguageRegistry.addName(BlessedStoneSword, "Blessed Stone Sword"); - } - Item BlessedWoodSword;{ + BlessedWoodSword = new BlessedWoodSword(2584, BlessedWood).setUnlocalizedName("Blessed_Sword_Wood").setTextureName("divine_equipment:Blessed_Sword_Wood"); LanguageRegistry.addName(BlessedWoodSword, "Blessed Wood Sword"); - } + // Pickaxes - Item BlessedDiamondPickaxe;{ BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(2585, BlessedDiamond).setUnlocalizedName("Blessed_Pickaxe_Diamond").setTextureName("divine_equipment:Blessed_Pickaxe_Diamond"); LanguageRegistry.addName(BlessedDiamondPickaxe, "Blessed Diamond Pickaxe"); - } - Item BlessedGoldPickaxe;{ + BlessedGoldPickaxe = new items.blessed.BlessedGoldPickaxe(2586, BlessedGold).setUnlocalizedName("Blessed_Pickaxe_Gold").setTextureName("divine_equipment:Blessed_Pickaxe_Gold"); LanguageRegistry.addName(BlessedGoldPickaxe, "Blessed Gold Pickaxe"); - } - Item BlessedIronPickaxe;{ + BlessedIronPickaxe = new items.blessed.BlessedIronPickaxe(2587, BlessedIron).setUnlocalizedName("Blessed_Pickaxe_Iron").setTextureName("divine_equipment:Blessed_Pickaxe_Iron"); LanguageRegistry.addName(BlessedIronPickaxe, "Blessed Iron Pickaxe"); - } - Item BlessedStonePickaxe;{ + BlessedStonePickaxe = new BlessedStonePickaxe(2588, BlessedStone).setUnlocalizedName("Blessed_Pickaxe_Stone").setTextureName("divine_equipment:Blessed_Pickaxe_Stone"); LanguageRegistry.addName(BlessedStonePickaxe, "Blessed Stone Pickaxe"); - } - Item BlessedWoodPickaxe;{ + BlessedWoodPickaxe = new BlessedWoodPickaxe(2589, BlessedWood).setUnlocalizedName("Blessed_Pickaxe_Wood").setTextureName("divine_equipment:Blessed_Pickaxe_Wood"); LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wood Pickaxe"); - } + // Ender Items - Item EnderSigil;{ + EnderSigil = new items.ender.EnderSigil(2600).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil"); LanguageRegistry.addName(EnderSigil, "Ender Sigil"); GameRegistry.addRecipe(new ItemStack(EnderSigil), "eee", "ebe", "eee", 'b', BlankSigil , 'e', Item.eyeOfEnder); - } diff --git a/src/divine_equipment/common/Divine_Crafting.java b/src/divine_equipment/common/Divine_Crafting.java deleted file mode 100644 index ea22f2f..0000000 --- a/src/divine_equipment/common/Divine_Crafting.java +++ /dev/null @@ -1,35 +0,0 @@ -package common; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraftforge.common.AchievementPage; - -/** - * User: Orthus - * Date: 10/4/13 - */ -public class Divine_Crafting { - -// Achievement Code -public static Achievement HollowBeThyName; -public static Achievement ChildOfTheDamned; -public static Achievement EndersGame; -public static Achievement FallenOne; -public static Achievement Redemption; -public static Achievement ShadowWarrior; -public static AchievementPage Divine_Equipment = new AchievementPage("Divine Equipment", HollowBeThyName, ChildOfTheDamned, EndersGame, FallenOne, Redemption, ShadowWarrior); - -// Crafting Recipes -void addCraftingRecipes() -{ -ItemStack quartzStack = new ItemStack(Item.netherQuartz); -ItemStack goldStack = new ItemStack(Item.ingotGold); -ItemStack eyeStack = new ItemStack(Item.eyeOfEnder); -ItemStack obsidianStack = new ItemStack(Block.obsidian); -ItemStack stoneStack = new ItemStack(Block.stone); - - -} -} \ No newline at end of file diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java index 259110d..df85aad 100644 --- a/src/divine_equipment/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/divine_equipment/Divine_Equipment.java @@ -3,15 +3,12 @@ package divine_equipment; /** * Date: 9/29/13 */ +import common.Divine_Achievements; import common.Divine_Content; -import common.Divine_Crafting; 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 items.BlankSigil; -import net.minecraft.item.EnumToolMaterial; -import net.minecraft.item.ItemStack; @SuppressWarnings("ALL") @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @@ -20,40 +17,14 @@ public class Divine_Equipment { public static final String modid = "divine_equipment"; - - @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; - // @SidedProxy(clientSide = "divine_equipment.client.ClientProxy", serverSide = "divine_equipment.common.CommonProxy") - // public static CommonProxy proxy; - - // Init all new Tool materials - - // Init All Tainted materials - EnumToolMaterial TaintedDiamond; - EnumToolMaterial TaintedGold; - EnumToolMaterial TaintedIron; - EnumToolMaterial TaintedStone; - EnumToolMaterial TaintedWood; - - // Init All Blessed materials - EnumToolMaterial BlessedDiamond; - EnumToolMaterial BlessedGold; - EnumToolMaterial BlessedIron; - EnumToolMaterial BlessedStone; - EnumToolMaterial BlessedWood; - - - // Init All Ender Infused Materials - - // Will be added after version 1.0 - @Mod.EventHandler public void preInit(FMLPreInitializationEvent event){ content = new Divine_Content(); - addCraftingRecipes = new Divine_Crafting(); + achivements = new Divine_Achievements(); } public static Divine_Content content; - public static Divine_Crafting addCraftingRecipes; + public static Divine_Achievements achivements; } \ No newline at end of file