aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-11-02 11:09:14 +0800
committershedaniel <daniel@shedaniel.me>2021-11-02 11:09:14 +0800
commit1b33b3e72c1b2bdb5b733bb5afe6b478367c77e5 (patch)
tree020d3e4f4e4645e24a4e5b1e7877419e75112fe1 /runtime
parentb68e07108e21e4f1f231dfccac6c095c22b9a695 (diff)
downloadRoughlyEnoughItems-1b33b3e72c1b2bdb5b733bb5afe6b478367c77e5.tar.gz
RoughlyEnoughItems-1b33b3e72c1b2bdb5b733bb5afe6b478367c77e5.tar.bz2
RoughlyEnoughItems-1b33b3e72c1b2bdb5b733bb5afe6b478367c77e5.zip
Fix searching craft but does search the modid because other mods add that
Diffstat (limited to 'runtime')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java13
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 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<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) {