1.19.4 port (works up to latest version)

Author: tildejustin

gradle.properties

@@ -3,6 +3,6 @@ org.gradle.parallel = true
 org.gradle.caching = true
 
 mod_version = 1.4.2
-target_version = 1.19-1.19.2
+target_version = 1.19.4-1.20.4
 archives_name = fast-reset
 maven_group = fast_reset.client

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-minecraft = "1.19.3"
-yarn_mappings = "1.19.3+build.5"
+minecraft = "1.19.4"
+yarn_mappings = "1.19.4+build.2"
 fabric_loader = "0.15.6"
 loom = "1.5-SNAPSHOT"
 vineflower = "1.10.0-SNAPSHOT"

src/main/java/fast_reset/client/client/SaveWorldScreen.java

@@ -16,6 +16,6 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta){
 
         super.render(matrices, mouseX, mouseY, delta);
 
-        drawCenteredText(matrices, this.textRenderer, "still saving the last world", this.width / 2, 70, Color.white.getRGB());
+        drawCenteredTextWithShadow(matrices, this.textRenderer, "still saving the last world", this.width / 2, 70, Color.white.getRGB());
     }
 }

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

@@ -6,7 +6,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.world.CreateWorldScreen;
 import net.minecraft.server.integrated.IntegratedServerLoader;
-import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -15,10 +15,9 @@
 public abstract class ClientMixin {
 
     // had to change the minecraft class to mix into, kept the class name to keep it in sync with the other versions
-
     @Inject(method = "tryLoad", at=@At("HEAD"))
-    private static void worldWait(MinecraftClient client, CreateWorldScreen parent, Lifecycle lifecycle, Runnable loader, CallbackInfo ci){
-        client.setScreen(new SaveWorldScreen());
+    private static void worldWait(CallbackInfo ci){
+        MinecraftClient.getInstance().setScreen(new SaveWorldScreen());
         synchronized(Client.saveLock){
             System.out.println("done waiting for save lock");
         }

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

@@ -1,6 +1,7 @@
 package fast_reset.client.mixin;
 
 import fast_reset.client.Client;
+import net.minecraft.client.gui.*;
 import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.text.Text;
@@ -19,18 +20,17 @@ protected GameMenuMixin(Text title) {
     @Unique
     private static final int bottomRightWidth = 102;
 
-    @Redirect(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/ClickableWidget;I)Lnet/minecraft/client/gui/widget/ClickableWidget;"))
-    private <T extends ClickableWidget> T addButtons(GridWidget.Adder instance, T widget, int occupiedColumns) {
-        @SuppressWarnings("NoTranslation") final ButtonWidget.Builder saveButton = ButtonWidget.builder(Text.translatable("menu.quitWorld"), (buttonWidgetX) -> {
+    @Redirect(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;I)Lnet/minecraft/client/gui/widget/Widget;"))
+    private <T extends Widget> T addButtons(GridWidget.Adder instance, T widget, int occupiedColumns) {
+        final ButtonWidget.Builder saveButton = ButtonWidget.builder(Text.translatable("menu.quitWorld"), (buttonWidgetX) -> {
             Client.saveOnQuit = false;
             this.disconnect();
             Client.saveOnQuit = true;
         });
-
         if (Client.buttonLocation == 2) {
             // add menu.quitWorld button instead of save button
             instance.add(saveButton.width(204).build(), occupiedColumns);
-            return this.addDrawableChild(widget);
+            return (T) this.addDrawableChild((ButtonWidget) widget);
         }
 
         int height = 20;

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

@@ -29,7 +29,7 @@ private static Text getButtonText(){
         }
     }
 
-    @Inject(method = "init", at= @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/ClickableWidget;ILnet/minecraft/client/gui/widget/Positioner;)Lnet/minecraft/client/gui/widget/ClickableWidget;"), locals = LocalCapture.CAPTURE_FAILHARD)
+    @Inject(method = "init", at= @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/GridWidget$Adder;add(Lnet/minecraft/client/gui/widget/Widget;ILnet/minecraft/client/gui/widget/Positioner;)Lnet/minecraft/client/gui/widget/Widget;"), locals = LocalCapture.CAPTURE_FAILHARD)
     public void initInject(CallbackInfo ci, GridWidget gridWidget, GridWidget.Adder adder){
         adder.add(ButtonWidget.builder(getButtonText(), (buttonWidget) -> {
             Client.updateButtonLocation();

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

@@ -63,7 +63,7 @@ private void shutdownPlayerSaveInject(PlayerManager playerManager){
     }
 
     @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;anyMatch(Ljava/util/function/Predicate;)Z"))
-    private boolean streamWorldsInject(Stream stream, Predicate predicate) {
+    private boolean streamWorldsInject(Stream<ServerWorld> stream, Predicate<? super ServerWorld> predicate) {
         if(Client.saveOnQuit){
             return stream.anyMatch(predicate);
         }

src/main/resources/fabric.mod.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
   "id": "fast_reset",
-  "version": "1.0.0",
-  "name": "FastReset_1.19.x",
+  "version": "${version}",
+  "name": "FastReset",
   "description": "",
   "authors": [
     "closet_witch"
@@ -23,6 +23,6 @@
   ],
   "depends": {
     "fabricloader": ">=0.1.0",
-    "minecraft": ">=1.19.3"
+    "minecraft": ">=1.19.4"
   }
 }