Fix crash in dev due to mixin static shadow remapping

2 files changed, 2 insertions, 14 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java
index 9e3b22bd7..e40ea3b1d 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java
@@ -30,7 +30,6 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.tags.TagManager;
 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;
@@ -40,14 +39,9 @@ import java.util.concurrent.Executor;
 
 @Mixin(TagManager.class)
 public abstract class MixinTagManager<T> {
-    @Shadow
-    public static String getTagDir(ResourceKey<? extends Registry<?>> resourceKey) {
-        return null;
-    }
-    
     @Inject(method = "createLoader", at = @At("HEAD"))
     private void load(ResourceManager resourceManager, Executor executor, RegistryAccess.RegistryEntry<T> registryEntry, CallbackInfoReturnable<CompletableFuture<TagManager.LoadResult<T>>> cir) {
         ResourceKey<? extends Registry<T>> resourceKey = registryEntry.key();
-        TagNodes.TAG_DIR_MAP.put(getTagDir(resourceKey), resourceKey);
+        TagNodes.TAG_DIR_MAP.put(TagManager.getTagDir(resourceKey), resourceKey);
     }
 }
diff --git a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
index f53755004..93e8d0cda 100644
--- a/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
+++ b/forge/src/main/java/me/shedaniel/rei/mixin/forge/MixinTagManager.java
@@ -30,7 +30,6 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.tags.TagManager;
 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;
@@ -40,14 +39,9 @@ import java.util.concurrent.Executor;
 
 @Mixin(TagManager.class)
 public abstract class MixinTagManager<T> {
-    @Shadow
-    public static String getTagDir(ResourceKey<? extends Registry<?>> resourceKey) {
-        return null;
-    }
-    
     @Inject(method = "createLoader", at = @At("HEAD"))
     private void load(ResourceManager resourceManager, Executor executor, RegistryAccess.RegistryEntry<T> registryEntry, CallbackInfoReturnable<CompletableFuture<TagManager.LoadResult<T>>> cir) {
         ResourceKey<? extends Registry<T>> resourceKey = registryEntry.key();
-        TagNodes.TAG_DIR_MAP.put(getTagDir(resourceKey), resourceKey);
+        TagNodes.TAG_DIR_MAP.put(TagManager.getTagDir(resourceKey), resourceKey);
     }
 }