From 1707f9aadb2a9f850fcce5e5500219558977c456 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 4 Nov 2015 14:45:03 +0000 Subject: [PATCH] The Teru Teru Bozu can now be made sad --- .../botania/common/block/BlockTeruTeruBozu.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index b51841fb0..f07afe3df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -47,13 +47,13 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable if(stack.stackSize == 0) e.setDead(); } - } + } } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { ItemStack stack = player.getCurrentEquippedItem(); - if(stack != null && isSunflower(stack) && removeRain(world)) { + if(stack != null && ((isSunflower(stack) && removeRain(world)) || (isBlueOrchid(stack) && startRain(world)))) { if(!player.capabilities.isCreativeMode) stack.stackSize--; return true; @@ -64,6 +64,10 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable public boolean isSunflower(ItemStack stack) { return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0; } + + public boolean isBlueOrchid(ItemStack stack) { + return stack.getItem() == Item.getItemFromBlock(Blocks.red_flower) && stack.getItemDamage() == 1; + } public boolean removeRain(World world) { if(world.isRaining()) { @@ -72,6 +76,15 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } return false; } + + public boolean startRain(World world) { + if(!world.isRaining()) { + if(world.rand.nextInt(10) == 0) + world.getWorldInfo().setRaining(true); + return true; + } + return false; + } @Override public boolean hasComparatorInputOverride() {