diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index 6b712592f..3b4dad64a 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -266,6 +266,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Items.bopDiscMud.get(), 1), new Object[] {" M ", "MDM", " M ", 'M', Items.mudball.get(), 'D', Items.bopDisc.get()}); GameRegistry.addRecipe(new ItemStack(Blocks.planks.get(), 1, 10), new Object[] {"##", "##", '#', Blocks.bamboo.get()}); GameRegistry.addRecipe(new ItemStack(Items.jarEmpty.get(), 3, 0), new Object[] {"# #", "# #", "###", '#', Block.glass}); + GameRegistry.addShapelessRecipe(new ItemStack(Items.food.get(), 1, 10), new Object[] {Block.plantYellow, new ItemStack(Item.potion, 1, 0), new ItemStack(Blocks.flowers2.get(), 1, 6), new ItemStack(Blocks.coral.get(), 1, 3), new ItemStack(Blocks.plants.get(), 1, 15), new ItemStack(Items.miscItems.get(), 1, 4), new ItemStack(Items.jarFilled.get(), 1, 0), new ItemStack(Items.food.get(), 1, 0), Item.sugar}); GameRegistry.addRecipe(new ItemStack(Blocks.flesh.get(), 1, 0), new Object[] {"##", "##", '#', new ItemStack(Items.miscItems.get(), 1, 3)}); GameRegistry.addRecipe(new ItemStack(Item.rottenFlesh, 1, 0), new Object[] {"FFF", "FPF", "FFF", 'F', new ItemStack(Items.miscItems.get(), 1, 3), 'P', new ItemStack(Items.jarFilled.get(), 1, 1)}); diff --git a/common/biomesoplenty/items/ItemBOPFood.java b/common/biomesoplenty/items/ItemBOPFood.java index b6b25e7f7..08aed4c97 100644 --- a/common/biomesoplenty/items/ItemBOPFood.java +++ b/common/biomesoplenty/items/ItemBOPFood.java @@ -17,7 +17,7 @@ import biomesoplenty.BiomesOPlenty; public class ItemBOPFood extends ItemFood { - private static final String[] foodTypes = new String[] {"berries", "shroompowder", "wildcarrots", "sunflowerseeds", "saladfruit", "saladveggie", "saladshroom", "earth", "persimmon", "filledhoneycomb"}; + private static final String[] foodTypes = new String[] {"berries", "shroompowder", "wildcarrots", "sunflowerseeds", "saladfruit", "saladveggie", "saladshroom", "earth", "persimmon", "filledhoneycomb", "ambrosia"}; private Icon[] textures; public ItemBOPFood(int par1) @@ -37,6 +37,13 @@ public class ItemBOPFood extends ItemFood player.setItemInUse(itemstack, this.getMaxItemUseDuration(itemstack)); } } + else if (itemstack.getItemDamage() == 10) + { + if (player.canEat(true)) + { + player.setItemInUse(itemstack, this.getMaxItemUseDuration(itemstack)); + } + } else { if (player.canEat(false)) @@ -90,6 +97,10 @@ public class ItemBOPFood extends ItemFood player.getFoodStats().addStats(3, 0.4F); break; + case 10: + player.getFoodStats().addStats(6, 0.8F); + break; + default: player.getFoodStats().addStats(0, 0.0F); break; @@ -101,10 +112,17 @@ public class ItemBOPFood extends ItemFood switch (itemstack.getItemDamage()) { case 4: + if (!player.inventory.addItemStackToInventory(new ItemStack(Item.bowlEmpty))) + player.dropPlayerItem(new ItemStack(Item.bowlEmpty.itemID, 1, 0)); case 5: + if (!player.inventory.addItemStackToInventory(new ItemStack(Item.bowlEmpty))) + player.dropPlayerItem(new ItemStack(Item.bowlEmpty.itemID, 1, 0)); case 6: if (!player.inventory.addItemStackToInventory(new ItemStack(Item.bowlEmpty))) player.dropPlayerItem(new ItemStack(Item.bowlEmpty.itemID, 1, 0)); + case 10: + if (!player.inventory.addItemStackToInventory(new ItemStack(Item.glassBottle))) + player.dropPlayerItem(new ItemStack(Item.glassBottle.itemID, 1, 0)); break; } @@ -139,6 +157,10 @@ public class ItemBOPFood extends ItemFood { return 1; } + if (par1ItemStack.itemID == this.itemID && par1ItemStack.getItemDamage() == 10) + { + return 1; + } return 64; } @@ -164,6 +186,11 @@ public class ItemBOPFood extends ItemFood return 16; } + if (par1ItemStack.itemID == this.itemID && par1ItemStack.getItemDamage() == 10) + { + return 64; + } + return 32; } @@ -198,6 +225,10 @@ public class ItemBOPFood extends ItemFood if (world.rand.nextFloat() < 0.05F) player.addPotionEffect(new PotionEffect(Potion.jump.id, 550, 1)); break; + + case 10: + player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 5000, 4)); + break; } } } diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index a2bed2c1e..36739d0b5 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -298,6 +298,7 @@ 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=Filled Honeycomb +item.bop.food.ambrosia.name=Ambrosia item.bop.dartblower.name=Dart Blower item.bop.dart.dart.name=Dart diff --git a/resources/assets/biomesoplenty/textures/items/ambrosia.png b/resources/assets/biomesoplenty/textures/items/ambrosia.png new file mode 100644 index 000000000..9e6b3709a Binary files /dev/null and b/resources/assets/biomesoplenty/textures/items/ambrosia.png differ