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..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 @@ -1,9 +1,43 @@ 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; +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); } + + public SashimiBase(){ + this(new Settings() + .food(new FoodComponent.Builder() + .hunger(5) + .saturationModifier(6) + .build() + ) + ); + } + + 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..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(1) - .saturationModifier(1) - .build() - ) - ); + super(); } } 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..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 @@ -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) { @@ -11,10 +20,23 @@ 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() ) ); } + 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/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 a7ccf6f..d6307ed 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/nigiri_tuna.png b/src/main/resources/assets/sushi/textures/item/nigiri_tuna.png index b0dd5f7..ee3a453 100644 Binary files a/src/main/resources/assets/sushi/textures/item/nigiri_tuna.png and b/src/main/resources/assets/sushi/textures/item/nigiri_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 index 7336a60..2a5120c 100644 Binary files a/src/main/resources/assets/sushi/textures/item/sashimi_tuna.png and b/src/main/resources/assets/sushi/textures/item/sashimi_tuna.png differ