From 326663790a81d7156ecdee9d5d1e5ed7b184fe41 Mon Sep 17 00:00:00 2001 From: ConfuzzedCat Date: Tue, 7 Apr 2026 22:32:59 +0200 Subject: [PATCH 1/2] Finished tuna fish, sashimi, nigiri. Made tooltip for aburi salmon nigiri --- .../ingredients/fish/sashimi/SashimiBase.java | 23 ++++++++++++ .../ingredients/fish/sashimi/TunaSashimi.java | 2 +- .../items/food/nigiri/NigiriAburiSalmon.java | 24 ++++++++++++ .../sushi/items/food/nigiri/NigiriBase.java | 22 +++++++++++ .../sushi/items/food/nigiri/NigiriTuna.java | 8 +++- .../sushi/registry/SushiItems.java | 5 ++- .../resources/assets/sushi/lang/en_us.json | 35 +++++++++++------- .../assets/sushi/textures/item/fish_tuna.png | Bin 149 -> 315 bytes .../sushi/textures/item/nigiri_tuna.png | Bin 136 -> 259 bytes .../sushi/textures/item/sashimi_tuna.png | Bin 121 -> 193 bytes 10 files changed, 102 insertions(+), 17 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 d49be18..efa5c36 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 @@ -1,9 +1,32 @@ 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.ItemStack; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.List; public class SashimiBase extends FishBase { public SashimiBase(Settings settings) { super(settings); } + + protected int tooltip_pos = 1; + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + tooltip.add(tooltip_pos, Text.translatable("itemTooltip.sushi.sashimi_base") + .setStyle( + Style.EMPTY + .withFormatting( + Formatting.AQUA + ) + ) + ); + super.appendTooltip(stack, world, tooltip, context); + } } 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 41f3cd7..6896308 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 @@ -11,7 +11,7 @@ public class TunaSashimi extends SashimiBase { public TunaSashimi(){ super(new Settings() .food(new FoodComponent.Builder() - .hunger(1) + .hunger(2) .saturationModifier(1) .build() ) 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 index e270661..af7ae45 100644 --- a/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java +++ b/src/main/java/dev/confuzzedcat/sushi/items/food/nigiri/NigiriAburiSalmon.java @@ -1,4 +1,28 @@ package dev.confuzzedcat.sushi.items.food.nigiri; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + + +import java.util.List; + public class NigiriAburiSalmon extends NigiriBase { + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + tooltip.add(Text.translatable("itemTooltip.sushi.nigiri_aburi_salmon") + .setStyle( + Style.EMPTY + .withFormatting( + Formatting.DARK_GRAY, + Formatting.ITALIC + ) + ) + ); + super.appendTooltip(stack, world, tooltip, context); + } } 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 da8f3ac..413d317 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 @@ -1,7 +1,16 @@ package dev.confuzzedcat.sushi.items.food.nigiri; import dev.confuzzedcat.sushi.items.food.SushiFoodItemBase; +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; +import net.minecraft.util.Formatting; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.List; public abstract class NigiriBase extends SushiFoodItemBase { public NigiriBase(Settings settings) { @@ -17,4 +26,17 @@ public abstract class NigiriBase extends SushiFoodItemBase { ) ); } + protected int tooltip_pos = 1; + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + tooltip.add(tooltip_pos, Text.translatable("itemTooltip.sushi.nigiri_base") + .setStyle( + Style.EMPTY + .withFormatting( + Formatting.AQUA + ) + ) + ); + super.appendTooltip(stack, world, tooltip, context); + } } 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 399413b..19bdf2f 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,6 +8,12 @@ public class NigiriTuna extends NigiriBase { super(settings); } public NigiriTuna() { - super(); + super(new Settings() + .food(new FoodComponent.Builder() + .hunger(5) + .saturationModifier(6) + .build() + ) + ); } } diff --git a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java b/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java index 7c73d2a..f12a41a 100644 --- a/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java +++ b/src/main/java/dev/confuzzedcat/sushi/registry/SushiItems.java @@ -26,8 +26,10 @@ public class SushiItems { // Nigiri - public static final Item NIGIRI_SALMON = register("nigiri_salmon", new NigiriSalmon()); public static final Item NIGIRI_TUNA = register("nigiri_tuna", new NigiriTuna()); + /* + // TODO: Uncomment when done. + public static final Item NIGIRI_SALMON = register("nigiri_salmon", new NigiriSalmon()); 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()); @@ -39,6 +41,7 @@ public class SushiItems { 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 963e25c..66335f7 100644 --- a/src/main/resources/assets/sushi/lang/en_us.json +++ b/src/main/resources/assets/sushi/lang/en_us.json @@ -2,19 +2,26 @@ "itemGroup.sushi.sushi_items": "Sushi Items", "item.sushi.avocado_fruit": "Avocado Fruit", - "item.sushi.nigiri_tuna": "Tuna Nigiri", - "item.sushi.nigiri_salmon" : "Salmon Nigiri", - "item.sushi.nigiri_hamachi" : "Hamachi Nigiri", - "item.sushi.nigiri_seabass" :"Seabass Nigiri", - "item.sushi.nigiri_mackerel" : "Mackerel Nigiri", - "item.sushi.nigiri_surf_clam" :"Surf Clam Nigiri", - "item.sushi.nigiri_king_prawn" : "King Prawn Nigiri", - "item.sushi.nigiri_sweet_prawn" :"Sweet Prawn Nigiri", - "item.sushi.nigiri_octopus" : "Octopus Nigiri", - "item.sushi.nigiri_tobiko" :"Tobiko Nigiri", - "item.sushi.nigiri_scallop" : "Scallop Nigiri", - "item.sushi.nigiri_unagi" :"Unagi Nigiri", - "item.sushi.nigiri_aburi_salmon" : "Aburi Salmon Nigiri", - "item.sushi.fish_tuna" : "Tuna Fish" + "itemTooltip.sushi.nigiri_base": "Nigiri", + "itemTooltip.sushi.sashimi_base": "Sashimi", + + "item.sushi.nigiri_tuna": "Tuna Nigiri", + "item.sushi.nigiri_salmon": "Salmon Nigiri", + "item.sushi.nigiri_hamachi": "Hamachi Nigiri", + "item.sushi.nigiri_seabass":"Seabass Nigiri", + "item.sushi.nigiri_mackerel": "Mackerel Nigiri", + "item.sushi.nigiri_surf_clam":"Surf Clam Nigiri", + "item.sushi.nigiri_king_prawn": "King Prawn Nigiri", + "item.sushi.nigiri_sweet_prawn":"Sweet Prawn Nigiri", + "item.sushi.nigiri_octopus": "Octopus Nigiri", + "item.sushi.nigiri_tobiko":"Tobiko Nigiri", + "item.sushi.nigiri_scallop": "Scallop Nigiri", + "item.sushi.nigiri_unagi":"Unagi Nigiri", + "item.sushi.nigiri_aburi_salmon": "Aburi Salmon Nigiri", + "itemTooltip.sushi.nigiri_aburi_salmon": "Seared salmon on rice", + + "item.sushi.fish_tuna": "Tuna Fish", + + "item.sushi.sashimi_tuna": "Tuna Sashimi" } \ 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 a7ccf6f3c9a164f18ad7a6936bec74592fdf2b02..d6307ed45cd5f09889e6801ae765c61ff37f4a46 100644 GIT binary patch delta 275 zcmV+u0qp*j0lNZ_F@N<*L_t(IjlGgR3c@fLhTlq;3_<83LP4R25TwU&>Ezf$2!f(` z2E9NR2RAQ}8#otS>mW#>f~~|s67plKg7{A1%lEwBPXhc?QN(!^ajwQ%- z;FzvCAvwll-Nb#>=4!D)KZqT*(tP=ZDJ^lmdNSWNVM22241YkvUVDoqi5(Gl>I?)V zL}`hls1Sx7jj={hK}yTFyOB#YtDErcc4{_ItJlGPcZXxT*8YKOR`2-<&XW9ZV=T2LKq$xZmAjFq~n(Kgi3Xr~sfA)(q}}_2dTf+ Z12lhlD+F4tvJ3zK002ovPDHLkV1h$*e}(`6 delta 107 zcmV-x0F?i`0+j)fF=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 N002ovPDHLkV1gWTD+&Mr diff --git a/src/main/resources/assets/sushi/textures/item/nigiri_tuna.png b/src/main/resources/assets/sushi/textures/item/nigiri_tuna.png index b0dd5f768b541004e859008bfd37c4342ca52b69..ee3a453d753180734795994fa035a65afc15cb7a 100644 GIT binary patch delta 218 zcmV<0044v30fPdNF@L>DL_t(Ijir*y5yK!11s^%P0w^GqK?!cd6}b(UKpA!cPyu)4 z;6V5Y5+*t^8rWH$1pHYd9u8xOyRcd-xPAdhkC)}{hVV1w(R4z%K@m2vE51NP1OVrG z;@UPOqs)dgNe13~0D#sS&wVd#-Z0K20hCf=2&r;mGw4F_2~)VXXhWQ=2Ebb6`c)QP z0~W$$(OnSd907oo63EA!K~`%;*FY)7!}HO83o+*5y>F*7Th2KmB07wr(P~fE3o*fF UISoHV>R_B;81Cfh;uvDlo17rQD#GlR)0ExQ^Y8H`fueUZU2;6k3A38d&pUcy&$Sy8 yhXr_;|NZ~pf4OXjnw#4lwg<)>k&iVb!WbBM*9o&8wJ_es00f?{elF{r5}E+Y1)JXfeL9HmW#58 zl%v9BLh~S+8(=OV002ovPDHLk FV1n$sLZbix delta 78 zcmX@eSUJJa!`RcsF~p)bIYEL|gxM|SoRsq7|3@;oEX(=U^>+q|2jnm)Gtas_ac(>B ig4IiJur5w8U|@LZ$HU2{HfI9^5O})!xvX Date: Tue, 7 Apr 2026 22:36:30 +0200 Subject: [PATCH 2/2] 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(); } }