Merge commit '41180dd40ac5214da245cfa7956dc662c4d95bea' into modularity

1 files changed, 24 insertions, 1 deletions

diff --git a/runtime-engine/menu-info/src/main/java/me/shedaniel/rei/impl/common/transfer/MenuInfoRegistryImpl.java b/runtime-engine/menu-info/src/main/java/me/shedaniel/rei/impl/common/transfer/MenuInfoRegistryImpl.java
index dfbf67866..875ce19c3 100644
--- a/runtime-engine/menu-info/src/main/java/me/shedaniel/rei/impl/common/transfer/MenuInfoRegistryImpl.java
+++ b/runtime-engine/menu-info/src/main/java/me/shedaniel/rei/impl/common/transfer/MenuInfoRegistryImpl.java
@@ -32,6 +32,7 @@ import me.shedaniel.rei.api.common.transfer.info.MenuInfo;
 import me.shedaniel.rei.api.common.transfer.info.MenuInfoProvider;
 import me.shedaniel.rei.api.common.transfer.info.MenuInfoRegistry;
 import me.shedaniel.rei.api.common.transfer.info.MenuSerializationContext;
+import me.shedaniel.rei.impl.common.InternalLogger;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.nbt.CompoundTag;
@@ -53,11 +54,28 @@ public class MenuInfoRegistryImpl implements MenuInfoRegistry {
         map.computeIfAbsent(category, id -> Maps.newLinkedHashMap())
                 .computeIfAbsent(menuClass, c -> Lists.newArrayList())
                 .add(menuInfo);
+        InternalLogger.getInstance().debug("Added menu info for %s [%s]: %s", menuClass, category, menuInfo);
     }
     
     @Override
     public <D extends Display> void registerGeneric(Predicate<CategoryIdentifier<?>> categoryPredicate, MenuInfoProvider<?, D> menuInfo) {
-        mapGeneric.computeIfAbsent(categoryPredicate, id -> Lists.newArrayList()).add(menuInfo);
+        mapGeneric.computeIfAbsent(new Predicate<>() {
+            @Override
+            public boolean test(CategoryIdentifier<?> categoryIdentifier) {
+                return categoryPredicate.test(categoryIdentifier);
+            }
+            
+            @Override
+            public int hashCode() {
+                return System.identityHashCode(this);
+            }
+            
+            @Override
+            public boolean equals(Object obj) {
+                return this == obj;
+            }
+        }, id -> Lists.newArrayList()).add(menuInfo);
+        InternalLogger.getInstance().debug("Added generic menu info for: %s", menuInfo);
     }
     
     @Override
@@ -122,6 +140,11 @@ public class MenuInfoRegistryImpl implements MenuInfoRegistry {
     }
     
     @Override
+    public void endReload() {
+        InternalLogger.getInstance().debug("Registered %d menu infos", infoSize());
+    }
+    
+    @Override
     public void acceptPlugin(REIServerPlugin plugin) {
         plugin.registerMenuInfo(this);
     }