src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java

@@ -1,43 +1,9 @@
 package dev.confuzzedcat.sushi.items.food.ingredients.fish.sashimi;
 
 import dev.confuzzedcat.sushi.items.food.ingredients.fish.FishBase;
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.item.FoodComponent;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public class SashimiBase extends FishBase {
     public SashimiBase(Settings settings) {
         super(settings);
     }
-    
-    public SashimiBase(){
-        this(new Settings()
-            .food(new FoodComponent.Builder()
-                .hunger(5)
-                .saturationModifier(6)
-                .build()
-            )
-        );
-    }
-
-    protected int tooltip_pos = 1;
-    @Override
-    public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
-        tooltip.add(tooltip_pos, Text.translatable("itemTooltip.sushi.sashimi_base")
-                .setStyle(
-                        Style.EMPTY
-                                .withFormatting(
-                                        Formatting.AQUA
-                                )
-                )
-        );
-        super.appendTooltip(stack, world, tooltip, context);
-    }
 }

src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java

@@ -9,6 +9,12 @@ public class TunaSashimi extends SashimiBase {
     }
 
     public TunaSashimi(){
-        super();
+        super(new Settings()
+            .food(new FoodComponent.Builder()
+                .hunger(1)
+                .saturationModifier(1)
+                .build()
+            )
+        );
     }
 }

src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java

@@ -1,28 +1,4 @@
 package dev.confuzzedcat.sushi.items.food.nigiri;
 
-import net.minecraft.client.item.TooltipContext;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
-
-
-import java.util.List;
-
 public class NigiriAburiSalmon extends NigiriBase {
-    @Override
-    public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
-        tooltip.add(Text.translatable("itemTooltip.sushi.nigiri_aburi_salmon")
-            .setStyle(
-                Style.EMPTY
-                    .withFormatting(
-                        Formatting.DARK_GRAY, 
-                        Formatting.ITALIC
-                    )
-            )
-        );
-        super.appendTooltip(stack, world, tooltip, context);
-    }
 }

src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java

@@ -1,16 +1,7 @@
 package dev.confuzzedcat.sushi.items.food.nigiri;
 
 import dev.confuzzedcat.sushi.items.food.SushiFoodItemBase;
-import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.FoodComponent;
-import net.minecraft.item.ItemStack;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-import net.minecraft.world.World;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public abstract class NigiriBase extends SushiFoodItemBase {
     public NigiriBase(Settings settings) {
@@ -20,23 +11,10 @@ public abstract class NigiriBase extends SushiFoodItemBase {
     public NigiriBase(){
         this(new Settings()
             .food(new FoodComponent.Builder()
-                .hunger(2)
-                .saturationModifier(1.5f)
+                .hunger(1)
+                .saturationModifier(1)
                 .build()
             )
         );
     }
-    protected int tooltip_pos = 1;
-    @Override
-    public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
-        tooltip.add(tooltip_pos, Text.translatable("itemTooltip.sushi.nigiri_base")
-            .setStyle(
-                Style.EMPTY
-                    .withFormatting(
-                        Formatting.AQUA
-                    )
-            )
-        );
-        super.appendTooltip(stack, world, tooltip, context);
-    }
 }

src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java

@@ -26,10 +26,8 @@ public class SushiItems {
     
     // Nigiri
     
-    public static final Item NIGIRI_TUNA = register("nigiri_tuna", new NigiriTuna());
-    /*
-    // TODO: Uncomment when done. 
     public static final Item NIGIRI_SALMON = register("nigiri_salmon", new NigiriSalmon());
+    public static final Item NIGIRI_TUNA = register("nigiri_tuna", new NigiriTuna());
     public static final Item NIGIRI_HAMACHI = register("nigiri_hamachi", new NigiriHamachi());
     public static final Item NIGIRI_SEABASS = register("nigiri_seabass", new NigiriSeabass());
     public static final Item NIGIRI_MACKEREL = register("nigiri_mackerel", new NigiriMackerel());
@@ -41,7 +39,6 @@ public class SushiItems {
     public static final Item NIGIRI_SCALLOP = register("nigiri_scallop", new NigiriScallop());
     public static final Item NIGIRI_UNAGI = register("nigiri_unagi", new NigiriUnagi());
     public static final Item NIGIRI_ABURI_SALMON = register("nigiri_aburi_salmon", new NigiriAburiSalmon());
-    */
 
     public static <T extends Item> T register(String name, T item) {
         LOGGER.info("Registering item with id: {}", name);

src/main/resources/assets/sushi/lang/en_us.json

@@ -2,10 +2,6 @@
   "itemGroup.sushi.sushi_items": "Sushi Items",
 
   "item.sushi.avocado_fruit": "Avocado Fruit",
-  
-  "itemTooltip.sushi.nigiri_base": "Nigiri",
-  "itemTooltip.sushi.sashimi_base": "Sashimi",
-  
   "item.sushi.nigiri_tuna": "Tuna Nigiri",
   "item.sushi.nigiri_salmon" : "Salmon Nigiri",
   "item.sushi.nigiri_hamachi" : "Hamachi Nigiri",
@@ -19,9 +15,6 @@
   "item.sushi.nigiri_scallop" : "Scallop Nigiri",
   "item.sushi.nigiri_unagi" :"Unagi Nigiri",
   "item.sushi.nigiri_aburi_salmon" : "Aburi Salmon Nigiri",
-  "itemTooltip.sushi.nigiri_aburi_salmon": "Seared salmon on rice",
   
-  "item.sushi.fish_tuna": "Tuna Fish",
-  
-  "item.sushi.sashimi_tuna": "Tuna Sashimi"
+  "item.sushi.fish_tuna" : "Tuna Fish"
 }