aboutsummaryrefslogtreecommitdiff
path: root/fabric/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-07-12 00:09:50 +0800
committershedaniel <daniel@shedaniel.me>2022-07-12 00:10:28 +0800
commit9b89a4aeb482a697ee52703ba154bf4309fbbff2 (patch)
treee2d96522cca684f494c7314cec5e34442bfcbb9c /fabric/src/main/java
parentbe9db4d0cfedfb2bd15b2cf30cd01fdb2cab6cd0 (diff)
downloadRoughlyEnoughItems-9b89a4aeb482a697ee52703ba154bf4309fbbff2.tar.gz
RoughlyEnoughItems-9b89a4aeb482a697ee52703ba154bf4309fbbff2.tar.bz2
RoughlyEnoughItems-9b89a4aeb482a697ee52703ba154bf4309fbbff2.zip
Fix crash in dev due to mixin static shadow remapping
Diffstat (limited to 'fabric/src/main/java')
-rw-r--r--fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinTagManager.java8
1 files changed, 1 insertions, 7 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);
}
}