diff --git a/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java b/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java index b30154c0..0954a933 100644 --- a/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java +++ b/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java @@ -57,7 +57,9 @@ public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos p if (block != null && block.canSustainPlant(state, worldIn, pos, EnumFacing.UP, (IPlantable) this.crop) && worldIn.isAirBlock(pos.up())) { worldIn.setBlockState(pos.up(), this.crop.getDefaultState()); + itemstack.shrink(1); + return EnumActionResult.SUCCESS; } } @@ -75,6 +77,7 @@ public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos p public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { addOptionalTooltip(stack, tooltip); + super.addInformation(stack, worldIn, tooltip, flagIn); } @@ -82,13 +85,11 @@ public static void addOptionalTooltip(ItemStack stack, List tooltip) { if (I18n.canTranslate(stack.getUnlocalizedName() + ".tooltip")) { - tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + - LocUtils.translateRecursive(stack.getUnlocalizedName() + ".tooltip"))); + tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getUnlocalizedName() + ".tooltip"))); } else if (I18n.canTranslate(stack.getUnlocalizedName() + ".tooltip")) { - tooltip.addAll(LocUtils.getTooltips( - TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getUnlocalizedName() + ".tooltip"))); + tooltip.addAll(LocUtils.getTooltips(TextFormatting.GRAY.toString() + LocUtils.translateRecursive(stack.getUnlocalizedName() + ".tooltip"))); } } diff --git a/src/main/java/com/progwml6/natura/overworld/item/ItemSeeds.java b/src/main/java/com/progwml6/natura/overworld/item/ItemSeeds.java index 502d9c00..10aa47c8 100644 --- a/src/main/java/com/progwml6/natura/overworld/item/ItemSeeds.java +++ b/src/main/java/com/progwml6/natura/overworld/item/ItemSeeds.java @@ -66,7 +66,9 @@ public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos p if (block != null && block.canSustainPlant(state, worldIn, pos, EnumFacing.UP, this) && worldIn.isAirBlock(pos.up())) { worldIn.setBlockState(pos.up(), this.states.get(meta)); + itemstack.shrink(1); + return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java b/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java index d2fb385c..e50ab785 100644 --- a/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java +++ b/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java @@ -51,7 +51,9 @@ public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState s if (entityarrow.isBurning()) { this.explode(worldIn, pos, 1, entityarrow.shootingEntity instanceof EntityLiving ? (EntityLiving) entityarrow.shootingEntity : null); + worldIn.setBlockToAir(pos); + return; } } @@ -74,7 +76,9 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, if (state.getValue(BlockCloud.TYPE) == BlockCloud.CloudType.SULFUR && itemstack.getItem() != Items.AIR && itemstack.getItem() == Items.FLINT_AND_STEEL) { worldIn.setBlockToAir(pos); + this.explode(worldIn, pos, 1, playerIn); + return true; } } @@ -129,6 +133,7 @@ public boolean isOpaqueCube(IBlockState state) public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos) { Material material = world.getBlockState(pos).getMaterial(); + return material == this.blockMaterial ? false : super.isNormalCube(state, world, pos); }