use MixinExtras

wrapwithcondition is just perfect for fastreset

Author: contariaa

build.gradle

@@ -16,6 +16,11 @@ 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}"
 
@@ -47,6 +52,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
+repositories {
+    maven { url 'https://jitpack.io' }
+}
+
 jar {
     from "LICENSE"
 }

gradle.properties

@@ -5,6 +5,7 @@ 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/mixin/ResetMixin.java

@@ -1,5 +1,6 @@
 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;
@@ -53,10 +54,8 @@ private boolean closeWorldsRedirect(Iterator<ServerWorld> iterator) {
         return false;
     }
 
-    @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
-    private void disablePlayerSaving(PlayerManager playerManager) {
-        if (FastReset.saveOnQuit) {
-            playerManager.saveAllPlayerData();
-        }
+    @WrapWithCondition(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
+    private boolean disablePlayerSaving(PlayerManager playerManager) {
+        return FastReset.saveOnQuit;
     }
 }

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

@@ -1,18 +1,16 @@
 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 {
 
-    @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);
-        }
+    @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;
     }
 }

src/main/resources/fabric.mod.json

@@ -11,6 +11,9 @@
   "license": "MIT",
   "environment": "client",
   "entrypoints": {
+    "preLaunch": [
+      "com.llamalad7.mixinextras.MixinExtrasBootstrap::init"
+    ],
     "client": [
       "fast_reset.client.FastReset"
     ]
@@ -19,7 +22,6 @@
     "fast_reset.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.1.0",
-    "minecraft": ">=1.16 <=1.16.1
+    "fabricloader": ">=0.1.0"
   }
 }