Fix compile issues

4 files changed, 52 insertions, 112 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java
deleted file mode 100644
index 169a0df0f..000000000
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagBuilder.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file is licensed under the MIT License, part of Roughly Enough Items.
- * Copyright (c) 2018, 2019, 2020, 2021, 2022 shedaniel
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package me.shedaniel.rei.mixin.fabric;
-
-import com.mojang.datafixers.util.Either;
-import me.shedaniel.rei.plugin.common.displays.tag.TagNodes;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
-import net.minecraft.tags.TagBuilder;
-import net.minecraft.tags.TagEntry;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-@Mixin(TagBuilder.class)
-public class MixinTagBuilder<T> {
-    @Shadow @Final private List<TagEntry> entries;
-    
-    @Inject(method = "build", at = @At("RETURN"))
-    private void load(Function<ResourceLocation, Tag<T>> tagResolver, Function<ResourceLocation, T> valueResolver, CallbackInfoReturnable<Either<Collection<Tag.BuilderEntry>, Tag<T>>> cir) {
-        Tag<T> tag = cir.getReturnValue().right().orElse(null);
-        if (tag != null) {
-            String currentTagDirectory = TagNodes.CURRENT_TAG_DIR.get();
-            if (currentTagDirectory == null) return;
-            ResourceKey<? extends Registry<?>> resourceKey = TagNodes.TAG_DIR_MAP.get(currentTagDirectory);
-            if (resourceKey == null) return;
-            Map<Tag<?>, TagNodes.RawTagData> dataMap = TagNodes.RAW_TAG_DATA_MAP.get(currentTagDirectory);
-            if (dataMap == null) return;
-            List<ResourceLocation> otherElements = new ArrayList<>();
-            List<ResourceLocation> otherTags = new ArrayList<>();
-            
-            for (Tag.BuilderEntry builderEntry : this.entries) {
-                if (builderEntry.entry() instanceof Tag.OptionalTagEntry tagEntry) {
-                    Tag<T> apply = tagResolver.apply(tagEntry.id);
-                    if (apply != null) {
-                        otherTags.add(tagEntry.id);
-                    }
-                } else if (builderEntry.entry() instanceof Tag.TagEntry tagEntry) {
-                    Tag<T> apply = tagResolver.apply(tagEntry.id);
-                    if (apply != null) {
-                        otherTags.add(tagEntry.id);
-                    }
-                } else if (builderEntry.entry() instanceof Tag.OptionalElementEntry tagEntry) {
-                    T apply = valueResolver.apply(tagEntry.id);
-                    if (apply != null) {
-                        otherElements.add(tagEntry.id);
-                    }
-                } else if (builderEntry.entry() instanceof Tag.ElementEntry tagEntry) {
-                    T apply = valueResolver.apply(tagEntry.id);
-                    if (apply != null) {
-                        otherElements.add(tagEntry.id);
-                    }
-                }
-            }
-            
-            dataMap.put(tag, new TagNodes.RawTagData(otherElements, otherTags));
-        }
-    }
-}
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagLoader.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagLoader.java
index 493361c56..c866f7ea5 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagLoader.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagLoader.java
@@ -25,17 +25,20 @@ package me.shedaniel.rei.mixin.fabric;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.BiMap;
+import com.google.common.collect.Comparators;
 import com.google.common.collect.HashBiMap;
+import com.mojang.datafixers.util.Either;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectMaps;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
-import me.shedaniel.rei.plugin.common.displays.tag.TagNode;
 import me.shedaniel.rei.plugin.common.displays.tag.TagNodes;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
