From 6339f0b638e7e7bd63fd5a1b66f1d2254eb6e863 Mon Sep 17 00:00:00 2001 From: ConfuzzedCat Date: Sat, 28 Mar 2026 21:06:57 +0100 Subject: [PATCH] Added all nigiri classes, missing resources (lang and texture), removed NigiriBase food --- .../sushi/items/food/SushiFoodItemBase.java | 9 +++++++ .../food/{ => ingredients}/avocadoFruit.java | 2 +- .../items/food/nigiri/NigiriAburiSalmon.java | 4 ++++ .../NigiriBase.java} | 12 +++++----- .../items/food/nigiri/NigiriHamachi.java | 5 ++++ .../items/food/nigiri/NigiriKingPrawn.java | 4 ++++ .../items/food/nigiri/NigiriMackerel.java | 4 ++++ .../sushi/items/food/nigiri/NigiriSalmon.java | 11 +++++++++ .../items/food/nigiri/NigiriScallop.java | 4 ++++ .../items/food/nigiri/NigiriSeabass.java | 4 ++++ .../items/food/nigiri/NigiriSurfClam.java | 4 ++++ .../items/food/nigiri/NigiriSweetPrawn.java | 4 ++++ .../sushi/items/food/nigiri/NigiriTobiko.java | 4 ++++ .../sushi/items/food/nigiri/NigiriTuna.java | 13 +++++++++++ .../sushi/items/food/nigiri/NigiriUnagi.java | 4 ++++ .../sushi/registry/NigiriOctopus.java | 6 +++++ .../sushi/registry/SushiItems.java | 22 +++++++++++++++--- .../resources/assets/sushi/lang/en_us.json | 6 +++-- .../{nigiri_base.json => nigiri_tuna.json} | 2 +- .../sushi/textures/item/nigiri_base.png | Bin 126 -> 0 bytes 20 files changed, 111 insertions(+), 13 deletions(-) create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/SushiFoodItemBase.java rename src/main/java/dev/confuzzedcat/sushi/items/food/{ => ingredients}/avocadoFruit.java (89%) create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java rename src/main/java/dev/confuzzedcat/sushi/items/food/{nigiriBase.java => nigiri/NigiriBase.java} (55%) create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriHamachi.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriKingPrawn.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriMackerel.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSalmon.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriScallop.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSeabass.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSurfClam.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSweetPrawn.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTobiko.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTuna.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriUnagi.java create mode 100644 src/main/java/dev/confuzzedcat/sushi/registry/NigiriOctopus.java rename src/main/resources/assets/sushi/models/item/{nigiri_base.json => nigiri_tuna.json} (57%) delete mode 100644 src/main/resources/assets/sushi/textures/item/nigiri_base.png diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/SushiFoodItemBase.java b/src/main/java/dev/confuzzedcat/sushi/items/food/SushiFoodItemBase.java new file mode 100644 index 0000000..f016817 --- /dev/null +++ b/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); + } +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/avocadoFruit.java b/src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/avocadoFruit.java similarity index 89% rename from src/main/java/dev/confuzzedcat/sushi/items/food/avocadoFruit.java rename to src/main/java/dev/confuzzedcat/sushi/items/food/ingredients/avocadoFruit.java index 7d1713c..abe2e12 100644 --- a/src/main/java/dev/confuzzedcat/sushi/items/food/avocadoFruit.java +++ b/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; diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java new file mode 100644 index 0000000..e270661 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiriBase.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java similarity index 55% rename from src/main/java/dev/confuzzedcat/sushi/items/food/nigiriBase.java rename to src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriBase.java index 22d542f..b46cc42 100644 --- a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiriBase.java +++ b/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 nigiriBase(Settings settings) { +public abstract class NigiriBase extends SushiFoodItemBase { + public NigiriBase(Settings settings) { super(settings); } - - public nigiriBase(){ + + public NigiriBase(){ this(new Settings() .food(new FoodComponent.Builder() .hunger(1) diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriHamachi.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriHamachi.java new file mode 100644 index 0000000..a3ad5cc --- /dev/null +++ b/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 { + +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriKingPrawn.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriKingPrawn.java new file mode 100644 index 0000000..4f0f7f2 --- /dev/null +++ b/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{ +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriMackerel.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriMackerel.java new file mode 100644 index 0000000..4105a87 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSalmon.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSalmon.java new file mode 100644 index 0000000..e15e29f --- /dev/null +++ b/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(); + } +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriScallop.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriScallop.java new file mode 100644 index 0000000..dba6522 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSeabass.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSeabass.java new file mode 100644 index 0000000..eb652ca --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSurfClam.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSurfClam.java new file mode 100644 index 0000000..7417210 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSweetPrawn.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriSweetPrawn.java new file mode 100644 index 0000000..6977ba4 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTobiko.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriTobiko.java new file mode 100644 index 0000000..f1a1e35 --- /dev/null +++ b/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 { +} 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 new file mode 100644 index 0000000..399413b --- /dev/null +++ b/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(); + } +} diff --git a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriUnagi.java b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriUnagi.java new file mode 100644 index 0000000..4461773 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/registry/NigiriOctopus.java b/src/main/java/dev/confuzzedcat/sushi/registry/NigiriOctopus.java new file mode 100644 index 0000000..29b0c96 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java b/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java index 37c1525..073b26c 100644 --- a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java +++ b/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.nigiriBase; +import dev.confuzzedcat.sushi.items.food.ingredients.avocadoFruit; +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 register(String name, T item) { LOGGER.info("Registering item with id: {}", name); diff --git a/src/main/resources/assets/sushi/lang/en_us.json b/src/main/resources/assets/sushi/lang/en_us.json index ab81a78..19d5494 100644 --- a/src/main/resources/assets/sushi/lang/en_us.json +++ b/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", - "itemGroup.sushi.sushi_items": "Sushi Items" + "item.sushi.nigiri_tuna": "Tuna Nigiri" + } \ No newline at end of file diff --git a/src/main/resources/assets/sushi/models/item/nigiri_base.json b/src/main/resources/assets/sushi/models/item/nigiri_tuna.json similarity index 57% rename from src/main/resources/assets/sushi/models/item/nigiri_base.json rename to src/main/resources/assets/sushi/models/item/nigiri_tuna.json index ab4d54d..a740775 100644 --- a/src/main/resources/assets/sushi/models/item/nigiri_base.json +++ b/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" } } \ No newline at end of file diff --git a/src/main/resources/assets/sushi/textures/item/nigiri_base.png b/src/main/resources/assets/sushi/textures/item/nigiri_base.png deleted file mode 100644 index d31396479ee6be36a70ac9b188900388b9ec4a32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|EIeHtLo9le z6C_x_F#cc2Fk6OOvDe_+=jZ1)u1Zu1TRdfoNZ3}1CWEsrCXY(LZB9SG;a9l`PZ$FO Y=S-E@g{gd%Kr