From 351824c227e23f0793a866ee5866878d32ed5cc4 Mon Sep 17 00:00:00 2001 From: Jais Djurhuus-Kempel Date: Wed, 27 Sep 2023 21:03:52 +0300 Subject: [PATCH] render item names correctly for nbt items --- .../alchemistry/client/container/RecipeDisplayUtil.java | 2 +- .../alchemistry/common/block/combiner/CombinerScreen.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/smashingmods/alchemistry/client/container/RecipeDisplayUtil.java b/src/main/java/com/smashingmods/alchemistry/client/container/RecipeDisplayUtil.java index be3a53efa..df75d1df1 100644 --- a/src/main/java/com/smashingmods/alchemistry/client/container/RecipeDisplayUtil.java +++ b/src/main/java/com/smashingmods/alchemistry/client/container/RecipeDisplayUtil.java @@ -44,7 +44,7 @@ public static List getItemTooltipComponent(ItemStack pItemStack, Muta String namespace = StringUtils.capitalize(Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(pItemStack.getItem())).getNamespace()); components.add(pComponent.withStyle(ChatFormatting.UNDERLINE, ChatFormatting.YELLOW)); - components.add(MutableComponent.create(new LiteralContents(String.format("%dx %s", pItemStack.getCount(), pItemStack.getItem().getDescription().getString())))); + components.add(MutableComponent.create(new LiteralContents(String.format("%dx %s", pItemStack.getCount(), pItemStack.getDisplayName().getString())))); if (pItemStack.getItem() instanceof Chemical chemical) { diff --git a/src/main/java/com/smashingmods/alchemistry/common/block/combiner/CombinerScreen.java b/src/main/java/com/smashingmods/alchemistry/common/block/combiner/CombinerScreen.java index 597eeefe0..d882cd361 100644 --- a/src/main/java/com/smashingmods/alchemistry/common/block/combiner/CombinerScreen.java +++ b/src/main/java/com/smashingmods/alchemistry/common/block/combiner/CombinerScreen.java @@ -1,6 +1,7 @@ package com.smashingmods.alchemistry.common.block.combiner; import com.smashingmods.alchemistry.Alchemistry; +import com.smashingmods.alchemistry.client.container.RecipeDisplayUtil; import com.smashingmods.alchemistry.client.container.RecipeSelectorScreen; import com.smashingmods.alchemistry.client.container.SideModeScreen; import com.smashingmods.alchemistry.common.recipe.combiner.CombinerRecipe; @@ -26,6 +27,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class CombinerScreen extends AbstractProcessingScreen { @@ -92,7 +94,8 @@ private void renderCurrentRecipe(GuiGraphics pGuiGraphics, int pMouseX, int pMou pGuiGraphics.renderItem(currentOutput, leftPos + 152, topPos + 15); if (pMouseX >= leftPos + 149 && pMouseX < leftPos + 173 && pMouseY >= topPos + 11 && pMouseY < topPos + 35) { - renderItemTooltip(pGuiGraphics, currentOutput, MutableComponent.create(new TranslatableContents("alchemistry.container.current_recipe", "Current recipe:", TranslatableContents.NO_ARGS)), pMouseX, pMouseY); + var components = RecipeDisplayUtil.getItemTooltipComponent(currentOutput, MutableComponent.create(new TranslatableContents("alchemistry.container.current_recipe", "Current recipe:", TranslatableContents.NO_ARGS))); + pGuiGraphics.renderTooltip(font, components, Optional.empty(), pMouseX, pMouseY); } int xOrigin = leftPos + 48; @@ -117,7 +120,8 @@ private void renderCurrentRecipe(GuiGraphics pGuiGraphics, int pMouseX, int pMou if (handler.getStackInSlot(index).isEmpty() && required) { FakeItemRenderer.renderFakeItem(pGuiGraphics, itemStack, x, y, true); if (pMouseX >= x - 2 && pMouseX < x + 16 && pMouseY >= y - 1 && pMouseY < y + 17) { - renderItemTooltip(pGuiGraphics, itemStack, MutableComponent.create(new TranslatableContents("alchemistry.container.required_input", "Required input item:", TranslatableContents.NO_ARGS)), pMouseX, pMouseY); + var components = RecipeDisplayUtil.getItemTooltipComponent(itemStack, MutableComponent.create(new TranslatableContents("alchemistry.container.required_input", "Required input item:", TranslatableContents.NO_ARGS))); + pGuiGraphics.renderTooltip(font, components, Optional.empty(), pMouseX, pMouseY); } } }