port: update to 1.21.10

Author: contariaa

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 	id "io.github.p03w.machete" version "2.0.1"
 }
@@ -39,12 +39,11 @@ processResources {
 	inputs.property "version", project.version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": inputs.properties.version
 	}
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Since Minecraft 1.21, Java 21 is preferred.
 	it.options.release = 21
 }
 
@@ -62,3 +61,21 @@ jar {
 		rename { "${it}_${inputs.properties.archivesName}"}
 	}
 }
+
+// configure the maven publication
+publishing {
+	publications {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
+	}
+}

gradle.properties

@@ -1,19 +1,24 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
+org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.16.14
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.3
+loader_version=0.18.1
+loom_version=1.13-SNAPSHOT
 
 # Mod Properties
 mod_version=3.1.1
-target_version=1.21.6
+target_version=1.21.10
 maven_group=me.contaria
 archives_base_name=fastquit
 
 # Dependencies
-fabric_api_version=0.127.1+1.21.6
-modmenu_version=15.0.0-beta.2
-cloth_config_version=19.0.147
+fabric_api_version=0.138.3+1.21.10
+modmenu_version=16.0.0-rc.1
+cloth_config_version=20.0.149

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/me/contaria/fastquit/mixin/LevelStorageSessionMixin.java

@@ -49,6 +49,10 @@ public abstract class LevelStorageSessionMixin {
     @Shadow
     public abstract void backupLevelDataFile(DynamicRegistryManager registryManager, SaveProperties saveProperties, @Nullable NbtCompound nbt);
 
+    @Synchronized
+    @Shadow
+    protected abstract void save(NbtCompound compound) throws IOException;
+
     @Synchronized
     @Shadow
     public abstract long createBackup() throws IOException;
@@ -61,6 +65,10 @@ public abstract class LevelStorageSessionMixin {
     @Shadow
     protected abstract void save(Consumer<NbtCompound> nbtProcessor) throws IOException;
 
+    @Synchronized
+    @Shadow
+    public abstract boolean tryRestoreBackup();
+
     @Synchronized
     @Shadow
     public abstract void close() throws IOException;

src/main/java/me/contaria/fastquit/mixin/MinecraftClientMixin.java

@@ -1,21 +1,23 @@
 package me.contaria.fastquit.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import me.contaria.fastquit.FastQuit;
-import me.contaria.fastquit.TextHelper;
 import me.contaria.fastquit.WorldInfo;
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.MessageScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.server.integrated.IntegratedServer;
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftClient.class)
 public abstract class MinecraftClientMixin {
+    @Shadow
+    private boolean integratedServerRunning;
 
     @Redirect(
             method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V",
@@ -35,15 +37,19 @@ private boolean fastquit(IntegratedServer server) {
         return true;
     }
 
-    @WrapWithCondition(
-            method = "reset",
+    @WrapOperation(
+            method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/MinecraftClient;render(Z)V"
+                    target = "Lnet/minecraft/client/MinecraftClient;setScreenAndRender(Lnet/minecraft/client/gui/screen/Screen;)V"
             )
     )
-    private boolean fastquit$doNotOpenSaveScreen(MinecraftClient client, boolean tick, Screen screen) {
-        return FastQuit.CONFIG.renderSavingScreen || !(screen instanceof MessageScreen && screen.getTitle().equals(TextHelper.translatable("menu.savingLevel")));
+    private void fastquit$doNotOpenSaveScreen(MinecraftClient client, Screen screen, Operation<Void> original) {
+        if (FastQuit.CONFIG.renderSavingScreen && this.integratedServerRunning) {
+            original.call(client, screen);
+        } else {
+            client.setScreen(screen);
+        }
     }
 
     @Inject(

src/main/java/me/contaria/fastquit/mixin/WorldListWidgetWorldEntryMixin.java

@@ -7,7 +7,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.world.SelectWorldScreen;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
 import net.minecraft.world.level.storage.LevelStorage;
 import net.minecraft.world.level.storage.LevelSummary;
@@ -19,11 +19,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(WorldListWidget.WorldEntry.class)
-public abstract class WorldListWidgetWorldEntryMixin {
-
+public abstract class WorldListWidgetWorldEntryMixin extends WorldListWidget.Entry {
     @Shadow
     @Final
-    private SelectWorldScreen screen;
+    private Screen screen;
     @Shadow
     @Final
     private MinecraftClient client;
@@ -73,18 +72,18 @@ public abstract class WorldListWidgetWorldEntryMixin {
             method = "render",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)V",
+                    target = "Lnet/minecraft/client/gui/widget/TextWidget;render(Lnet/minecraft/client/gui/DrawContext;IIF)V",
                     ordinal = 0,
                     shift = At.Shift.AFTER
             )
     )
-    private void fastquit$renderSavingTimeOnWorldList(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo ci) {
+    private void fastquit$renderSavingTimeOnWorldList(DrawContext context, int mouseX, int mouseY, boolean hovered, float deltaTicks, CallbackInfo ci) {
         if (FastQuit.CONFIG.showSavingTime == FastQuitConfig.ShowSavingTime.TRUE) {
             FastQuit.getSavingWorld(this.client.getLevelStorage().getSavesDirectory().resolve(this.level.getName())).ifPresent(server -> {
                 WorldInfo info = FastQuit.savingWorlds.get(server);
                 if (info != null) {
                     String time = info.getTimeSaving() + " ⌛";
-                    context.drawText(this.client.textRenderer, time, x + entryWidth - this.client.textRenderer.getWidth(time) - 4, y + 1, -6939106, false);
+                    context.drawText(this.client.textRenderer, time, this.getX() + this.getWidth() - this.client.textRenderer.getWidth(time) - 4, this.getY() + 1, -6939106, false);
                 }
             });
         }

src/main/resources/fabric.mod.json

@@ -28,7 +28,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.16.9",
-    "minecraft": ">=1.21.6",
+    "minecraft": ">=1.21.9",
     "fabric-resource-loader-v0": "*",
     "cloth-config": "*",
     "java": ">=21"