From a64a47b24ce82207dc4f5bc08f4cf645dee84091 Mon Sep 17 00:00:00 2001 From: Eloraam Date: Thu, 13 Oct 2011 07:10:43 +0000 Subject: [PATCH] Fix for new MCP mappings. Fixed the distribution of flowers with bonemeal. Fixed accidentally making obsidian easy to mine. --- forge/forge_common/net/minecraft/src/forge/ForgeHooks.java | 7 ++++--- .../net/minecraft/src/forge/MinecraftForge.java | 2 +- .../minecraft/net/minecraft/src/BlockContainer.java.patch | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java index 8f9ab4c99..c014d4c69 100644 --- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java +++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java @@ -96,10 +96,10 @@ public class ForgeHooks { static { plantGrassList=new ArrayList(); plantGrassList.add(new ProbableItem( - Block.plantYellow.blockID,0,1,0,30)); + Block.plantYellow.blockID,0,1,0,20)); plantGrassList.add(new ProbableItem( - Block.plantRed.blockID,0,1,30,40)); - plantGrassWeight=40; + Block.plantRed.blockID,0,1,20,30)); + plantGrassWeight=30; seedGrassList=new ArrayList(); seedGrassList.add(new ProbableItem( @@ -212,6 +212,7 @@ public class ForgeHooks { MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2); MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe"); MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe"); + MinecraftForge.removeBlockEffectiveness(Block.obsidian,"pickaxe"); Block[] pickeff ={ Block.cobblestone, Block.stairDouble, diff --git a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java index 51bff0894..cd56b83c0 100755 --- a/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java +++ b/forge/forge_common/net/minecraft/src/forge/MinecraftForge.java @@ -70,7 +70,7 @@ public class MinecraftForge { * @param bid The block ID to plant. * @param md The metadata to plant. * @param prop The relative probability of the plant, where red flowers are - * 10 and yellow flowers are 30. + * 10 and yellow flowers are 20. */ public static void addGrassPlant(int item, int md, int prop) { ForgeHooks.addPlantGrass(item,md,prop); diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 1871f24c9..7c0e7b202 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -18,7 +18,7 @@ + public TileEntity getBlockEntity(int md) { + return getBlockEntity(); + } -+ - public void playBlock(World world, int i, int j, int k, int l, int i1) ++ + public void powerBlock(World world, int i, int j, int k, int l, int i1) { - super.playBlock(world, i, j, k, l, i1); + super.powerBlock(world, i, j, k, l, i1);