Adjust consumables and remove InGameHud mixin

Author: Ryorama

common/src/main/java/com/ryorama/terrariamod/client/TAudio.java

@@ -34,6 +34,7 @@ public class TAudio {
 
     public static final SoundEvent HEALTH_CRYSTAL = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "health_crystal"));
     public static final SoundEvent DRINK = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "drink"));
+    public static final SoundEvent EAT = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "eat"));
     public static final SoundEvent ROAR_0 = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "roar_0"));
     public static final SoundEvent STAR_FALL = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "star_fall"));
     public static final SoundEvent NPC_HIT1 = SoundEvent.of(new Identifier(TerrariaMod.MOD_ID, "npc_hit1"));

common/src/main/java/com/ryorama/terrariamod/items/ItemsT.java

@@ -2,7 +2,6 @@
 
 import com.ryorama.terrariamod.TerrariaMod;
 import com.ryorama.terrariamod.blocks.BlocksT;
-import com.ryorama.terrariamod.entities.EntitiesT;
 import com.ryorama.terrariamod.items.impl.BlockItemT;
 import com.ryorama.terrariamod.items.impl.ItemT;
 import com.ryorama.terrariamod.items.terraria.armor.*;
@@ -14,20 +13,17 @@
 import com.ryorama.terrariamod.items.terraria.consumable.misc.LifeCrystal;
 import com.ryorama.terrariamod.items.terraria.consumable.potions.HealingPotion;
 import com.ryorama.terrariamod.items.terraria.consumable.potions.LesserHealingPotion;
-import com.ryorama.terrariamod.items.terraria.consumable.potions.Mushroom;
+import com.ryorama.terrariamod.items.terraria.consumable.food.Mushroom;
 import com.ryorama.terrariamod.items.terraria.picks.*;
 import com.ryorama.terrariamod.items.terraria.shortswords.*;
 import dev.architectury.registry.CreativeTabRegistry;
 import dev.architectury.registry.registries.DeferredRegister;
 import dev.architectury.registry.registries.RegistrySupplier;
-import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.*;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Supplier;
 
 public class ItemsT {

common/src/main/java/com/ryorama/terrariamod/items/impl/BroadswordT.java

@@ -1,9 +1,5 @@
 package com.ryorama.terrariamod.items.impl;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.item.ItemGroups;
-
 public class BroadswordT extends ItemT {
 
     public BroadswordT() {

common/src/main/java/com/ryorama/terrariamod/items/impl/ItemT.java

@@ -99,13 +99,6 @@ public ItemT isExpert(boolean isExpert) {
         return this;
     }
 
-	/*
-	@Override
-	public String getTranslationKey(ItemStack stack) {
-		return nameFormatting + this.getName(stack);
-	}
-	 */
-
     @Override
     public Text getName(ItemStack stack) {
         if (rarity == 1) {

common/src/main/java/com/ryorama/terrariamod/items/impl/interfaces/IFoodItem.java

@@ -0,0 +1,21 @@
+package com.ryorama.terrariamod.items.impl.interfaces;
+
+import com.ryorama.terrariamod.TerrariaMod;
+import com.ryorama.terrariamod.buffs.BuffT;
+import com.ryorama.terrariamod.buffs.BuffsT;
+import net.minecraft.entity.player.HungerManager;
+import net.minecraft.entity.player.PlayerEntity;
+
+public interface IFoodItem {
+
+    default void addBuffOnEaten(PlayerEntity entity, BuffT buff, int duration) {
+        BuffsT.AddBuffToEntity(entity, duration, buff);
+    }
+
+    default void handlePlayerHunger(PlayerEntity playerEntity, int hungerValue, int saturationValue) {
+        if (!TerrariaMod.CONFIG.disableHunger) {
+            HungerManager hungerManager = playerEntity.getHungerManager();
+            hungerManager.add(hungerValue, saturationValue);
+        }
+    }
+}

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/potions/Mushroom.java common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/food/Mushroom.java

@@ -1,26 +1,29 @@
-package com.ryorama.terrariamod.items.terraria.consumable.potions;
+package com.ryorama.terrariamod.items.terraria.consumable.food;
 
 import com.ryorama.terrariamod.buffs.BuffsT;
 import com.ryorama.terrariamod.client.TAudio;
 import com.ryorama.terrariamod.items.impl.ItemT;
+import com.ryorama.terrariamod.items.impl.interfaces.IFoodItem;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 
-public class Mushroom extends ItemT {
+public class Mushroom extends ItemT implements IFoodItem {
 
     public Mushroom(Settings settings) {
         super(settings.maxCount(64));
+        this.isConsumable(true);
     }
 
     @Override
     public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity, Hand hand) {
         if (!BuffsT.EntityHasBuff(playerEntity, BuffsT.POTION_SICKNESS)) {
-            playerEntity.playSound(TAudio.DRINK, 1, 1);
+            playerEntity.playSound(TAudio.EAT, 1, 1);
             playerEntity.heal(15);
-            BuffsT.AddBuffToEntity(playerEntity, 1000, BuffsT.POTION_SICKNESS);
+            addBuffOnEaten(playerEntity, BuffsT.POTION_SICKNESS,1000);
+            handlePlayerHunger(playerEntity, 4, 2);
             return TypedActionResult.success(playerEntity.getStackInHand(hand));
         }
 

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/misc/LifeCrystal.java

@@ -13,6 +13,7 @@ public class LifeCrystal extends ItemT {
 
 	public LifeCrystal(Settings settings) {
 		super(settings);
+		this.isConsumable(true);
 	}
 
 	@Override

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/potions/HealingPotion.java

@@ -13,6 +13,7 @@ public class HealingPotion extends ItemT {
 
     public HealingPotion(Settings settings) {
         super(settings.maxCount(64));
+        this.isConsumable(true);
     }
 
     @Override

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/potions/LesserHealingPotion.java

@@ -13,6 +13,7 @@ public class LesserHealingPotion extends ItemT {
 
     public LesserHealingPotion(Settings settings) {
         super(settings.maxCount(64));
+        this.isConsumable(true);
     }
 
     @Override