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 b0dd5f7..a7ccf6f 100644 Binary files a/src/main/resources/assets/sushi/textures/item/fish_tuna.png and b/src/main/resources/assets/sushi/textures/item/fish_tuna.png differ 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 0000000..7336a60 Binary files /dev/null and b/src/main/resources/assets/sushi/textures/item/sashimi_tuna.png differ 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