-import net.minecraft.tags.TagKey;
+import net.minecraft.tags.TagEntry;
 import net.minecraft.tags.TagLoader;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -50,15 +53,18 @@ import java.util.*;
 public class MixinTagLoader<T> {
     @Shadow @Final private String directory;
     
-    @Inject(method = "build", at = @At("HEAD"))
-    private void load(Map<ResourceLocation, Tag.Builder> map, CallbackInfoReturnable<Map<ResourceLocation, Tag<T>>> cir) {
+    @Inject(method = "build(Ljava/util/Map;)Ljava/util/Map;", at = @At("HEAD"))
+    private void load(Map<ResourceLocation, TagLoader.EntryWithSource> map, CallbackInfoReturnable<Map<ResourceLocation, Collection<T>>> cir) {
         TagNodes.RAW_TAG_DATA_MAP.put(directory, new HashMap<>());
         TagNodes.CURRENT_TAG_DIR.set(directory);
     }
     
-    @Inject(method = "build", at = @At("RETURN"))
-    private void loadPost(Map<ResourceLocation, Tag.Builder> map, CallbackInfoReturnable<Map<ResourceLocation, Tag<T>>> cir) {
-        HashBiMap<ResourceLocation, Tag<T>> biMap = HashBiMap.create(cir.getReturnValue());
+    @Inject(method = "build(Ljava/util/Map;)Ljava/util/Map;", at = @At("RETURN"))
+    private void loadPost(Map<ResourceLocation, TagLoader.EntryWithSource> map, CallbackInfoReturnable<Map<ResourceLocation, Collection<T>>> cir) {
+        Map<TagNodes.CollectionWrapper<T>, ResourceLocation> inverseMap = new HashMap<>(cir.getReturnValue().size());
+        for (Map.Entry<ResourceLocation, Collection<T>> entry : cir.getReturnValue().entrySet()) {
+            inverseMap.put(new TagNodes.CollectionWrapper<>(entry.getValue()), entry.getKey());
+        }
         ResourceKey<? extends Registry<?>> resourceKey = TagNodes.TAG_DIR_MAP.get(directory);
         if (resourceKey == null) return;
         TagNodes.TAG_DATA_MAP.put(resourceKey, new HashMap<>());
@@ -66,18 +72,18 @@ public class MixinTagLoader<T> {
         Registry<T> registry = ((Registry<Registry<T>>) Registry.REGISTRY).get((ResourceKey<Registry<T>>) resourceKey);
         Stopwatch stopwatch = Stopwatch.createStarted();
         
-        Iterator<Map.Entry<Tag<?>, TagNodes.RawTagData>> entryIterator = TagNodes.RAW_TAG_DATA_MAP.getOrDefault(directory, Collections.emptyMap())
+        Iterator<Map.Entry<TagNodes.CollectionWrapper<?>, TagNodes.RawTagData>> entryIterator = TagNodes.RAW_TAG_DATA_MAP.getOrDefault(directory, Reference2ObjectMaps.emptyMap())
                 .entrySet().iterator();
         
         if (!entryIterator.hasNext()) return;
         
         while (entryIterator.hasNext()) {
-            Map.Entry<Tag<?>, TagNodes.RawTagData> entry = entryIterator.next();
-            Tag<?> tag = entry.getKey();
+            Map.Entry<TagNodes.CollectionWrapper<?>, TagNodes.RawTagData> entry = entryIterator.next();
+            TagNodes.CollectionWrapper<?> tag = entry.getKey();
             entryIterator.remove();
             
             if (registry != null) {
-                ResourceLocation tagLoc = biMap.inverse().get(tag);
+                ResourceLocation tagLoc = inverseMap.get(tag);
                 
                 if (tagLoc != null) {
                     TagNodes.RawTagData rawTagData = entry.getValue();
@@ -95,4 +101,36 @@ public class MixinTagLoader<T> {
         
         RoughlyEnoughItemsCore.LOGGER.info("Processed %d tags in %s for %s", tagDataMap.size(), stopwatch.stop(), resourceKey.location());
     }
+    
+    @Inject(method = "build(Lnet/minecraft/tags/TagEntry$Lookup;Ljava/util/List;)Lcom/mojang/datafixers/util/Either;", at = @At("RETURN"))
+    private void load(TagEntry.Lookup<T> lookup, List<TagLoader.EntryWithSource> entries, CallbackInfoReturnable<Either<Collection<TagLoader.EntryWithSource>, Collection<T>>> cir) {
+        Collection<T> tag = cir.getReturnValue().right().orElse(null);
+        if (tag != null) {
+            String currentTagDirectory = TagNodes.CURRENT_TAG_DIR.get();
+            if (currentTagDirectory == null) return;
+            ResourceKey<? extends Registry<?>> resourceKey = TagNodes.TAG_DIR_MAP.get(currentTagDirectory);
+            if (resourceKey == null) return;
+            Map<TagNodes.CollectionWrapper<?>, TagNodes.RawTagData> dataMap = TagNodes.RAW_TAG_DATA_MAP.get(currentTagDirectory);
+            if (dataMap == null) return;
+            List<ResourceLocation> otherElements = new ArrayList<>();
+            List<ResourceLocation> otherTags = new ArrayList<>();
+            
+            for (TagLoader.EntryWithSource builderEntry : entries) {
+                TagEntry entry = builderEntry.entry();
+                if (entry.tag) {
+                    Collection<T> apply = lookup.tag(entry.id);
+                    if (apply != null) {
+                        otherTags.add(entry.id);
+                    }
+                } else {
+                    T apply = lookup.element(entry.id);
+                    if (apply != null) {
+                        otherElements.add(entry.id);
+                    }
+                }
+            }
+            
+            dataMap.put(new TagNodes.CollectionWrapper<>(tag), new TagNodes.RawTagData(otherElements, otherTags));
+        }
+    }
 }
diff --git a/fabric/src/main/resources/rei.mixins.json b/fabric/src/main/resources/rei.mixins.json
index 7d240b971..17048486a 100644
--- a/fabric/src/main/resources/rei.mixins.json
+++ b/fabric/src/main/resources/rei.mixins.json
@@ -11,7 +11,6 @@
   ],
   "mixins": [
     "MixinPacketEncoder",
-    "MixinTagBuilder",
     "MixinTagLoader",
     "MixinTagManager"
   ],
diff --git a/fabric/src/main/resources/roughlyenoughitems.accessWidener b/fabric/src/main/resources/roughlyenoughitems.accessWidener
index 0d86d79a6..48fa4cc1b 100644
--- a/fabric/src/main/resources/roughlyenoughitems.accessWidener
+++ b/fabric/src/main/resources/roughlyenoughitems.accessWidener
@@ -36,11 +36,5 @@ accessible    method net/minecraft/client/gui/screens/Screen
 accessible    method net/minecraft/client/gui/screens/Screen                                   addWidget               (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
 accessible    method net/minecraft/client/gui/screens/Screen                                   renderTooltipInternal   (Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;II)V
 accessible method net/minecraft/client/renderer/RenderType create (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;ILnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
-accessible class net/minecraft/tags/Tag$OptionalTagEntry
-accessible field net/minecraft/tags/Tag$OptionalTagEntry id Lnet/minecraft/resources/ResourceLocation;
-accessible class net/minecraft/tags/Tag$TagEntry
-accessible field net/minecraft/tags/Tag$TagEntry id Lnet/minecraft/resources/ResourceLocation;
-accessible class net/minecraft/tags/Tag$OptionalElementEntry
-accessible field net/minecraft/tags/Tag$OptionalElementEntry id Lnet/minecraft/resources/ResourceLocation;
-accessible class net/minecraft/tags/Tag$ElementEntry
-accessible field net/minecraft/tags/Tag$ElementEntry id Lnet/minecraft/resources/ResourceLocation;
\ No newline at end of file
+accessible field net/minecraft/tags/TagEntry tag Z
+accessible field net/minecraft/tags/TagEntry id Lnet/minecraft/resources/ResourceLocation;
\ No newline at end of file