Bump mixin-tools version

IzzelAliz · May 31, 2024 · 30f0829 · 30f0829
1 parent 1a73f8e
commit 30f0829
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/...common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java b/...common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
@@ -12,6 +12,8 @@
 import io.izzel.arclight.common.mod.server.BukkitRegistry;
 import io.izzel.arclight.common.mod.util.ArclightCaptures;
 import io.izzel.arclight.common.mod.util.BukkitOptionParser;
+import io.izzel.arclight.mixin.Decorate;
+import io.izzel.arclight.mixin.DecorationOps;
 import it.unimi.dsi.fastutil.longs.LongIterator;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -76,7 +78,6 @@
 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.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@@ -360,18 +361,9 @@ private void executeModerately() {
         BukkitRegistry.registerEnvironments(this.registryAccess().registryOrThrow(Registries.LEVEL_STEM));
     }
 
-    private transient ServerLevel arclight$capturedLevel;
-
-    @ModifyArg(method = "createLevels", index = 1, at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
-    private Object arclight$worldInitCapture(Object value) {
-        arclight$capturedLevel = (ServerLevel) value;
-        return value;
-    }
-
-    @Inject(method = "createLevels", at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
-    private void arclight$worldInit(ChunkProgressListener chunkProgressListener, CallbackInfo ci) {
-        ServerLevel serverWorld = arclight$capturedLevel;
-        arclight$capturedLevel = null;
+    @Decorate(method = "createLevels", at = @At(value = "INVOKE", remap = false, target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"))
+    private Object arclight$worldInit(Map<Object, Object> instance, Object k, Object v, ChunkProgressListener chunkProgressListener) throws Throwable {
+        var serverWorld = (ServerLevel) v;
         if (serverWorld != null) {
             if (((CraftServer) Bukkit.getServer()).scoreboardManager == null) {
                 ((CraftServer) Bukkit.getServer()).scoreboardManager = new CraftScoreboardManager((MinecraftServer) (Object) this, serverWorld.getScoreboard());
@@ -383,6 +375,7 @@ private void executeModerately() {
             }
             Bukkit.getPluginManager().callEvent(new WorldInitEvent(serverWorld.bridge$getWorld()));
         }
+        return DecorationOps.callsite().invoke(instance, k, v);
     }
 
     /**

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/ArclightConnector.java
@@ -2,19 +2,18 @@
 
 import io.izzel.arclight.api.ArclightPlatform;
 import io.izzel.arclight.common.mod.util.log.ArclightI18nLogger;
-import io.izzel.arclight.mixin.injector.EjectorInfo;
+import io.izzel.arclight.mixin.MixinTools;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixins;
 import org.spongepowered.asm.mixin.connect.IMixinConnector;
-import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
 
 public class ArclightConnector implements IMixinConnector {
 
     public static final Logger LOGGER = ArclightI18nLogger.getLogger("Arclight");
 
     @Override
     public void connect() {
-        InjectionInfo.register(EjectorInfo.class);
+        MixinTools.setup();
         Mixins.addConfiguration("mixins.arclight.core.json");
         Mixins.addConfiguration("mixins.arclight.bukkit.json");
         switch (ArclightPlatform.current()) {

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         apiVersion = '1.6.3'
         toolsVersion = '1.3.0'
         mixinVersion = '0.8.5'
-        mixinToolsVersion = '1.1.1'
+        mixinToolsVersion = '1.2.0'
         versionName = 'whisper'
         gitHash = getGitHash()
     }