From 0a154e6f91a1e233d9bbbe570d5781d58c43066c Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 18 Sep 2023 15:32:23 +0800 Subject: Fix #1483 --- .../java/me/shedaniel/rei/impl/client/ClientHelperImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java index c4a63617e..47253199a 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java @@ -135,6 +135,8 @@ public class ClientHelperImpl implements ClientHelper { @Override public void appendModIdToTooltips(Tooltip components, String modId) { final String modName = ClientHelper.getInstance().getModFromModId(modId); + if (this.preserveModId(components, modName)) return; + int i = 0; Iterator iterator = components.entries().iterator(); while (iterator.hasNext()) { @@ -146,6 +148,14 @@ public class ClientHelperImpl implements ClientHelper { components.add(ClientHelper.getInstance().getFormattedModFromModId(modId)); } + private boolean preserveModId(Tooltip components, String modName) { + if (components.entries().isEmpty()) return false; + Tooltip.Entry lastEntry = components.entries().get(components.entries().size() - 1); + + if (!lastEntry.isText()) return false; + return FormattingUtils.stripFormatting(lastEntry.getAsText().getString()).equalsIgnoreCase(modName); + } + @Override public String getModFromModId(String modId) { if (modId == null) -- cgit From 6cc29c0b2cce285f34e5b48852560fbfe2c66424 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 18 Sep 2023 21:49:26 +0800 Subject: Fix #1465 --- runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java index 54fe8ba5f..b815882c3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java @@ -240,7 +240,7 @@ public class ViewsImpl implements Views { if (this == o) return true; if (!(o instanceof Wrapped)) return false; Wrapped wrapped = (Wrapped) o; - return merger.canMerge(display, wrapped.display); + return hash == wrapped.hash && merger.canMerge(display, wrapped.display); } @Override -- cgit