From 1c3f1e75b5e4943850b2c5962cbad56ae0124363 Mon Sep 17 00:00:00 2001 From: Amnet Date: Thu, 16 May 2013 01:51:16 +0200 Subject: [PATCH] Fixed the drop for sunflowers and lilies. Added BOP wood to trigger "Get Wood" Achievement. --- src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java | 2 +- .../biomesoplenty/helpers/AchievementHelper.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java index 72da4b5bc..cc189f5b0 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFlower.java @@ -191,7 +191,7 @@ public class BlockBOPFlower extends BlockFlower @Override public void onNeighborBlockChange(World world, int x, int y, int z, int neighborID) { - super.onNeighborBlockChange(world, x, y, z, neighborID); + //super.onNeighborBlockChange(world, x, y, z, neighborID); this.checkFlowerChange(world, x, y, z); if (world.getBlockMetadata(x, y, z) == SUNFLOWERTOP && world.getBlockId(x, y - 1, z) == this.blockID && world.getBlockMetadata(x, y - 1, z) != SUNFLOWERBOTTOM) world.setBlockToAir(x, y, z); diff --git a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java index 402b451a4..a7948cc1d 100644 --- a/src/minecraft/biomesoplenty/helpers/AchievementHelper.java +++ b/src/minecraft/biomesoplenty/helpers/AchievementHelper.java @@ -2,17 +2,15 @@ package biomesoplenty.helpers; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; import net.minecraftforge.common.AchievementPage; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import biomesoplenty.api.Blocks; import biomesoplenty.api.Items; import biomesoplenty.configuration.BOPConfiguration; -import cpw.mods.fml.common.ICraftingHandler; import cpw.mods.fml.common.registry.LanguageRegistry; public class AchievementHelper @@ -102,7 +100,7 @@ public class AchievementHelper { player.addStat(achMud, 1); } - if (item.itemID == Blocks.flowers.get().blockID && item.getItemDamage() == 10) + if (item.itemID == Blocks.mushrooms.get().blockID && item.getItemDamage() == 0) { player.addStat(achShroom, 1); } @@ -115,6 +113,9 @@ public class AchievementHelper player.addStat(achMoss, 1); } } + + if (item.itemID == Blocks.logs1.get().blockID || item.itemID == Blocks.logs2.get().blockID || (item.itemID == Blocks.logs3.get().blockID && item.getItemDamage() < 3)) + player.addStat(AchievementList.mineWood, 1); } private static void addAchievementDesc(String ach, String name, String desc)