Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

2 files changed, 6 insertions, 2 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
index dfd8f08f6..b38e409b5 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java
@@ -150,6 +150,9 @@ public interface ConfigObject {
     
     boolean isUsingCompactTabs();
     
+    @ApiStatus.Experimental
+    boolean isUsingCompactTabButtons();
+    
     boolean isLowerConfigButton();
     
     @ApiStatus.Experimental
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
index 632879b0d..979713683 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java
@@ -86,7 +86,8 @@ public final class EntryStacks {
         if (leftType == rightType) {
             return left.getDefinition().equals(left.getValue(), right.castValue(), context);
         }
-        for (EntryTypeBridge<A, B> bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) {
+        EntryTypeRegistry instance = EntryTypeRegistry.getInstance();
+        for (EntryTypeBridge<A, B> bridge : instance.getBridgesFor(leftType, rightType)) {
             CompoundEventResult<Stream<EntryStack<B>>> holder = bridge.bridge(left);
             if (holder.isTrue()) {
                 Iterator<EntryStack<B>> iterator = holder.object().iterator();
@@ -98,7 +99,7 @@ public final class EntryStacks {
                 }
             }
         }
-        for (EntryTypeBridge<B, A> bridge : EntryTypeRegistry.getInstance().getBridgesFor(rightType, leftType)) {
+        for (EntryTypeBridge<B, A> bridge : instance.getBridgesFor(rightType, leftType)) {
             CompoundEventResult<Stream<EntryStack<A>>> holder = bridge.bridge(right);
             if (holder.isTrue()) {
                 Iterator<EntryStack<A>> iterator = holder.object().iterator();