diff --git a/loose redist/common/Divine_Achievements.class b/loose redist/common/Divine_Achievements.class new file mode 100644 index 0000000..61401c8 Binary files /dev/null and b/loose redist/common/Divine_Achievements.class differ diff --git a/loose redist/common/Divine_Content.class b/loose redist/common/Divine_Content.class index b7044ee..bf69e40 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 fb2e2a7..f43cd4a 100644 Binary files a/loose redist/divine_equipment/Divine_Equipment.class and b/loose redist/divine_equipment/Divine_Equipment.class differ diff --git a/redist/Divine Equipment [1.6.4].zip b/redist/Divine Equipment [1.6.4].zip index 0752944..be8c33b 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/divine_equipment/common/Divine_Achievements.java b/src/divine_equipment/common/Divine_Achievements.java index cfd4275..52009dc 100644 --- a/src/divine_equipment/common/Divine_Achievements.java +++ b/src/divine_equipment/common/Divine_Achievements.java @@ -2,9 +2,6 @@ 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 @@ -16,9 +13,11 @@ public class Divine_Achievements { Item BlankSigil = Divine_Content.BlankSigil; Item TaintedSigil = Divine_Content.TaintedSigil; Item EnderSigil = Divine_Content.EnderSigil; +// Item BlssedAlter = Divine_Content.BlessedAlter; +// Item TaintedAlter = Divine_Content.TaintedAlter; +// Item EnderAlter = Divine_Content.EnderAlter; public Divine_Achievements(){ - Divine_Page(); achievements(); } @@ -27,21 +26,18 @@ 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; +//public static Achievement FallenOne; +//public static Achievement Redemption; +//public static Achievement ShadowWarrior; 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); -} + DivineWill = new Achievement(2500, "Divine Will", 20, 20, BlankSigil, null); + HollowBeThyName = new Achievement(2501, "Hollow Be Thy Name", 18, 20, BlessedSigil, DivineWill); + ChildOfTheDamned = new Achievement(2502, "Child Of The Damned", 20, 18, TaintedSigil, DivineWill); + EndersGame = new Achievement(2503, "Enders Game", 22, 20, EnderSigil, DivineWill); +// Redemption = new Achievement(2505, "Redemption", 4, 0, BlssedAlter, HollowBeThyName); +// FallenOne = new Achievement(2504, "Fallon One", 0, -6, TaintedAlter, ChildOfTheDamned); +// ShadowWarrior = new Achievement(2506, "Shadow Warror", -2, -4, EnderAlter, EndersGame); + +}} -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 2ca3446..d1a2de4 100644 --- a/src/divine_equipment/common/Divine_Content.java +++ b/src/divine_equipment/common/Divine_Content.java @@ -87,15 +87,16 @@ public class Divine_Content { public void registerBlocks() { - taintedstone = new TaintedRock(2550, Material.rock).setUnlocalizedName("Tainted Stone").setTextureName("divine_equipment:TaintedStone"); - GameRegistry.registerBlock(taintedstone, modid+ taintedstone.getUnlocalizedName().substring(5)); - LanguageRegistry.addName(taintedstone, "Tainted Stone"); blessedstone = new BlessedRock(2551, 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"); 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"); + 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"); GameRegistry.registerBlock(taintedwood, modid+ taintedwood.getUnlocalizedName().substring(5)); LanguageRegistry.addName(taintedwood, "Tainted Wood"); @@ -143,39 +144,47 @@ public class Divine_Content { // Tainted Swords TaintedDiamondSword = new items.tainted.TaintedDiamondSword(2560, 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"); 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"); 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"); 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"); - LanguageRegistry.addName(TaintedWoodSword, "Tainted Wood Sword"); + 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"); 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"); 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"); 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"); 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"); - LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wood Pickaxe"); + LanguageRegistry.addName(TaintedWoodPickaxe, "Tainted Wooden Pickaxe"); + GameRegistry.addRecipe(new ItemStack(TaintedWoodPickaxe), "mSm", " s ", " s ", 'S', TaintedSigil, 'm', Block.wood, 's', Item.stick); - // Blessed Items + // Blessed Items BlessedSigil = new items.blessed.BlessedSigil(2579).setUnlocalizedName("Blessed_Sigil").setTextureName("divine_equipment:Blessed_Sigil"); @@ -186,37 +195,47 @@ public class Divine_Content { BlessedDiamondSword = new items.blessed.BlessedDiamondSword(2580, 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"); 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"); 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"); 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"); - LanguageRegistry.addName(BlessedWoodSword, "Blessed Wood Sword"); + LanguageRegistry.addName(BlessedWoodSword, "Blessed Wooden Sword"); + GameRegistry.addRecipe(new ItemStack(BlessedWoodSword), " m ", " S ", " s ", 'S', BlessedSigil, 'm', Block.wood, 's', Item.stick); - // Pickaxes + // Pickaxes BlessedDiamondPickaxe = new items.blessed.BlessedDiamondPickaxe(2585, 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"); 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"); 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"); 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"); - LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wood Pickaxe"); + LanguageRegistry.addName(BlessedWoodPickaxe, "Blessed Wooden Pickaxe"); + GameRegistry.addRecipe(new ItemStack(BlessedWoodPickaxe), "mSm", " s ", " s ", 'S', BlessedSigil, 'm', Block.wood, 's', Item.stick); - // Ender Items + // Ender Items EnderSigil = new items.ender.EnderSigil(2600).setUnlocalizedName("Ender_Sigil").setTextureName("divine_equipment:Ender_Sigil"); diff --git a/src/divine_equipment/divine_equipment/Divine_Equipment.java b/src/divine_equipment/divine_equipment/Divine_Equipment.java index df85aad..21dde5d 100644 --- a/src/divine_equipment/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/divine_equipment/Divine_Equipment.java @@ -9,7 +9,6 @@ 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; - @SuppressWarnings("ALL") @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" }) @@ -17,6 +16,7 @@ public class Divine_Equipment { public static final String modid = "divine_equipment"; + @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; @@ -24,7 +24,9 @@ public class Divine_Equipment public void preInit(FMLPreInitializationEvent event){ 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/mcmod.info b/src/mcmod.info similarity index 100% rename from src/divine_equipment/mcmod.info rename to src/mcmod.info