Don't gobble bowls (#10322)

Don't eat a whole stack of food bowls at once.
ldtteam · Oct 13, 2024 · 6ea498a · 6ea498a
1 parent d98ba43
commit 6ea498a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/src/main/java/com/minecolonies/api/util/ItemStackUtils.java b/src/main/java/com/minecolonies/api/util/ItemStackUtils.java
@@ -13,6 +13,7 @@
 import com.minecolonies.api.items.CheckedNbtKey;
 import com.minecolonies.api.items.ModItems;
 import com.minecolonies.api.items.ModTags;
+import com.minecolonies.core.items.ItemBowlFood;
 import com.minecolonies.core.util.AdvancementUtils;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.nbt.CompoundTag;
@@ -948,6 +949,10 @@ public static void consumeFood(final ItemStack foodStack, final AbstractEntityCi
         {
             itemUseReturn = new ItemStack(Items.GLASS_BOTTLE);
         }
+        else if (foodStack.getItem() instanceof ItemBowlFood)
+        {
+            itemUseReturn = new ItemStack(Items.BOWL);
+        }
 
         if (!itemUseReturn.isEmpty() && itemUseReturn.getItem() != foodStack.getItem())
         {

diff --git a/src/main/java/com/minecolonies/core/items/ItemBowlFood.java b/src/main/java/com/minecolonies/core/items/ItemBowlFood.java
@@ -1,10 +1,14 @@
 package com.minecolonies.core.items;
 
 import com.minecolonies.api.items.IMinecoloniesFoodItem;
+import com.minecolonies.api.util.ItemStackUtils;
 import com.minecolonies.api.util.constant.TranslationConstants;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.BowlFoodItem;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
@@ -15,7 +19,7 @@
 /**
  * A custom item class for bowl food items.
  */
-public class ItemBowlFood extends BowlFoodItem implements IMinecoloniesFoodItem
+public class ItemBowlFood extends Item implements IMinecoloniesFoodItem
 {
     /**
      * The food tier.
@@ -34,6 +38,32 @@ public ItemBowlFood(@NotNull final Properties builder, final int tier)
         this.tier = tier;
     }
 
+    @NotNull
+    @Override
+    public ItemStack finishUsingItem(@NotNull final ItemStack stack, @NotNull final Level level, @NotNull final LivingEntity entity)
+    {
+        // implementation of this is deliberately similar to HoneyBottleItem; in particular it only
+        // gives extra drops to Players because citizens eating food are dealt with by the caller.
+
+        final ItemStack bowl = new ItemStack(Items.BOWL);
+
+        final ItemStack remainder = super.finishUsingItem(stack, level, entity);
+        if (ItemStackUtils.isEmpty(remainder))
+        {
+            return bowl;
+        }
+
+        if (entity instanceof final Player player && !player.getAbilities().instabuild)
+        {
+            if (!player.getInventory().add(bowl))
+            {
+                player.drop(bowl, false);
+            }
+        }
+
+        return stack;
+    }
+
     @Override
     public void appendHoverText(@NotNull final ItemStack stack, @Nullable final Level worldIn, @NotNull final List<Component> tooltip, @NotNull final TooltipFlag flagIn)
     {