Fix bug where consuming stews and soups would replace the entire stack with a bowl (Fixes #55)

Author: Mikedeejay2

src/main/java/com/mikedeejay2/simplestack/Simplestack.java

@@ -1,11 +1,15 @@
 package com.mikedeejay2.simplestack;
 
 import com.mikedeejay2.mikedeejay2lib.PluginBase;
+import com.mikedeejay2.mikedeejay2lib.runnable.EnhancedRunnable;
 import com.mikedeejay2.simplestack.commands.*;
 import com.mikedeejay2.simplestack.config.Config;
 import com.mikedeejay2.simplestack.listeners.*;
 import com.mikedeejay2.simplestack.listeners.player.*;
 import com.mikedeejay2.simplestack.runnables.GroundItemStacker;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.FallingBlock;
 
 /**
  * Simple Stack plugin for Minecraft 1.14 - 1.16.4
@@ -56,6 +60,7 @@ public void onEnable()
         listenerManager.addListener(new PlayerBucketEmptyListener(this));
         listenerManager.addListener(new ItemMergeListener(this));
         listenerManager.addListener(new InventoryPickupItemListener(this));
+        listenerManager.addListener(new PlayerItemConsumeListener(this));
         if(getMCVersion()[1] >= 16)
         {
             listenerManager.addListener(new PrepareSmithingListener(this));

src/main/java/com/mikedeejay2/simplestack/listeners/player/PlayerBucketEmptyListener.java

@@ -49,8 +49,7 @@ public void playerBucketEmptyEvent(PlayerBucketEmptyEvent event)
         PlayerInventory inv = player.getInventory();
         if(stack.getAmount() <= 1) return;
         stack.setAmount(stack.getAmount()-1);
-        MoveUtils.moveItem(plugin, new ItemStack(Material.BUCKET), inv, slot, inv, 0, 36, false);
-
+        MoveUtils.moveItem(plugin, new ItemStack(Material.BUCKET, 1), inv);
 
         int finalSlot = slot;
         ItemStack finalStack = stack;

src/main/java/com/mikedeejay2/simplestack/listeners/player/PlayerItemConsumeListener.java

@@ -0,0 +1,67 @@
+package com.mikedeejay2.simplestack.listeners.player;
+
+import com.mikedeejay2.simplestack.Simplestack;
+import com.mikedeejay2.simplestack.util.CancelUtils;
+import com.mikedeejay2.simplestack.util.MoveUtils;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerItemConsumeEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.scheduler.BukkitRunnable;
+
+/**
+ * Listens for Player Bucket Empty events
+ *
+ * @author Mikedeejay2
+ */
+public class PlayerItemConsumeListener implements Listener
+{
+    private final Simplestack plugin;
+
+    public PlayerItemConsumeListener(Simplestack plugin)
+    {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Fix bug where stews would replace the rest of the
+     *
+     * @param event The event being called
+     */
+    @EventHandler
+    public void playerItemConsumeEvent(PlayerItemConsumeEvent event)
+    {
+        Player player = event.getPlayer();
+        ItemStack stack = event.getItem();
+        if(!stack.getType().toString().endsWith("_STEW") && !stack.getType().toString().endsWith("_SOUP")) return;
+        if(player.getGameMode() == GameMode.CREATIVE) return;
+        if(CancelUtils.cancelPlayerCheck(plugin, player)) return;
+        PlayerInventory inv = player.getInventory();
+        int slot = inv.getHeldItemSlot();
+        if(!stack.equals(inv.getItemInMainHand()))
+        {
+            slot = 40;
+        }
+        if(CancelUtils.cancelStackCheck(plugin, stack)) return;
+        if(stack.getAmount() <= 1) return;
+        stack.setAmount(stack.getAmount()-1);
+        MoveUtils.moveItem(plugin, new ItemStack(Material.BOWL, 1), inv);
+
+        int finalSlot = slot;
+        ItemStack finalStack = stack;
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                inv.setItem(finalSlot, finalStack);
+                player.updateInventory();
+            }
+        }.runTask(plugin);
+    }
+}

src/main/java/com/mikedeejay2/simplestack/util/MoveUtils.java

@@ -133,6 +133,30 @@ public static void moveItemToInventory(Simplestack plugin, ItemStack item, Inven
         removeItemFromInventory(origItem, fromInv, amountBeingMoved - amountLeft);
     }
 
+    /**
+     * Move an item to an inventory. The item has no original location.
+     *
+     * @param item The ItemStack being moved
+     * @param inv The inventory to move the item into
+     */
+    public static void moveItem(Simplestack plugin, ItemStack item, Inventory inv)
+    {
+        if(item.getType() == Material.AIR) return;
+        for(int i = 0; i < inv.getStorageContents().length; ++i)
+        {
+            if(combineItemInternal(plugin, item, inv, i)) break;
+        }
+        if(item.getAmount() != 0)
+        {
+            for(int i = 0; i < inv.getStorageContents().length; ++i)
+            {
+                if(inv.getItem(i) != null) continue;
+                inv.setItem(i, item);
+                break;
+            }
+        }
+    }
+
     /**
      * Manually remove an item from an inventory if the current slot that the item
      * exists in is unknown.