diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java index 9472600f6..1830dcf31 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPFoliage.java @@ -245,16 +245,15 @@ public class BlockBOPFoliage extends BlockFlower implements IShearable @Override public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (world.isRemote) - return false; - int meta = world.getBlockMetadata(x, y, z); if (meta == 8) { world.setBlock(x, y, z, blockID, 4, 3); EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(Items.berries.get(), 1, 0)); - world.spawnEntityInWorld(entityitem); - entityitem.onCollideWithPlayer(player); + if (!world.isRemote) { + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + } return true; } else diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png index 86a55f4e5..ce41177e4 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fancy.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png index ce5cc844f..79ff2a3fe 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple1_fast.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fancy.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fancy.png index 5bbe73544..b48a3b0c4 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fancy.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fancy.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fast.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fast.png index a4d48c9f1..b6860965e 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fast.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple2_fast.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fancy.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fancy.png index 24ab15feb..a7bd8b858 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fancy.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fancy.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png index 532f47c63..762f1c703 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/leaves_apple3_fast.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png new file mode 100644 index 000000000..8507036a0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originbricks.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origincobble.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origincobble.png new file mode 100644 index 000000000..2876b635c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origincobble.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png new file mode 100644 index 000000000..c2ad500bf Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingravel.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png new file mode 100644 index 000000000..682f68176 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originlappis.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png new file mode 100644 index 000000000..21d4f0e58 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originmossycobble.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png new file mode 100644 index 000000000..f562db79c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originplanks.png differ