Moved food values to base, upped sat of nigiri

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

@@ -1,9 +1,43 @@
 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,12 +9,6 @@ public class TunaSashimi extends SashimiBase {
     }
 
     public TunaSashimi(){
-        super(new Settings()
-            .food(new FoodComponent.Builder()
-                .hunger(1)
-                .saturationModifier(1)
-                .build()
-            )
-        );
+        super();
     }
 }

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

@@ -1,4 +1,28 @@
 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,7 +1,16 @@
 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) {
@@ -11,10 +20,23 @@ public abstract class NigiriBase extends SushiFoodItemBase {
     public NigiriBase(){
         this(new Settings()
             .food(new FoodComponent.Builder()
-                .hunger(1)
-                .saturationModifier(1)
+                .hunger(2)
+                .saturationModifier(1.5f)
                 .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,8 +26,10 @@ public class SushiItems {
     
     // Nigiri
     
-    public static final Item NIGIRI_SALMON = register("nigiri_salmon", new NigiriSalmon());
     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_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());
@@ -39,6 +41,7 @@ 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,19 +2,26 @@
   "itemGroup.sushi.sushi_items": "Sushi Items",
 
   "item.sushi.avocado_fruit": "Avocado Fruit",
-  "item.sushi.nigiri_tuna": "Tuna Nigiri",
-  "item.sushi.nigiri_salmon" : "Salmon Nigiri",
-  "item.sushi.nigiri_hamachi" : "Hamachi Nigiri",
-  "item.sushi.nigiri_seabass" :"Seabass Nigiri",
-  "item.sushi.nigiri_mackerel" : "Mackerel Nigiri",
-  "item.sushi.nigiri_surf_clam" :"Surf Clam Nigiri",
-  "item.sushi.nigiri_king_prawn" : "King Prawn Nigiri",
-  "item.sushi.nigiri_sweet_prawn" :"Sweet Prawn Nigiri",
-  "item.sushi.nigiri_octopus" : "Octopus Nigiri",
-  "item.sushi.nigiri_tobiko" :"Tobiko Nigiri",
-  "item.sushi.nigiri_scallop" : "Scallop Nigiri",
-  "item.sushi.nigiri_unagi" :"Unagi Nigiri",
-  "item.sushi.nigiri_aburi_salmon" : "Aburi Salmon Nigiri",
   
-  "item.sushi.fish_tuna" : "Tuna Fish"
+  "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",
+  "item.sushi.nigiri_seabass":"Seabass Nigiri",
+  "item.sushi.nigiri_mackerel": "Mackerel Nigiri",
+  "item.sushi.nigiri_surf_clam":"Surf Clam Nigiri",
+  "item.sushi.nigiri_king_prawn": "King Prawn Nigiri",
+  "item.sushi.nigiri_sweet_prawn":"Sweet Prawn Nigiri",
+  "item.sushi.nigiri_octopus": "Octopus Nigiri",
+  "item.sushi.nigiri_tobiko":"Tobiko Nigiri",
+  "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"
 }