From 28506ebba40678fe40920626316bd83d2bbbd6c6 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 22 Jun 2022 23:11:14 +0800 Subject: Format tooltips better --- .../impl/client/gui/widget/entrylist/CollapsedEntriesTooltip.java | 2 +- .../rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/CollapsedEntriesTooltip.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/CollapsedEntriesTooltip.java index 38fd4ca01..44d848b8e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/CollapsedEntriesTooltip.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/CollapsedEntriesTooltip.java @@ -70,7 +70,7 @@ public class CollapsedEntriesTooltip implements ClientTooltipComponent, TooltipC poses.translate(0, 0, z + 50); for (EntryStack entry : stack.getIngredient()) { int x1 = x + (i % w) * entrySize; - int y1 = y + 1 + (i / w) * entrySize; + int y1 = y + (i / w) * entrySize; i++; if (i / w > 3 - 1) { poses.translate(0, 0, 200); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java index b5277f69b..31b03aca1 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/EntryListStackEntry.java @@ -40,6 +40,7 @@ import me.shedaniel.rei.impl.client.gui.widget.DisplayedEntryWidget; import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsedStack; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.util.Mth; import net.minecraft.world.inventory.tooltip.TooltipComponent; import org.jetbrains.annotations.Nullable; @@ -190,8 +191,8 @@ public class EntryListStackEntry extends DisplayedEntryWidget { Tooltip tooltip = super.getCurrentTooltip(point); if (tooltip != null && this.collapsedStack != null) { - tooltip.add(new TranslatableComponent("text.rei.collapsed.entry.hint.collapse", collapsedStack.getName(), collapsedStack.getIngredient().size()) - .withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC)); + tooltip.entries().add(Mth.clamp(tooltip.entries().size() - 1, 0, tooltip.entries().size() - 1), Tooltip.entry(new TranslatableComponent("text.rei.collapsed.entry.hint.collapse", collapsedStack.getName(), collapsedStack.getIngredient().size()) + .withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC))); } return tooltip; } -- cgit