From c1fd267fbde8425a9b1f51ad530301f4b86c573d Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Wed, 13 Nov 2013 04:57:25 -0500 Subject: [PATCH] More tweaking --- common/biomesoplenty/blocks/BlockBOPSapling.java | 4 ++-- common/biomesoplenty/configuration/BOPAchievements.java | 2 +- common/biomesoplenty/handlers/BOPPickupHandler.java | 8 +++++++- .../biomesoplenty/worldgen/tree/WorldGenPromisedTree.java | 2 +- .../worldgen/tree/WorldGenPromisedTree2.java | 2 +- .../worldgen/tree/WorldGenPromisedTree3.java | 8 ++++---- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/common/biomesoplenty/blocks/BlockBOPSapling.java b/common/biomesoplenty/blocks/BlockBOPSapling.java index b30be5c5d..f042444f0 100644 --- a/common/biomesoplenty/blocks/BlockBOPSapling.java +++ b/common/biomesoplenty/blocks/BlockBOPSapling.java @@ -86,7 +86,7 @@ public class BlockBOPSapling extends BlockSapling switch (meta) { case 7: // Loftwood - return id == Blocks.holyGrass.get().blockID || id == Block.grass.blockID; + return id == Blocks.holyGrass.get().blockID || id == Blocks.holyDirt.get().blockID; default: return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || blocksList[id].canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); @@ -98,7 +98,7 @@ public class BlockBOPSapling extends BlockSapling protected boolean canThisPlantGrowOnThisBlockID(int blockID, int metadata) { if (metadata == 7) //Loftwood - return blockID == Blocks.holyGrass.get().blockID || blockID == Block.grass.blockID; + return blockID == Blocks.holyGrass.get().blockID || blockID == Blocks.holyDirt.get().blockID; else return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID; } diff --git a/common/biomesoplenty/configuration/BOPAchievements.java b/common/biomesoplenty/configuration/BOPAchievements.java index e771320a5..037470eab 100644 --- a/common/biomesoplenty/configuration/BOPAchievements.java +++ b/common/biomesoplenty/configuration/BOPAchievements.java @@ -62,7 +62,7 @@ public class BOPAchievements 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(); + achPhantom = (new Achievement(3092, "bop.achPhantom", 0, 6, new ItemStack(Items.miscItems.get(), 1, 10), achGrave)).registerAchievement().setSpecial(); 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(); diff --git a/common/biomesoplenty/handlers/BOPPickupHandler.java b/common/biomesoplenty/handlers/BOPPickupHandler.java index a8e3a97f1..ce3c27b5e 100644 --- a/common/biomesoplenty/handlers/BOPPickupHandler.java +++ b/common/biomesoplenty/handlers/BOPPickupHandler.java @@ -3,8 +3,8 @@ package biomesoplenty.handlers; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.stats.AchievementList; import biomesoplenty.api.Blocks; -import biomesoplenty.api.Fluids; import biomesoplenty.api.Items; import biomesoplenty.configuration.BOPAchievements; import cpw.mods.fml.common.IPickupNotifier; @@ -15,6 +15,12 @@ public class BOPPickupHandler implements IPickupNotifier @Override public void notifyPickup(EntityItem item, EntityPlayer player) { + //Getting Wood (Vanilla + if (item.getEntityItem().itemID == Blocks.logs1.get().blockID || item.getEntityItem().itemID == Blocks.logs2.get().blockID || item.getEntityItem().itemID == Blocks.logs3.get().blockID || item.getEntityItem().itemID == Blocks.logs4.get().blockID) + { + player.addStat(AchievementList.mineWood, 1); + } + //Flower Child if (item.getEntityItem().itemID == Blocks.flowers.get().blockID || item.getEntityItem().itemID == Blocks.flowers2.get().blockID || item.getEntityItem().itemID == Block.plantRed.blockID || item.getEntityItem().itemID == Block.plantYellow.blockID) { diff --git a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java index 3dd9de72d..854beb22d 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree.java @@ -70,7 +70,7 @@ public class WorldGenPromisedTree extends WorldGenerator { var11 = par1World.getBlockId(par3, par4 - 1, par5); - if ((var11 == Blocks.holyGrass.get().blockID) && par4 < 256 - var6 - 1) + if ((var11 == Blocks.holyGrass.get().blockID || var11 == Blocks.holyDirt.get().blockID) && par4 < 256 - var6 - 1) { this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0); var21 = par2Random.nextInt(2); diff --git a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java index cd393475b..eb1efa5a7 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree2.java @@ -68,7 +68,7 @@ public class WorldGenPromisedTree2 extends WorldGenerator { var8 = par1World.getBlockId(par3, par4 - 1, par5); - if ((var8 == Blocks.holyGrass.get().blockID) && par4 < 256 - var6 - 1) + if ((var8 == Blocks.holyGrass.get().blockID || var8 == Blocks.holyDirt.get().blockID) && par4 < 256 - var6 - 1) { this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0); int var16; diff --git a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java index 9b466511b..7be70bab3 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenPromisedTree3.java @@ -74,13 +74,13 @@ public class WorldGenPromisedTree3 extends WorldGenerator var13 = var1.getBlockId(var3, var4 - 1, var5 - 1); var14 = var1.getBlockId(var3 - 1, var4 - 1, var5 - 1); - if ((var11 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1) + if ((var11 == Blocks.holyGrass.get().blockID || var11 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1) { - if ((var24 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1) + if ((var24 == Blocks.holyGrass.get().blockID || var24 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1) { - if ((var13 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1) + if ((var13 == Blocks.holyGrass.get().blockID || var13 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1) { - if ((var14 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1) + if ((var14 == Blocks.holyGrass.get().blockID | var14 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1) { var1.setBlock(var3, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2); var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2);