multiple things (see extended description)

remove MixinExtras (sadpag)
fix savelock not applying on old worlds
dont show savelock screen if savelock isnt active
move savelock until right before new server creation to save time on resets

Author: contariaa

build.gradle

@@ -16,11 +16,6 @@ dependencies {
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    // Mixin Extras
-    modImplementation include("com.github.LlamaLad7:MixinExtras:${project.mixinextras_version}")
-    implementation("com.github.LlamaLad7:MixinExtras:${project.mixinextras_version}")
-    annotationProcessor("com.github.LlamaLad7:MixinExtras:${project.mixinextras_version}")
-
     // Fabric API. This is technically optional, but you probably want it anyway.
 //    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 

gradle.properties

@@ -5,7 +5,6 @@ org.gradle.jvmargs=-Xmx1G
 minecraft_version=1.16.1
 yarn_mappings=1.16.1+build.21
 loader_version=0.11.3
-mixinextras_version=0.0.12
 # Mod Properties
 mod_version=1.5
 maven_group=fast-reset-1.16.1-v

src/main/java/fast_reset/client/FastReset.java

@@ -14,6 +14,7 @@ public class FastReset implements ClientModInitializer {
     private static final File configurationFile = FabricLoader.getInstance().getConfigDir().resolve("fastReset").resolve("settings.txt").toFile();
 
     public static boolean saveOnQuit = true;
+    public static Boolean saving = false;
     public static final Object saveLock = new Object();
 
     public static int buttonLocation = 0;

src/main/java/fast_reset/client/mixin/MinecraftClientMixin.java

@@ -0,0 +1,34 @@
+package fast_reset.client.mixin;
+
+import fast_reset.client.FastReset;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.SaveLevelScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.TranslatableText;
+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.CallbackInfo;
+
+@Mixin(MinecraftClient.class)
+public abstract class MinecraftClientMixin {
+
+    @Shadow public abstract void method_29970(Screen screen);
+
+    @Inject(method = "startIntegratedServer(Ljava/lang/String;Lnet/minecraft/util/registry/RegistryTracker$Modifiable;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/client/MinecraftClient$WorldLoadAction;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;startServer(Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer;"))
+    private void worldWait(CallbackInfo ci) {
+        synchronized (FastReset.saving) {
+            if (!FastReset.saving) {
+                FastReset.LOGGER.info("no save lock active");
+                return;
+            }
+        }
+
+        this.method_29970(new SaveLevelScreen(new TranslatableText("still saving the last world")));
+
+        synchronized(FastReset.saveLock) {
+            FastReset.LOGGER.info("done waiting for save lock");
+        }
+    }
+}

src/main/java/fast_reset/client/mixin/ResetMixin.java

@@ -1,6 +1,5 @@
 package fast_reset.client.mixin;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import fast_reset.client.FastReset;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
@@ -36,6 +35,10 @@ private boolean closeWorldsRedirect(Iterator<ServerWorld> iterator) {
 
         new Thread(() -> {
             synchronized(FastReset.saveLock) {
+                synchronized (FastReset.saving) {
+                    FastReset.saving = true;
+                }
+
                 while(iterator.hasNext()) {
                     ServerWorld world = iterator.next();
                     if (world != null) {
@@ -49,13 +52,19 @@ private boolean closeWorldsRedirect(Iterator<ServerWorld> iterator) {
                     this.session.deleteSessionLock();
                 } catch (IllegalStateException | IOException ignored) {
                 }
+
+                synchronized (FastReset.saving) {
+                    FastReset.saving = false;
+                }
             }
         }).start();
         return false;
     }
 
-    @WrapWithCondition(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
-    private boolean disablePlayerSaving(PlayerManager playerManager) {
-        return FastReset.saveOnQuit;
+    @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
+    private void disablePlayerSaving(PlayerManager playerManager) {
+        if (FastReset.saveOnQuit) {
+            playerManager.saveAllPlayerData();
+        }
     }
 }

src/main/java/fast_reset/client/mixin/ServerChunkManagerMixin.java

@@ -1,16 +1,18 @@
 package fast_reset.client.mixin;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import fast_reset.client.FastReset;
 import net.minecraft.server.world.ServerChunkManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerChunkManager.class)
 public class ServerChunkManagerMixin {
 
-    @WrapWithCondition(method = "close", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerChunkManager;save(Z)V"))
-    private boolean closeRedirect(ServerChunkManager serverChunkManager, boolean flush) {
-        return FastReset.saveOnQuit;
+    @Redirect(method = "close", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerChunkManager;save(Z)V"))
+    private void closeRedirect(ServerChunkManager serverChunkManager, boolean flush) {
+        if (FastReset.saveOnQuit) {
+            serverChunkManager.save(flush);
+        }
     }
 }

src/main/resources/fabric.mod.json

@@ -11,9 +11,6 @@
   "license": "MIT",
   "environment": "client",
   "entrypoints": {
-    "preLaunch": [
-      "com.llamalad7.mixinextras.MixinExtrasBootstrap::init"
-    ],
     "client": [
       "fast_reset.client.FastReset"
     ]

src/main/resources/fast_reset.mixins.json

@@ -4,8 +4,8 @@
   "package": "fast_reset.client.mixin",
   "compatibilityLevel": "JAVA_8",
   "client": [
-    "CreateWorldScreenMixin",
     "GameMenuMixin",
+    "MinecraftClientMixin",
     "OptionsScreenMixin",
     "ResetMixin",
     "ServerChunkManagerMixin"