diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-09-18 21:55:59 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-09-18 21:55:59 +0800 |
| commit | 001fc846c6002bf70a48dca67cee1437cc11c5e5 (patch) | |
| tree | 11affcea2415f2f2847a210bb8e80b5c99b01cb5 /runtime/src | |
| parent | 21d144a7b605169578ba8e1dc1663d1ab042660d (diff) | |
| parent | 3dc4238eb7a61a992d37a98b9035a9101c022f42 (diff) | |
| download | RoughlyEnoughItems-001fc846c6002bf70a48dca67cee1437cc11c5e5.tar.gz RoughlyEnoughItems-001fc846c6002bf70a48dca67cee1437cc11c5e5.tar.bz2 RoughlyEnoughItems-001fc846c6002bf70a48dca67cee1437cc11c5e5.zip | |
Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
Diffstat (limited to 'runtime/src')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java | 10 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/view/ViewsImpl.java | 2 |
2 files changed, 11 insertions, 1 deletions
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 88496cef3..9c185764e 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 @@ -134,6 +134,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<Tooltip.Entry> iterator = components.entries().iterator(); while (iterator.hasNext()) { @@ -145,6 +147,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) 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 |