diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-11-02 11:09:14 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-11-02 12:07:16 +0800 |
| commit | eea29b041887a8e24fae6bfe378e8931a92cd827 (patch) | |
| tree | cfd64c17c98f13c7b97956ba05839d4eda8dc181 /runtime/src/main/java | |
| parent | e644ebfbb3cb2a8a452693a710ae9beaaaef4c96 (diff) | |
| download | RoughlyEnoughItems-eea29b041887a8e24fae6bfe378e8931a92cd827.tar.gz RoughlyEnoughItems-eea29b041887a8e24fae6bfe378e8931a92cd827.tar.bz2 RoughlyEnoughItems-eea29b041887a8e24fae6bfe378e8931a92cd827.zip | |
Fix searching craft but does search the modid because other mods add that
Diffstat (limited to 'runtime/src/main/java')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java | 13 |
1 files changed, 12 insertions, 1 deletions
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 813891a41..57857aea5 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<A> implements EntryStack<A>, Renderer { @@ -184,11 +186,20 @@ public abstract class AbstractEntryStack<A> implements EntryStack<A>, 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<Tooltip.Entry> 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) { |
