From 4ee8c41abd945436f6a1b212de3cd254c346e8ff Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 24 Jul 2024 20:14:41 -0400
Subject: [PATCH] Allow debugReloader option to also work with datapack reloads

Related: #397
---
 .../SimpleReloadInstanceMixin.java            | 20 +++++++++++++++++++
 .../SimpleReloadableResourceManagerMixin.java | 20 -------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java
 delete mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java
new file mode 100644
index 000000000..a98c0c25c
--- /dev/null
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java
@@ -0,0 +1,20 @@
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
+
+import net.minecraft.server.packs.resources.SimpleReloadInstance;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(SimpleReloadInstance.class)
+public class SimpleReloadInstanceMixin {
+    // TODO maybe expose as a mixin config
+    private static final boolean ENABLE_DEBUG_RELOADER = Boolean.getBoolean("modernfix.debugReloader");
+    /**
+     * @author embeddedt
+     * @reason add ability to use this feature in modpacks
+     */
+    @ModifyVariable(method = "create", at = @At("HEAD"), argsOnly = true)
+    private static boolean enableDebugReloader(boolean bl) {
+        return bl || ENABLE_DEBUG_RELOADER;
+    }
+}
diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java
deleted file mode 100644
index a8a8d5f7f..000000000
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.embeddedt.modernfix.common.mixin.feature.measure_time;
-
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyArg;
-
-@Mixin(ReloadableResourceManager.class)
-public class SimpleReloadableResourceManagerMixin {
-    // TODO maybe expose as a mixin config
-    private static final boolean ENABLE_DEBUG_RELOADER = Boolean.getBoolean("modernfix.debugReloader");
-    /**
-     * @author embeddedt
-     * @reason add ability to use this feature in modpacks
-     */
-    @ModifyArg(method = "createReload", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/resources/SimpleReloadInstance;create(Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/server/packs/resources/ReloadInstance;"), index = 5)
-    private boolean enableDebugReloader(boolean bl) {
-        return bl || ENABLE_DEBUG_RELOADER;
-    }
-}