From 72aad108453cbf12f17b89dc6ed76ce031cadc9a Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 10 Jan 2019 09:45:05 +0200
Subject: [PATCH] Fixed tomato plants not consuming seeds when planted

---
 .../unicopia/block/BlockSugar.java            |  3 +-
 .../unicopia/block/BlockTomatoPlant.java      | 29 +++++++++++++++----
 .../unicopia/item/ItemTomatoSeeds.java        |  9 ++++--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java b/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
index c085c5b3..cb34c21a 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
@@ -18,12 +18,13 @@ public class BlockSugar extends BlockFalling {
         setRegistryName(domain, name);
 
         setSoundType(SoundType.SAND);
-        setCreativeTab(CreativeTabs.MATERIALS);
+        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
         setHardness(0.7F);
     }
 
     @Override
     public int quantityDropped(Random random) {
+        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
         return 9;
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java b/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
index 068295f9..882ec949 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
@@ -17,6 +17,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -128,7 +129,7 @@ public class BlockTomatoPlant extends BlockCrops {
     @Override
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
         if (getAge(state) == 0) {
-            return UItems.stick;
+            return Items.AIR;
         }
 
         if (isMaxAge(state)) {
@@ -142,13 +143,11 @@ public class BlockTomatoPlant extends BlockCrops {
     public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
         Random rand = world instanceof World ? ((World)world).rand : RANDOM;
 
+        drops.add(new ItemStack(UItems.stick, 1, 0));
+
         Item item = getItemDropped(state, rand, fortune);
         if (item != Items.AIR) {
             drops.add(new ItemStack(item, 1, damageDropped(state)));
-
-            if (getAge(state) > 0) {
-                drops.add(new ItemStack(item, rand.nextInt(2), 1));
-            }
         }
     }
 
@@ -160,7 +159,19 @@ public class BlockTomatoPlant extends BlockCrops {
                 Type type = state.getValue(TYPE);
 
                 Item crop = type == Type.CLOUDSDALE ? UItems.cloudsdale_tomato : UItems.tomato;
-                spawnAsEntity(world, pos, new ItemStack(crop, getAge(state), 0));
+
+                int good = getAge(state);
+                int rotten = world.rand.nextInt(good);
+
+                good -= rotten;
+
+                if (good > 0) {
+                    spawnAsEntity(world, pos, new ItemStack(crop, good, 0));
+                }
+                if (rotten > 0) {
+                    spawnAsEntity(world, pos, new ItemStack(crop, rotten, 1));
+                }
+
                 world.setBlockState(pos, state.withProperty(getAgeProperty(), 0));
 
                 return true;
@@ -179,7 +190,13 @@ public class BlockTomatoPlant extends BlockCrops {
 
     public boolean plant(World world, BlockPos pos, IBlockState state) {
         if (getAge(state) == 0) {
+
             world.setBlockState(pos, state.withProperty(getAgeProperty(), 1));
+
+            SoundType sound = getSoundType(state, world, pos, null);
+
+            world.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, sound.getVolume(), sound.getPitch() * 2);
+
             return true;
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java b/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
index 673700f4..db161ab3 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
@@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.item;
 
 import com.minelittlepony.unicopia.block.BlockTomatoPlant;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,8 +26,12 @@ public class ItemTomatoSeeds extends Item {
 
         IBlockState state = world.getBlockState(pos);
 
-        if (state.getBlock() instanceof BlockTomatoPlant) {
-            if (((BlockTomatoPlant)state.getBlock()).plant(world, pos, state)) {
+        Block block = state.getBlock();
+
+        if (block instanceof BlockTomatoPlant) {
+            if (((BlockTomatoPlant)block).plant(world, pos, state)) {
+                player.getHeldItem(hand).shrink(1);
+
                 return EnumActionResult.SUCCESS;
             }
         }