From 13c1f35268548c52c38371c400b94fdd926366cf Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 2 Nov 2021 12:04:59 +0800
Subject: Fix merge conflicts

---
 .../java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime/src/main/java')

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 57857aea5..c95f474f4 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
@@ -193,10 +193,10 @@ public abstract class AbstractEntryStack<A> implements EntryStack<A>, Renderer {
                 }
             } else {
                 final String modName = ClientHelper.getInstance().getModFromModId(location.getNamespace());
-                Iterator<Tooltip.Entry> iterator = tooltip.getValue().entries().iterator();
+                Iterator<Component> iterator = tooltip.getValue().getText().iterator();
                 while (iterator.hasNext()) {
-                    Tooltip.Entry s = iterator.next();
-                    if (s.isText() && FormattingUtils.stripFormatting(s.getAsText().getString()).equalsIgnoreCase(modName)) {
+                    Component s = iterator.next();
+                    if (FormattingUtils.stripFormatting(s.getString()).equalsIgnoreCase(modName)) {
                         iterator.remove();
                     }
                 }
-- 
cgit