From f7722d9d99471dbdcc239a989358f196fd5b9171 Mon Sep 17 00:00:00 2001
From: ConfuzzedCat <confuzzedcat@gmail.com>
Date: Mon, 30 Mar 2026 15:19:29 +0200
Subject: [PATCH] Added sashimi item, and tuna->sashimi->nigiri recipes

---
 .../ingredients/fish/sashimi/SashimiBase.java |   9 ++++++++
 .../ingredients/fish/sashimi/TunaSashimi.java |  20 ++++++++++++++++++
 .../sushi/registry/SushiItems.java            |   4 ++++
 .../sushi/models/item/sashimi_tuna.json       |   6 ++++++
 .../assets/sushi/textures/item/fish_tuna.png  | Bin 136 -> 149 bytes
 .../sushi/textures/item/sashimi_tuna.png      | Bin 0 -> 121 bytes
 .../recipes/crafting_recipe_nigiri_tuna.json  |  20 ++++++++++++++++++
 .../sushi/recipes/cutting/sashimi_tuna.json   |  17 +++++++++++++++
 8 files changed, 76 insertions(+)
 create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java
 create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java
 create mode 100644 src/main/resources/assets/sushi/models/item/sashimi_tuna.json
 create mode 100644 src/main/resources/assets/sushi/textures/item/sashimi_tuna.png
 create mode 100644 src/main/resources/data/sushi/recipes/crafting_recipe_nigiri_tuna.json
 create mode 100644 src/main/resources/data/sushi/recipes/cutting/sashimi_tuna.json

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
new file mode 100644
index 0000000..d49be18
--- /dev/null
+++ b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/SashimiBase.java
@@ -0,0 +1,9 @@
+package dev.confuzzedcat.sushi.items.food.ingredients.fish.sashimi;
+
+import dev.confuzzedcat.sushi.items.food.ingredients.fish.FishBase;
+
+public class SashimiBase extends FishBase {
+    public SashimiBase(Settings settings) {
+        super(settings);
+    }
+}
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
new file mode 100644
index 0000000..41f3cd7
--- /dev/null
+++ b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/fish/sashimi/TunaSashimi.java
@@ -0,0 +1,20 @@
+package dev.confuzzedcat.sushi.items.food.ingredients.fish.sashimi;
+
+import dev.confuzzedcat.sushi.items.food.ingredients.fish.FishBase;
+import net.minecraft.item.FoodComponent;
+
+public class TunaSashimi extends SashimiBase {
+    public TunaSashimi(Settings settings) {
+        super(settings);
+    }
+
+    public TunaSashimi(){
+        super(new Settings()
+            .food(new FoodComponent.Builder()
+                .hunger(1)
+                .saturationModifier(1)
+                .build()
+            )
+        );
+    }
+}
diff --git a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java b/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java
index ee86b1f..7c73d2a 100644
--- a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java
+++ b/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java
@@ -3,6 +3,7 @@ package dev.confuzzedcat.sushi.registry;
 import dev.confuzzedcat.sushi.Sushi;
 import dev.confuzzedcat.sushi.items.food.ingredients.avocadoFruit;
 import dev.confuzzedcat.sushi.items.food.ingredients.fish.TunaFish;
+import dev.confuzzedcat.sushi.items.food.ingredients.fish.sashimi.TunaSashimi;
 import dev.confuzzedcat.sushi.items.food.nigiri.*;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.Item;
@@ -20,6 +21,9 @@ public class SushiItems {
     public static final Item TUNA_FISH = register("fish_tuna", new TunaFish());
     
     
+    // Sashimi
+    public static final Item TUNA_SASHIMI = register("sashimi_tuna", new TunaSashimi());
+    
     // Nigiri
     
     public static final Item NIGIRI_SALMON = register("nigiri_salmon", new NigiriSalmon());
diff --git a/src/main/resources/assets/sushi/models/item/sashimi_tuna.json b/src/main/resources/assets/sushi/models/item/sashimi_tuna.json
new file mode 100644
index 0000000..4ce5e1f
--- /dev/null
+++ b/src/main/resources/assets/sushi/models/item/sashimi_tuna.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "sushi:item/sashimi_tuna"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/sushi/textures/item/fish_tuna.png b/src/main/resources/assets/sushi/textures/item/fish_tuna.png
index b0dd5f768b541004e859008bfd37c4342ca52b69..a7ccf6f3c9a164f18ad7a6936bec74592fdf2b02 100644
GIT binary patch
delta 107
zcmV-x0F?iT0hIxeF=S6kL_t(Ijm45%3IHGoz*cnsE8DL{8rf?gNZ}L_ev<$(-k0e`
zGRQ>*06EYo>B%F4hHXJ{{;UPRMNUm&O1vGog{xgn(d=Y(Vd%W?Qvs^A5C*&qTm=9C
N002ovPDHLkV1fp?D%Jo1

delta 94
zcmV-k0HObt0f+&RF;_xKL_t(IjbmUK1r!5DY=UcyjQ-=&5OVGuiXIFDV48!^p2g6-
z*4P-s5DWwU|NoEEcDN=+M%)JAGYDDZC>T}%01d7a1;scswg3PC07*qoM6N<$g7>r}
Apa1{>

diff --git a/src/main/resources/assets/sushi/textures/item/sashimi_tuna.png b/src/main/resources/assets/sushi/textures/item/sashimi_tuna.png
new file mode 100644
index 0000000000000000000000000000000000000000..7336a602c9b9566376e7d6289e62dbdeab17ed65
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|j6Gc(Lo9le
z6C_wgnB7v&NhvS>e<Xv;vYc;Se`k<*Kn{a4^Q_Ag=eF}MSiSTH>*53h28Ne@Je+K5
Sb2b3AGkCiCxvX<aXaWG`t|6cR

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/sushi/recipes/crafting_recipe_nigiri_tuna.json b/src/main/resources/data/sushi/recipes/crafting_recipe_nigiri_tuna.json
new file mode 100644
index 0000000..bb97ad3
--- /dev/null
+++ b/src/main/resources/data/sushi/recipes/crafting_recipe_nigiri_tuna.json
@@ -0,0 +1,20 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "#",
+        "C"
+    ],
+    "key": {
+        "#": {
+            "item": "sushi:sashimi_tuna"
+        },
+        "C": {
+            "item": "farmersdelight:cooked_rice"
+        }
+    },
+    "result": {
+        "item": "sushi:nigiri_tuna",
+        "count": 1
+    },
+    "group": "food_nigiri"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/sushi/recipes/cutting/sashimi_tuna.json b/src/main/resources/data/sushi/recipes/cutting/sashimi_tuna.json
new file mode 100644
index 0000000..4135e4e
--- /dev/null
+++ b/src/main/resources/data/sushi/recipes/cutting/sashimi_tuna.json
@@ -0,0 +1,17 @@
+{
+  "type": "farmersdelight:cutting",
+  "ingredients": [
+    {
+      "item": "sushi:fish_tuna"
+    }
+  ],
+  "result": [
+    {
+      "item": "sushi:sashimi_tuna",
+      "count": 5
+    }
+  ],
+  "tool": {
+    "tag": "c:tools/knives"
+  }
+}
\ No newline at end of file