diff --git a/common/biomesoplenty/configuration/BOPAchievements.java b/common/biomesoplenty/configuration/BOPAchievements.java index 117fa5896..449023baf 100644 --- a/common/biomesoplenty/configuration/BOPAchievements.java +++ b/common/biomesoplenty/configuration/BOPAchievements.java @@ -39,7 +39,7 @@ public class BOPAchievements public static Achievement achPromised; public static Achievement achCelestial; - public static Achievement achBird; + public static Achievement achAmbrosia; public static AchievementPage pageBiome; @@ -66,10 +66,10 @@ public class BOPAchievements achPromised = (new Achievement(3093, "bop.achPromised", 1, -3, new ItemStack(Blocks.holyGrass.get(), 1, 0), achFlower)).registerAchievement().setSpecial(); achCelestial = (new Achievement(3094, "bop.achCelestial", -1, -4, new ItemStack(Items.miscItems.get(), 1, 4), achPromised)).registerAchievement(); - achBird = (new Achievement(3095, "bop.achBird", 0, -6, new ItemStack(Item.feather, 1, 0), achCelestial)).registerAchievement(); + achAmbrosia = (new Achievement(3095, "bop.achAmbrosia", 0, -6, new ItemStack(Items.food.get(), 1, 10), achCelestial)).registerAchievement(); biomesOPlentyAchievementList = new Achievement[] { achFlower, achFlowerBand, achDartBlower, achScythe, achEnderporter, achBerry, achMoss, achThorn, achCoral, - achHoney, achWitherWart, achGrave, achPhantom, achPromised, achCelestial, achBird}; + achHoney, achWitherWart, achGrave, achPhantom, achPromised, achCelestial, achAmbrosia}; pageBiome = new AchievementPage("Biomes O\' Plenty", biomesOPlentyAchievementList); diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index 3b4dad64a..a19d55232 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -263,7 +263,6 @@ 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}); diff --git a/common/biomesoplenty/configuration/BOPVanillaCompat.java b/common/biomesoplenty/configuration/BOPVanillaCompat.java index bda32cedd..516875778 100644 --- a/common/biomesoplenty/configuration/BOPVanillaCompat.java +++ b/common/biomesoplenty/configuration/BOPVanillaCompat.java @@ -38,7 +38,6 @@ 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(Blocks.colorizedSaplings.get(),1,6), 1, 1, 1)); mineshaft.addItem(new WeightedRandomChestContent(new ItemStack(Items.miscItems.get(), 1, 1), 2, 8, 25)); diff --git a/common/biomesoplenty/entities/EntityGlob.java b/common/biomesoplenty/entities/EntityGlob.java index 83c0eff90..3942b2d6b 100644 --- a/common/biomesoplenty/entities/EntityGlob.java +++ b/common/biomesoplenty/entities/EntityGlob.java @@ -5,6 +5,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; @@ -262,15 +263,25 @@ public class EntityGlob extends EntityLiving implements IMob { return "mob.slime." + (this.getGlobSize() > 1 ? "big" : "small"); } + + @Override + protected void dropFewItems(boolean par1, int par2) + { + int var3 = rand.nextInt(3) + rand.nextInt(1 + par2); + + if (rand.nextInt(1000) == 0) + { + this.entityDropItem(new ItemStack(Items.bopDiscMud.get(), 1, 1), 0.0F); + } - /** - * Returns the item ID for the item the mob drops on death. - */ - @Override - protected int getDropItemId() - { - return this.getGlobSize() == 1 ? Item.slimeBall.itemID : Items.mudball.get().itemID; - } + for (int var4 = 0; var4 < var3; ++var4) + { + this.entityDropItem(new ItemStack(Items.mudball.get(), 1, 1), 0.0F); + } + + + this.dropItem(Item.slimeBall.itemID, 1); + } /** * Checks if the entity's current position is a valid location to spawn this entity. diff --git a/common/biomesoplenty/handlers/BOPCraftHandler.java b/common/biomesoplenty/handlers/BOPCraftHandler.java index 276045262..e9296cc13 100644 --- a/common/biomesoplenty/handlers/BOPCraftHandler.java +++ b/common/biomesoplenty/handlers/BOPCraftHandler.java @@ -29,6 +29,12 @@ public class BOPCraftHandler implements ICraftingHandler { var1.addStat(BOPAchievements.achFlowerBand, 1); } + + //Drink of the Gods + if (var2.itemID == Items.food.get().itemID && var2.getItemDamage() == 10) + { + var1.addStat(BOPAchievements.achAmbrosia, 1); + } } diff --git a/common/biomesoplenty/items/ItemBOPFood.java b/common/biomesoplenty/items/ItemBOPFood.java index 08aed4c97..3dae12818 100644 --- a/common/biomesoplenty/items/ItemBOPFood.java +++ b/common/biomesoplenty/items/ItemBOPFood.java @@ -228,6 +228,10 @@ public class ItemBOPFood extends ItemFood case 10: player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 5000, 4)); + player.addPotionEffect(new PotionEffect(Potion.field_76443_y.id, 100, 1)); + player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 500, 2)); + player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 400, 2)); + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 600, 1)); break; } } diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index 36739d0b5..d4400da01 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -438,8 +438,8 @@ achievement.bop.achPromised=Movin' On Up! achievement.bop.achPromised.desc=Welcome to the Promised Land! achievement.bop.achCelestial=Blue Sky achievement.bop.achCelestial.desc=I am the one who...blocks... -achievement.bop.achBird=Free Bird -achievement.bop.achBird.desc=Well, not anymore. +achievement.bop.achAmbrosia=Drink of the Gods +achievement.bop.achAmbrosia.desc=Stay thirst, my friends. itemGroup.tabBiomesOPlenty=Biomes O' Plenty