From 9b89a4aeb482a697ee52703ba154bf4309fbbff2 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 12 Jul 2022 00:09:50 +0800 Subject: Fix crash in dev due to mixin static shadow remapping --- .../main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'fabric/src/main/java/me') 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 { - @Shadow - public static String getTagDir(ResourceKey> resourceKey) { - return null; - } - @Inject(method = "createLoader", at = @At("HEAD")) private void load(ResourceManager resourceManager, Executor executor, RegistryAccess.RegistryEntry registryEntry, CallbackInfoReturnable>> cir) { ResourceKey> resourceKey = registryEntry.key(); - TagNodes.TAG_DIR_MAP.put(getTagDir(resourceKey), resourceKey); + TagNodes.TAG_DIR_MAP.put(TagManager.getTagDir(resourceKey), resourceKey); } } -- cgit