Added all nigiri classes, missing resources (lang and texture), removed NigiriBase food

src/main/java/dev/confuzzedcat/sushi/items/food/SushiFoodItemBase.java

@@ -0,0 +1,9 @@
+package dev.confuzzedcat.sushi.items.food;
+
+import net.minecraft.item.Item;
+
+public abstract class SushiFoodItemBase extends Item {
+    public SushiFoodItemBase(Settings settings) {
+        super(settings);
+    }
+}

src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/avocadoFruit.java

@@ -1,4 +1,4 @@
-package dev.confuzzedcat.sushi.items.food;
+package dev.confuzzedcat.sushi.items.food.ingredients;
 
 import net.minecraft.item.FoodComponent;
 import net.minecraft.item.Item;

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriAburiSalmon extends NigiriBase {
+}

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

@@ -1,14 +1,14 @@
-package dev.confuzzedcat.sushi.items.food;
+package dev.confuzzedcat.sushi.items.food.nigiri;
 
+import dev.confuzzedcat.sushi.items.food.SushiFoodItemBase;
 import net.minecraft.item.FoodComponent;
-import net.minecraft.item.Item;
 
-public class nigiriBase extends Item {
+public abstract class NigiriBase extends SushiFoodItemBase {
-    public nigiriBase(Settings settings) {
+    public NigiriBase(Settings settings) {
         super(settings);
     }
 
-    public nigiriBase(){
+    public NigiriBase(){
         this(new Settings()
                 .food(new FoodComponent.Builder()
                         .hunger(1)

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

@@ -0,0 +1,5 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriHamachi extends NigiriBase {
+    
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriKingPrawn extends NigiriBase{
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriMackerel extends NigiriBase {
+}

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

@@ -0,0 +1,11 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriSalmon extends NigiriBase {
+    public NigiriSalmon(Settings settings) {
+        super(settings);
+    }
+    
+    public NigiriSalmon () {
+        super();
+    }
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriScallop extends NigiriBase {
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriSeabass extends NigiriBase {
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriSurfClam extends NigiriBase {
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriSweetPrawn extends NigiriBase {
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriTobiko extends NigiriBase {
+}

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

@@ -0,0 +1,13 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.Item;
+
+public class NigiriTuna extends NigiriBase {
+    public NigiriTuna(Settings settings) {
+        super(settings);
+    }
+    public NigiriTuna() {
+        super();
+    }
+}

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

@@ -0,0 +1,4 @@
+package dev.confuzzedcat.sushi.items.food.nigiri;
+
+public class NigiriUnagi extends NigiriBase {
+}

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

@@ -0,0 +1,6 @@
+package dev.confuzzedcat.sushi.registry;
+
+import dev.confuzzedcat.sushi.items.food.nigiri.NigiriBase;
+
+public class NigiriOctopus extends NigiriBase {
+}

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

@@ -1,8 +1,8 @@
 package dev.confuzzedcat.sushi.registry;
 
 import dev.confuzzedcat.sushi.Sushi;
-import dev.confuzzedcat.sushi.items.food.avocadoFruit;
+import dev.confuzzedcat.sushi.items.food.ingredients.avocadoFruit;
-import dev.confuzzedcat.sushi.items.food.nigiriBase;
+import dev.confuzzedcat.sushi.items.food.nigiri.*;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
@@ -12,8 +12,24 @@ import org.slf4j.Logger;
 public class SushiItems {
     private static final Logger LOGGER = Sushi.LOGGER;
     
+    // Ingredients
     public static final Item AVOCADO_FRUIT = register("avocado_fruit", new avocadoFruit());
-    public static final Item NIGIRI_BASE = register("nigiri_base", new nigiriBase());
+    
+    // Nigiri
+    
+    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());
+    public static final Item NIGIRI_SURF_CLAM = register("nigiri_surf_clam", new NigiriSurfClam());
+    public static final Item NIGIRI_KING_PRAWN = register("nigiri_king_prawn", new NigiriKingPrawn());
+    public static final Item NIGIRI_SWEET_PRAWN = register("nigiri_sweet_prawm", new NigiriSweetPrawn());
+    public static final Item NIGIRI_OCTOPUS = register("nigiri_octopus", new NigiriOctopus());
+    public static final Item NIGIRI_TOBIKO = register("nigiri_tobiko", new NigiriTobiko());
+    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

@@ -1,5 +1,7 @@
 {
+  "itemGroup.sushi.sushi_items": "Sushi Items",
+
   "item.sushi.avocado_fruit": "Avocado Fruit",
-  "item.sushi.nigiri_base": "Nigiri Base",
+  "item.sushi.nigiri_tuna": "Tuna Nigiri"
-  "itemGroup.sushi.sushi_items": "Sushi Items"
+  
 }

src/main/resources/assets/sushi/models/item/nigiri_tuna.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sushi:item/nigiri_base"
+    "layer0": "sushi:item/nigiri_tuna"
   }
 }