diff --git a/common/biomesoplenty/api/Items.java b/common/biomesoplenty/api/Items.java index f93add215..157012eb8 100644 --- a/common/biomesoplenty/api/Items.java +++ b/common/biomesoplenty/api/Items.java @@ -45,6 +45,7 @@ public class Items public static Optional poison = Optional.absent(); public static Optional dartBlower = Optional.absent(); public static Optional dart = Optional.absent(); + public static Optional gems = Optional.absent(); public static Optional flowerBand = Optional.absent(); public static Optional wadingBoots = Optional.absent(); diff --git a/common/biomesoplenty/blocks/BlockBOPAmethyst.java b/common/biomesoplenty/blocks/BlockBOPAmethyst.java index 19c7676bb..49143efc0 100644 --- a/common/biomesoplenty/blocks/BlockBOPAmethyst.java +++ b/common/biomesoplenty/blocks/BlockBOPAmethyst.java @@ -79,7 +79,7 @@ public class BlockBOPAmethyst extends Block @Override public int idDropped(int meta, Random par2Random, int par3) { - return (meta % 2 == 0) ? Items.miscItems.get().itemID : this.blockID; + return (meta % 2 == 0) ? Items.gems.get().itemID : this.blockID; } @Override @@ -87,7 +87,7 @@ public class BlockBOPAmethyst extends Block { if (meta == 0) { - return 2; + return 0; } if (meta == 1) { @@ -95,7 +95,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 2) { - return 10; + return 1; } if (meta == 3) { @@ -103,7 +103,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 4) { - return 11; + return 2; } if (meta == 5) { @@ -111,7 +111,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 6) { - return 12; + return 3; } if (meta == 7) { @@ -119,7 +119,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 8) { - return 13; + return 4; } if (meta == 9) { @@ -127,7 +127,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 10) { - return 14; + return 5; } if (meta == 11) { @@ -135,7 +135,7 @@ public class BlockBOPAmethyst extends Block } if (meta == 12) { - return 15; + return 6; } if (meta == 13) { diff --git a/common/biomesoplenty/blocks/BlockHive.java b/common/biomesoplenty/blocks/BlockHive.java index aa28ae593..1ed7fc629 100644 --- a/common/biomesoplenty/blocks/BlockHive.java +++ b/common/biomesoplenty/blocks/BlockHive.java @@ -65,6 +65,11 @@ public class BlockHive extends Block @Override public int idDropped(int meta, Random par2Random, int par3) { + if (meta == 0) + { + return Items.miscItems.get().itemID; + } + if (meta == 3) { return Items.food.get().itemID; @@ -76,6 +81,10 @@ public class BlockHive extends Block @Override public int damageDropped(int meta) { + if (meta == 0) + { + return 2; + } if (meta == 2) { return 0; @@ -91,13 +100,17 @@ public class BlockHive extends Block @Override public int quantityDropped(int meta, int fortune, Random random) { + if (meta == 0) + { + return (random.nextInt(3) + 1); + } if (meta == 2) { return 0; } if (meta == 3) { - return random.nextInt(3); + return random.nextInt(2); } return 1; diff --git a/common/biomesoplenty/configuration/BOPAchievements.java b/common/biomesoplenty/configuration/BOPAchievements.java index f36e4451e..e771320a5 100644 --- a/common/biomesoplenty/configuration/BOPAchievements.java +++ b/common/biomesoplenty/configuration/BOPAchievements.java @@ -59,7 +59,7 @@ public class BOPAchievements achThorn = (new Achievement(3087, "bop.achThorn", -5, -1, new ItemStack(Blocks.plants.get(), 1, 5), achMoss)).registerAchievement(); achCoral = (new Achievement(3088, "bop.achCoral", -3, -2, new ItemStack(Blocks.coral.get(), 1, 4), achThorn)).registerAchievement(); - achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Blocks.honeyBlock.get(), 1, 0), achFlower)).registerAchievement(); + achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Items.food.get(), 1, 9), achFlower)).registerAchievement(); achWitherWart = (new Achievement(3090, "bop.achWitherWart", 1, 3, new ItemStack(Blocks.plants.get(), 1, 13), achHoney)).registerAchievement(); achGrave = (new Achievement(3091, "bop.achGrave", -2, 4, new ItemStack(Blocks.grave.get(), 1, 0), achWitherWart)).registerAchievement(); achPhantom = (new Achievement(3092, "bop.achPhantom", 0, 6, new ItemStack(Items.miscItems.get(), 1, 16), achGrave)).registerAchievement().setSpecial(); diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index 0e5b26db6..390cc7293 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -165,13 +165,13 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Block.cloth, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.plants.get(), 1, 7)}); GameRegistry.addRecipe(new ItemStack(Item.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Blocks.mud.get(), 1), new Object[] {"MM", "MM", 'M', Items.mudball.get()}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 3), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 10)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 5), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 11)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 7), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 12)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 13)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 14)}); - GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 15)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 3), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 5), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 7), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 3)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 9), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 4)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 11), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 5)}); + GameRegistry.addRecipe(new ItemStack(Blocks.amethystOre.get(), 1, 13), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.gems.get(), 1, 6)}); GameRegistry.addRecipe(new ItemStack(Blocks.ash.get(), 1), new Object[] {"AA", "AA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBrick.get(), 1), new Object[] {"MM", "MM", 'M', new ItemStack(Items.miscItems.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Blocks.crystal.get(), 1), new Object[] {"CC", "CC", 'C', new ItemStack(Items.miscItems.get(), 1, 4)}); @@ -214,18 +214,18 @@ public class BOPCrafting //Amethyst Tools and Armor if (BOPConfigurationMisc.amethystTools) { - GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.swordAmethyst.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.axeAmethyst.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.hoeAmethyst.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.helmetAmethyst.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ItemStack(Items.chestplateAmethyst.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ItemStack(Items.leggingsAmethyst.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ItemStack(Items.bootsAmethyst.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), Item.ingotIron})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), Item.ingotIron})); - GameRegistry.addRecipe(new ItemStack(Fluids.bopBucket.get(), 1, 0), new Object[] {"XXX", "AXA", "XAX", 'A', new ItemStack(Items.miscItems.get(), 1, 2)}); + GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('X'), Item.ingotIron}); + GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('X'), Item.ingotIron}); + GameRegistry.addRecipe(new ItemStack(Items.swordAmethyst.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('X'), Item.ingotIron}); + GameRegistry.addRecipe(new ItemStack(Items.axeAmethyst.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('X'), Item.ingotIron}); + GameRegistry.addRecipe(new ItemStack(Items.hoeAmethyst.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('X'), Item.ingotIron}); + GameRegistry.addRecipe(new ItemStack(Items.helmetAmethyst.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Items.chestplateAmethyst.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Items.leggingsAmethyst.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Items.bootsAmethyst.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(Items.gems.get(), 1, 0)}); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {" MM", "M S", " S", Character.valueOf('M'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('S'), Item.ingotIron})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MM ", "S M", "S ", Character.valueOf('M'), new ItemStack(Items.gems.get(), 1, 0), Character.valueOf('S'), Item.ingotIron})); + GameRegistry.addRecipe(new ItemStack(Fluids.bopBucket.get(), 1, 0), new Object[] {"XXX", "AXA", "XAX", 'A', new ItemStack(Items.gems.get(), 1, 0)}); } //Flower Bands @@ -243,15 +243,15 @@ public class BOPCrafting if (BOPConfigurationMisc.staffCrafting) { GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(Items.ancientStaff.get(), 1, 3), 'P', new ItemStack(Items.ancientStaff.get(), 1, 2), 'H', new ItemStack(Items.ancientStaff.get(), 1, 1)}); - GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Block.whiteStone, 'T', new ItemStack(Items.miscItems.get(), 1, 13), 'S', new ItemStack(Items.miscItems.get(), 1, 15)}); - GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 2), new Object[] {"EPE", "EEE", "EAE", 'E', Block.whiteStone, 'P', new ItemStack(Items.miscItems.get(), 1, 11), 'A', new ItemStack(Items.miscItems.get(), 1, 14)}); - GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 3), new Object[] {" N ", "ERE", "ETE", 'E', Block.whiteStone, 'R', new ItemStack(Items.miscItems.get(), 1, 10), 'T', new ItemStack(Items.miscItems.get(), 1, 12), 'N', Item.netherStar}); + GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 1), new Object[] {"ESE", "ETE", " E ", 'E', Block.whiteStone, 'T', new ItemStack(Items.gems.get(), 1, 4), 'S', new ItemStack(Items.gems.get(), 1, 6)}); + GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 2), new Object[] {"EPE", "EEE", "EAE", 'E', Block.whiteStone, 'P', new ItemStack(Items.gems.get(), 1, 2), 'A', new ItemStack(Items.gems.get(), 1, 5)}); + GameRegistry.addRecipe(new ItemStack(Items.ancientStaff.get(), 1, 3), new Object[] {" N ", "ERE", "ETE", 'E', Block.whiteStone, 'R', new ItemStack(Items.gems.get(), 1, 1), 'T', new ItemStack(Items.gems.get(), 1, 3), 'N', Item.netherStar}); GameRegistry.addShapelessRecipe(new ItemStack(Items.ancientStaff.get(), 1, 0), new ItemStack(Items.ancientStaff.get(), 1, 4), new ItemStack(Item.netherStar, 1)); } if (BOPConfigurationMisc.enderporterCrafting) { - GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', new ItemStack(Items.miscItems.get(), 1, 16), 'A', new ItemStack(Blocks.amethystOre.get(), 1, 1)}); + GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', new ItemStack(Items.miscItems.get(), 1, 10), 'A', new ItemStack(Items.gems.get(), 1, 0)}); } //Dart Blower @@ -268,19 +268,23 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.bamboo.get(), 8), new Object [] {" #", "# ", Character.valueOf('#'), new ItemStack(Blocks.planks.get(), 1, 10)}); GameRegistry.addRecipe(new ItemStack(Blocks.bamboo.get(), 8), new Object [] {"# ", " #", Character.valueOf('#'), new ItemStack(Blocks.planks.get(), 1, 10)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 2), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 1)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 10), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 3)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 11), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 5)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 12), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 7)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 13), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 9)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 14), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 11)}); - GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 15), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 13)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 0), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 1)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 1), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 3)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 2), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 5)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 3), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 7)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 4), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 9)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 5), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 11)}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.gems.get(), 9, 6), new Object[] {new ItemStack(Blocks.amethystOre.get(), 1, 13)}); //Bone Segments > Bonemeal GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 3, 15), new Object[] {new ItemStack(Blocks.bones.get(), 1, 0)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 6, 15), new Object[] {new ItemStack(Blocks.bones.get(), 1, 1)}); GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 12, 15), new Object[] {new ItemStack(Blocks.bones.get(), 1, 2)}); - + + //Honeycombs + GameRegistry.addRecipe(new ItemStack(Blocks.hive.get(), 1, 0), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.hive.get(), 1, 3), new Object [] {"##", "##", Character.valueOf('#'), new ItemStack(Items.food.get(), 1, 9)}); + //Plants GameRegistry.addShapelessRecipe(new ItemStack(Items.food.get(), 2, 1), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,0)}); GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 1, 3), new Object[] {new ItemStack(Blocks.foliage.get(),1,7)}); @@ -321,16 +325,18 @@ public class BOPCrafting OreDictionary.registerOre("dyeWhite", new ItemStack(Items.miscItems.get(), 1, 8)); OreDictionary.registerOre("dyeBlack", new ItemStack(Items.miscItems.get(), 1, 9)); - OreDictionary.registerOre("gemRuby", new ItemStack(Items.miscItems.get(), 1, 10)); - OreDictionary.registerOre("gemPeridot", new ItemStack(Items.miscItems.get(), 1, 11)); - OreDictionary.registerOre("gemTopaz", new ItemStack(Items.miscItems.get(), 1, 12)); - OreDictionary.registerOre("gemTanzanite", new ItemStack(Items.miscItems.get(), 1, 13)); - OreDictionary.registerOre("gemSapphire", new ItemStack(Items.miscItems.get(), 1, 15)); + OreDictionary.registerOre("gemRuby", new ItemStack(Items.gems.get(), 1, 1)); + OreDictionary.registerOre("gemPeridot", new ItemStack(Items.gems.get(), 1, 2)); + OreDictionary.registerOre("gemTopaz", new ItemStack(Items.gems.get(), 1, 3)); + OreDictionary.registerOre("gemTanzanite", new ItemStack(Items.gems.get(), 1, 4)); + OreDictionary.registerOre("gemMalachite", new ItemStack(Items.gems.get(), 1, 5)); + OreDictionary.registerOre("gemSapphire", new ItemStack(Items.gems.get(), 1, 6)); OreDictionary.registerOre("oreRuby", new ItemStack(Blocks.amethystOre.get(), 1, 2)); OreDictionary.registerOre("oreTopaz", new ItemStack(Blocks.amethystOre.get(), 1, 6)); OreDictionary.registerOre("orePeridot", new ItemStack(Blocks.amethystOre.get(), 1, 4)); OreDictionary.registerOre("oreTanzanite", new ItemStack(Blocks.amethystOre.get(), 1, 8)); + OreDictionary.registerOre("oreMalachite", new ItemStack(Blocks.amethystOre.get(), 1, 10)); OreDictionary.registerOre("oreSapphire", new ItemStack(Blocks.amethystOre.get(), 1, 12)); OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.saplings.get(), 1, OreDictionary.WILDCARD_VALUE)); diff --git a/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java index 8d4daff89..a45ee1009 100644 --- a/common/biomesoplenty/configuration/BOPItems.java +++ b/common/biomesoplenty/configuration/BOPItems.java @@ -31,6 +31,7 @@ import biomesoplenty.items.ItemBOPSword; import biomesoplenty.items.ItemDart; import biomesoplenty.items.ItemDartBlower; import biomesoplenty.items.ItemEnderporter; +import biomesoplenty.items.ItemGems; import com.google.common.base.Optional; @@ -106,6 +107,7 @@ public class BOPItems { // Item declaration Items.food = Optional.of(new ItemBOPFood(BOPConfigurationIDs.foodID).setUnlocalizedName("bop.food")); Items.miscItems = Optional.of(new ItemBOP(BOPConfigurationIDs.miscItemsID).setUnlocalizedName("bop.miscItems")); + Items.gems = Optional.of(new ItemGems(BOPConfigurationIDs.gemsID).setUnlocalizedName("bop.gems")); Items.mudball = Optional.of(new ItemBOPMudball(BOPConfigurationIDs.mudballID).setUnlocalizedName("bop.mudball")); Items.dartBlower = Optional.of(new ItemDartBlower(BOPConfigurationIDs.dartBlowerID).setUnlocalizedName("bop.dartblower")); Items.dart = Optional.of(new ItemDart(BOPConfigurationIDs.dartID).setUnlocalizedName("bop.dart")); diff --git a/common/biomesoplenty/configuration/BOPVanillaCompat.java b/common/biomesoplenty/configuration/BOPVanillaCompat.java index 749bf1a46..bda32cedd 100644 --- a/common/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/common/biomesoplenty/configuration/BOPVanillaCompat.java @@ -39,47 +39,25 @@ public class BOPVanillaCompat { if (BOPConfigurationMisc.dungeonLoot == true) { dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 2)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 11), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 12), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 13), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 14), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 15), 1, 2, 5)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(), 1, 0), 1, 1, 15)); - dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(), 1, 0), 1, 1, 10)); dungeon.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 10), 1, 3, 10)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 11), 1, 3, 10)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 12), 1, 3, 10)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 13), 1, 3, 10)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 14), 1, 3, 10)); - mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 15), 1, 3, 10)); mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 4, 6, 15)); strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25)); strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25)); - strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 15)); - strongholdCorridor.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 10)); strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Items.bopDisc.get()), 1, 1, 4)); strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,3), 1, 4, 25)); strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.flowers.get(),1,2), 1, 4, 25)); - strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 15)); - strongholdCrossing.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 10)); - desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 20)); - desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 15)); desertTemple.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); - jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(),1,0), 1, 1, 20)); - jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(),1,0), 1, 1, 15)); jungleTemple.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); village.addItem(new WeightedRandomChestContent(new ItemStack(Blocks.plants.get(),1,5), 2, 6, 25)); village.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25)); - village.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(), 1, 0), 1, 1, 10)); + village.addItem(new WeightedRandomChestContent(new ItemStack(Items.wadingBoots.get(), 1, 0), 1, 1, 5)); village.addItem(new WeightedRandomChestContent(new ItemStack(Items.flippers.get(), 1, 0), 1, 1, 5)); } } diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index 1a0b04692..369d3674a 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -150,6 +150,7 @@ public class BOPConfigurationIDs public static int flowerBandID; public static int wadingBootsID; public static int flippersID; + public static int gemsID; //Liquid IDs public static int springWaterStillID; @@ -463,6 +464,7 @@ public class BOPConfigurationIDs wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt(); flippersID = config.getItem("Flippers ID", 21089).getInt(); + gemsID = config.getItem("Gems ID", 21090).getInt(); //Mob IDs jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt(); diff --git a/common/biomesoplenty/entities/EntityPhantom.java b/common/biomesoplenty/entities/EntityPhantom.java index 42fc96229..e816525ac 100644 --- a/common/biomesoplenty/entities/EntityPhantom.java +++ b/common/biomesoplenty/entities/EntityPhantom.java @@ -93,7 +93,7 @@ public class EntityPhantom extends EntityMob if (par1 && (this.rand.nextInt(3) == 0 || this.rand.nextInt(1 + par2) > 0)) { - this.entityDropItem(new ItemStack(Items.miscItems.get().itemID, 1, 16), 1); + this.entityDropItem(new ItemStack(Items.miscItems.get().itemID, 1, 10), 1); } } diff --git a/common/biomesoplenty/handlers/BOPPickupHandler.java b/common/biomesoplenty/handlers/BOPPickupHandler.java index 961a8ac7f..a8e3a97f1 100644 --- a/common/biomesoplenty/handlers/BOPPickupHandler.java +++ b/common/biomesoplenty/handlers/BOPPickupHandler.java @@ -46,7 +46,7 @@ public class BOPPickupHandler implements IPickupNotifier } //Bittersweet - if (item.getEntityItem().itemID == Blocks.honeyBlock.get().blockID) + if (item.getEntityItem().itemID == Items.food.get().itemID && (item.getEntityItem().getItemDamage() == 9)) { player.addStat(BOPAchievements.achHoney, 1); } diff --git a/common/biomesoplenty/items/ItemBOP.java b/common/biomesoplenty/items/ItemBOP.java index 69c703f38..b53bd77ee 100644 --- a/common/biomesoplenty/items/ItemBOP.java +++ b/common/biomesoplenty/items/ItemBOP.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBOP extends Item { - private static String[] items = {"mudbrick", "ash", "amethyst", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ruby", "peridot", "topaz", "tanzanite", "malachite", "sapphire", "ghastlysoul"}; + private static String[] items = {"mudbrick", "ash", "emptyhoneycomb", "poison", "crystalshard", "bluedye", "browndye", "greendye", "whitedye", "blackdye", "ghastlysoul"}; @SideOnly(Side.CLIENT) private Icon[] textures; diff --git a/common/biomesoplenty/items/ItemGems.java b/common/biomesoplenty/items/ItemGems.java new file mode 100644 index 000000000..56d63dcc2 --- /dev/null +++ b/common/biomesoplenty/items/ItemGems.java @@ -0,0 +1,67 @@ +package biomesoplenty.items; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import biomesoplenty.BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemGems extends Item +{ + private static String[] gems = {"amethyst", "ruby", "peridot", "topaz", "tanzanite", "malachite", "sapphire"}; + @SideOnly(Side.CLIENT) + private Icon[] textures; + + public ItemGems(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[gems.length]; + + for (int i = 0; i < gems.length; ++i) { + textures[i] = iconRegister.registerIcon("biomesoplenty:"+gems[i]); + } + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) + { + int meta = itemStack.getItemDamage(); + if (meta < 0 || meta >= gems.length) { + meta = 0; + } + + return super.getUnlocalizedName() + "." + gems[meta]; + } + + @Override + public Icon getIconFromDamage(int meta) + { + if (meta < 0 || meta >= textures.length) { + meta = 0; + } + + return textures[meta]; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Override + public void getSubItems(int itemId, CreativeTabs creativeTab, List subTypes) + { + for(int meta = 0; meta < gems.length; ++meta) { + subTypes.add(new ItemStack(itemId, 1, meta)); + } + } +} diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index 77dd95703..bc0a66e68 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -295,7 +295,7 @@ item.bop.food.saladfruit.name=Fruit Salad item.bop.food.saladveggie.name=Veggie Salad item.bop.food.saladshroom.name=Shroom Salad item.bop.food.persimmon.name=Persimmon -item.bop.food.filledhoneycomb.name=Honeycomb +item.bop.food.filledhoneycomb.name=Filled Honeycomb item.bop.dartblower.name=Dart Blower item.bop.dart.dart.name=Dart @@ -305,22 +305,25 @@ item.bop.mudball.name=Mud Ball item.bop.miscItems.mudbrick.name=Mud Brick item.bop.miscItems.ash.name=Pile of Ashes -item.bop.miscItems.amethyst.name=Amethyst + item.bop.miscItems.poison.name=Poison +item.bop.miscItems.emptyhoneycomb.name=Empty Honeycomb item.bop.miscItems.crystalshard.name=Celestial Crystal Shard item.bop.miscItems.bluedye.name=Blue Dye item.bop.miscItems.browndye.name=Brown Dye item.bop.miscItems.greendye.name=Green Dye item.bop.miscItems.whitedye.name=White Dye item.bop.miscItems.blackdye.name=Black Dye -item.bop.miscItems.ruby.name=Ruby -item.bop.miscItems.peridot.name=Peridot -item.bop.miscItems.topaz.name=Topaz -item.bop.miscItems.tanzanite.name=Tanzanite -item.bop.miscItems.malachite.name=Malachite -item.bop.miscItems.sapphire.name=Sapphire item.bop.miscItems.ghastlysoul.name=Ghastly Soul +item.bop.gems.amethyst.name=Amethyst +item.bop.gems.ruby.name=Ruby +item.bop.gems.peridot.name=Peridot +item.bop.gems.topaz.name=Topaz +item.bop.gems.tanzanite.name=Tanzanite +item.bop.gems.malachite.name=Malachite +item.bop.gems.sapphire.name=Sapphire + item.bop.pickaxeMud.name=Muddy Pickaxe item.bop.hatchetMud.name=Muddy Axe item.bop.shovelMud.name=Muddy Shovel diff --git a/resources/assets/biomesoplenty/textures/blocks/altarframe.png b/resources/assets/biomesoplenty/textures/blocks/altarframe.png deleted file mode 100644 index 3164a685b..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/altarframe.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/altarframetop.png b/resources/assets/biomesoplenty/textures/blocks/altarframetop.png deleted file mode 100644 index 94533584a..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/altarframetop.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/celestiallens.png b/resources/assets/biomesoplenty/textures/blocks/celestiallens.png deleted file mode 100644 index 5b93b04c7..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/celestiallens.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/framemalachite.png b/resources/assets/biomesoplenty/textures/blocks/framemalachite.png deleted file mode 100644 index ffdab84b9..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/framemalachite.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/frameperidot.png b/resources/assets/biomesoplenty/textures/blocks/frameperidot.png deleted file mode 100644 index db600d810..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/frameperidot.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/frameruby.png b/resources/assets/biomesoplenty/textures/blocks/frameruby.png deleted file mode 100644 index fc82f455a..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/frameruby.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/framesapphire.png b/resources/assets/biomesoplenty/textures/blocks/framesapphire.png deleted file mode 100644 index 0ed8ea605..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/framesapphire.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/frametanzanite.png b/resources/assets/biomesoplenty/textures/blocks/frametanzanite.png deleted file mode 100644 index a75ca1b35..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/frametanzanite.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/frametopaz.png b/resources/assets/biomesoplenty/textures/blocks/frametopaz.png deleted file mode 100644 index 4dda023bb..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/frametopaz.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/log_dead_heart.png b/resources/assets/biomesoplenty/textures/blocks/log_dead_heart.png index 4d7124266..6eaa85386 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/log_dead_heart.png and b/resources/assets/biomesoplenty/textures/blocks/log_dead_heart.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png b/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png deleted file mode 100644 index 73708a331..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png.mcmeta b/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png.mcmeta deleted file mode 100755 index 71e71ef52..000000000 --- a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_active.png.mcmeta +++ /dev/null @@ -1,24 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 20 - }, - 1, - 2, - 3, - { - "index": 4, - "time": 6 - }, - 3, - 2, - 1, - { - "index": 0, - "time": 20 - } - ] - } -} \ No newline at end of file diff --git a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_empty.png b/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_empty.png deleted file mode 100644 index a8b4e1fbf..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_empty.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png b/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png deleted file mode 100644 index b05d1416e..000000000 Binary files a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png and /dev/null differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png.mcmeta b/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png.mcmeta deleted file mode 100755 index 71e71ef52..000000000 --- a/resources/assets/biomesoplenty/textures/blocks/sacrificialfocus_villager.png.mcmeta +++ /dev/null @@ -1,24 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 20 - }, - 1, - 2, - 3, - { - "index": 4, - "time": 6 - }, - 3, - 2, - 1, - { - "index": 0, - "time": 20 - } - ] - } -} \ No newline at end of file diff --git a/resources/assets/biomesoplenty/textures/items/emptyhoneycomb.png b/resources/assets/biomesoplenty/textures/items/emptyhoneycomb.png new file mode 100644 index 000000000..5a5d79962 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/items/emptyhoneycomb.png differ diff --git a/resources/assets/biomesoplenty/textures/items/filledhoneycomb.png b/resources/assets/biomesoplenty/textures/items/filledhoneycomb.png index 0e43a9ab2..cde2d8e16 100644 Binary files a/resources/assets/biomesoplenty/textures/items/filledhoneycomb.png and b/resources/assets/biomesoplenty/textures/items/filledhoneycomb.png differ