From 0d6dd6217294bd148f883780fb2074799595610e Mon Sep 17 00:00:00 2001
From: ConfuzzedCat <confuzzedcat@gmail.com>
Date: Tue, 7 Apr 2026 22:36:30 +0200
Subject: [PATCH] Moved food values to base, upped sat of nigiri

---
 .../food/ingredients/fish/sashimi/SashimiBase.java    | 11 +++++++++++
 .../food/ingredients/fish/sashimi/TunaSashimi.java    |  8 +-------
 .../sushi/items/food/nigiri/NigiriBase.java           |  4 ++--
 .../sushi/items/food/nigiri/NigiriTuna.java           |  8 +-------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java
index efa5c36..36569d8 100644
--- a/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java
+++ b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java
@@ -2,6 +2,7 @@ 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;
@@ -15,6 +16,16 @@ 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
diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java
index 6896308..26b9304 100644
--- a/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java
+++ b/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(2)
-                .saturationModifier(1)
-                .build()
-            )
-        );
+        super();
     }
 }
diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java
index 413d317..e698f84 100644
--- a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java
+++ b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java
@@ -20,8 +20,8 @@ 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()
             )
         );
diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTuna.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTuna.java
index 19bdf2f..399413b 100644
--- a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTuna.java
+++ b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTuna.java
@@ -8,12 +8,6 @@ public class NigiriTuna extends NigiriBase {
         super(settings);
     }
     public NigiriTuna() {
-        super(new Settings()
-            .food(new FoodComponent.Builder()
-                .hunger(5)
-                .saturationModifier(6)
-                .build()
-            )
-        );
+        super();
     }
 }