From 1b33b3e72c1b2bdb5b733bb5afe6b478367c77e5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 2 Nov 2021 11:09:14 +0800 Subject: Fix searching craft but does search the modid because other mods add that --- .../shedaniel/rei/impl/common/entry/AbstractEntryStack.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'runtime/src') diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java index 04f364c75..3e304f41e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java @@ -36,6 +36,7 @@ import me.shedaniel.rei.api.client.gui.Renderer; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.EntryStacks; +import me.shedaniel.rei.api.common.util.FormattingUtils; import me.shedaniel.rei.impl.client.util.CrashReportUtils; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -52,6 +53,7 @@ import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.Collection; +import java.util.Iterator; @ApiStatus.Internal public abstract class AbstractEntryStack implements EntryStack, Renderer { @@ -184,11 +186,20 @@ public abstract class AbstractEntryStack implements EntryStack, Renderer { tooltip.getValue().addAllTexts(get(Settings.TOOLTIP_APPEND_EXTRA).apply(this)); tooltip.setValue(get(Settings.TOOLTIP_PROCESSOR).apply(this, tooltip.getValue())); if (tooltip.getValue() == null) return null; + ResourceLocation location = getIdentifier(); if (appendModName) { - ResourceLocation location = getIdentifier(); if (location != null) { ClientHelper.getInstance().appendModIdToTooltips(tooltip.getValue(), location.getNamespace()); } + } else { + final String modName = ClientHelper.getInstance().getModFromModId(location.getNamespace()); + Iterator iterator = tooltip.getValue().entries().iterator(); + while (iterator.hasNext()) { + Tooltip.Entry s = iterator.next(); + if (s.isText() && FormattingUtils.stripFormatting(s.getAsText().getString()).equalsIgnoreCase(modName)) { + iterator.remove(); + } + } } return tooltip.getValue(); } catch (Throwable throwable) { -- cgit