Add ContainedFood item

Better "StewItem" in which foods can stack and still be eaten 1 at a time

Author: BarchamMal

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.14.21
 
 
 # Mod Properties
-mod_version=0.3.1
+mod_version=0.4.0
 maven_group=barch.mc_extended
 archives_base_name=mc-extended
 

src/main/java/barch/mc_extended/Foods/Cheese.java

@@ -25,7 +25,7 @@ public class Cheese {
             .saturationModifier(12)
             .build();
 
-    public static final Item BACON_AND_MUSHROOMS = new StewItem(new FabricItemSettings().food(BACON_AND_MUSHROOMS_FOOD_COMPONENT));
+    public static final Item BACON_AND_MUSHROOMS = new ContainedFood(new FabricItemSettings().food(BACON_AND_MUSHROOMS_FOOD_COMPONENT).maxCount(16), Items.BOWL);
 
     public static void RegisterAll() {
 

src/main/java/barch/mc_extended/Foods/ContainedFood.java

@@ -0,0 +1,31 @@
+package barch.mc_extended.Foods;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class ContainedFood extends Item {
+    private final Item giveBack;
+
+    public ContainedFood(Settings settings, Item giveBack) {
+        super(settings);
+        this.giveBack = giveBack;
+    }
+
+    @Override
+    public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) {
+        ItemStack itemStack = super.finishUsing(stack, world, user);
+        if (user instanceof PlayerEntity && ((PlayerEntity)user).getAbilities().creativeMode) {
+            return itemStack;
+        }
+
+        if (itemStack.getCount() < 1) {
+            return new ItemStack(this.giveBack);
+        }
+
+        user.dropItem(this.giveBack, 1);
+        return itemStack;
+    }
+}

src/main/java/barch/mc_extended/Foods/Onion.java

@@ -76,7 +76,7 @@ public class Onion {
     public static final Item FRIED_ONION = new Item(new FabricItemSettings().food(FRIED_ONION_FOOD_COMPONANT));
 
     // onion sauce
-    public static final Item ONION_TOMATO_SAUCE = new StewItem(new FabricItemSettings().food(ONION_SAUCE_FOOD_COMPONANT).maxCount(1));
+    public static final Item ONION_TOMATO_SAUCE = new ContainedFood(new FabricItemSettings().food(ONION_SAUCE_FOOD_COMPONANT), Items.BOWL);
 
 
     // onion feature

src/main/java/barch/mc_extended/Foods/Tomato.java

@@ -76,7 +76,7 @@ public class Tomato {
     public static final Item ROAST_TOMATO = new Item(new FabricItemSettings().food(ROAST_TOMATO_FOOD_COMPONANT));
 
     // tomato sauce
-    public static final Item TOMATO_SAUCE = new StewItem(new FabricItemSettings().food(TOMATO_SAUCE_FOOD_COMPONANT).maxCount(1));
+    public static final Item TOMATO_SAUCE = new ContainedFood(new FabricItemSettings().food(TOMATO_SAUCE_FOOD_COMPONANT), Items.BOWL);
 
 
     // tomato feature

src/main/resources/changelog.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2023-9-8
+### Changed
+- all stews are now "ContainedFoods"
+    - tomato sauce
+    - onion tomato sauce
+    - bacon and mushrooms
+
 ## [0.3.1] - 2023-9-8
 ### Fixed
 - bacon and mushrooms model
@@ -292,8 +299,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - deepslate ruby ore
 - ruby block
 
-[0.3.0]: https://github.com/BarchamMal/MC-Extended/commit/
-[0.3.1]: https://github.com/BarchamMal/MC-Extended/commit/97641cc3b4809d947953fd8fa6c8d16cbb0ba7e4
+[0.4.0]: https://github.com/BarchamMal/MC-Extended/commit/
+[0.3.1]: https://github.com/BarchamMal/MC-Extended/commit/378dcb6ab5cea2841aa15ba7db474b11b56b5538
+[0.3.0]: https://github.com/BarchamMal/MC-Extended/commit/97641cc3b4809d947953fd8fa6c8d16cbb0ba7e4
 [0.2.5]: https://github.com/BarchamMal/MC-Extended/commit/97641cc3b4809d947953fd8fa6c8d16cbb0ba7e4
 [0.2.4]: https://github.com/BarchamMal/MC-Extended/commit/c7b83a5135e549532c4dd4b6657f140957cfd31f
 [0.2.3]: https://github.com/BarchamMal/MC-Extended/commit/747cc0ceb81f4288abf79e40784574a3411c76ac