Support 22w42a

1 files changed, 2 insertions, 26 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
index 293f3bc3e..ab01910f1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
@@ -33,17 +33,13 @@ import me.shedaniel.rei.api.client.overlay.ScreenOverlay;
 import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
 import me.shedaniel.rei.api.client.registry.entry.EntryRegistry;
 import me.shedaniel.rei.api.common.entry.EntryStack;
-import me.shedaniel.rei.api.common.entry.comparison.ComparisonContext;
-import me.shedaniel.rei.api.common.entry.type.EntryDefinition;
-import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
 import me.shedaniel.rei.api.common.registry.ReloadStage;
 import me.shedaniel.rei.api.common.util.CollectionUtils;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.impl.common.InternalLogger;
+import me.shedaniel.rei.impl.VersionAdapter;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
@@ -135,27 +131,7 @@ public class EntryRegistryImpl implements EntryRegistry {
     
     @Override
     public List<ItemStack> appendStacksForItem(Item item) {
-        NonNullList<ItemStack> list = NonNullList.create();
-        LongSet set = new LongOpenHashSet();
-        EntryDefinition<ItemStack> itemDefinition = VanillaEntryTypes.ITEM.getDefinition();
-        for (CreativeModeTab tab : CreativeModeTab.TABS) {
-            if (tab != CreativeModeTab.TAB_HOTBAR && tab != CreativeModeTab.TAB_INVENTORY) {
-                NonNullList<ItemStack> tabList = NonNullList.create();
-                item.fillItemCategory(tab, tabList);
-                for (ItemStack stack : tabList) {
-                    if (set.add(itemDefinition.hash(null, stack, ComparisonContext.EXACT))) {
-                        list.add(stack);
-                    }
-                }
-            }
-        }
-        if (list.isEmpty()) {
-            return Collections.singletonList(item.getDefaultInstance());
-        }
-        if (list.size() > 1) {
-            list.sort(STACK_COMPARATOR);
-        }
-        return list;
+        return VersionAdapter.INSTANCE.appendStacksForItem(item, STACK_COMPARATOR);
     }
     
     @ApiStatus.Internal