1.5.0

contariaa · web-flow · commit b635f0ecc699 · 2022-10-03T17:56:42.000+02:00
use less intrusive mixins (replaced some redirects with modifyconstant/-variable)
fix the "still saving the last world" screen never actually rendering
remove/replace unused and unnecessary code
and some more stuff
diff --git a/build.gradle b/build.gradle
@@ -25,15 +25,11 @@ dependencies {
 
 processResources {
     inputs.property "version", project.version
+    filteringCharset "UTF-8"
 
-//    from(sourceSets.main.resources.srcDirs) {
-//        include "fabric.mod.json"
-//        expand "version": project.version
-//    }
-//
-//    from(sourceSets.main.resources.srcDirs) {
-//        exclude "fabric.mod.json"
-//    }
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,6 @@ minecraft_version=1.16.1
 yarn_mappings=1.16.1+build.21
 loader_version=0.11.3
 # Mod Properties
-mod_version=1.4.1
+mod_version=1.5
 maven_group=fast-reset-1.16.1-v
 archives_base_name=fast-reset-1.16.1-v
diff --git a/src/main/java/fast_reset/client/FastReset.java b/src/main/java/fast_reset/client/FastReset.java
@@ -0,0 +1,61 @@
+package fast_reset.client;
+
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.nio.file.Files;
+
+public class FastReset implements ClientModInitializer {
+
+    public static final Logger LOGGER = LogManager.getLogger();
+    private static final File configurationFile = FabricLoader.getInstance().getConfigDir().resolve("fastReset").resolve("settings.txt").toFile();
+
+    public static boolean saveOnQuit = true;
+    public static final Object saveLock = new Object();
+
+    public static int buttonLocation = 0;
+
+    public static void updateButtonLocation() {
+        buttonLocation = (buttonLocation + 1) % 3;
+        save();
+    }
+
+    private static void save() {
+        try {
+            Files.write(configurationFile.toPath(), String.valueOf(buttonLocation).getBytes());
+        } catch (IOException e) {
+            LOGGER.error("Failed to save FastReset config", e);
+        }
+    }
+
+    @Override
+    public void onInitializeClient() {
+        LOGGER.info("Using Fast Reset");
+
+        if (!configurationFile.exists()) {
+            try {
+                if (!configurationFile.getParentFile().mkdirs()) {
+                    throw new IOException("couldn't make config folder");
+                }
+                if (!configurationFile.createNewFile()) {
+                    throw new IOException("couldn't make config file");
+                }
+                save();
+            } catch (IOException e) {
+                LOGGER.error("Failed to create FastReset config", e);
+            }
+            return;
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new FileReader(configurationFile));
+            buttonLocation = Integer.parseInt(reader.readLine()) % 3;
+            reader.close();
+        } catch (IOException | NumberFormatException e) {
+            LOGGER.error("Failed to load FastReset config", e);
+        }
+    }
+}
diff --git a/src/main/java/fast_reset/client/mixin/CreateWorldScreenMixin.java b/src/main/java/fast_reset/client/mixin/CreateWorldScreenMixin.java
@@ -0,0 +1,29 @@
+package fast_reset.client.mixin;
+
+import fast_reset.client.FastReset;
+import net.minecraft.client.gui.screen.SaveLevelScreen;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.world.CreateWorldScreen;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(CreateWorldScreen.class)
+public class CreateWorldScreenMixin extends Screen {
+
+    protected CreateWorldScreenMixin(Text title) {
+        super(title);
+    }
+
+    @Inject(method = "createLevel", at = @At("HEAD"))
+    private void worldWait(CallbackInfo ci) {
+        this.client.method_29970(new SaveLevelScreen(new TranslatableText("still saving the last world")));
+        synchronized(FastReset.saveLock) {
+            FastReset.LOGGER.info("done waiting for save lock");
+        }
+    }
+
+}
diff --git a/src/main/java/fast_reset/client/mixin/GameMenuMixin.java b/src/main/java/fast_reset/client/mixin/GameMenuMixin.java
@@ -1,20 +1,14 @@
 package fast_reset.client.mixin;
 
-import fast_reset.client.Client;
+import fast_reset.client.FastReset;
 import net.minecraft.client.gui.screen.GameMenuScreen;
-import net.minecraft.client.gui.screen.SaveLevelScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.realms.RealmsBridge;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
 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;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(GameMenuScreen.class)
 public class GameMenuMixin extends Screen {
@@ -23,26 +17,17 @@ protected GameMenuMixin(Text title) {
         super(title);
     }
 
-    private static final int bottomRightWidth = 102;
-
-    // kill save on the shutdown
-    @Redirect(method = "initWidgets", at = @At(value = "NEW", target = "net/minecraft/client/gui/widget/ButtonWidget", ordinal=7))
-    private ButtonWidget createExitButton(int defaultX, int defaultY, int defaultWidth, int height, Text message, ButtonWidget.PressAction onPress){
-        int x = Client.buttonLocation == 2 ? (int) (this.width - (bottomRightWidth * 1.5) - 4) : defaultX;
-        int y = Client.buttonLocation == 2 ? this.height - 24 : defaultY;
-        int width = Client.buttonLocation == 2 ? (int) (bottomRightWidth * 1.5) : defaultWidth;
-
-        return new ButtonWidget(x, y, width, height, message, onPress);
-    }
+    @ModifyVariable(method = "initWidgets", at = @At(value = "STORE", ordinal = 1))
+    private ButtonWidget createExitButton(ButtonWidget saveButton) {
+        if (!this.client.isInSingleplayer()) {
+            return saveButton;
+        }
 
-    @Inject(method = "initWidgets", at=@At(value ="TAIL"))
-    private void createSaveButton(CallbackInfo ci){
         int height = 20;
-
         int width;
         int x;
         int y;
-        switch(Client.buttonLocation){
+        switch (FastReset.buttonLocation){
             // bottom right build
             case 0:
                 width = 102;
@@ -52,40 +37,27 @@ private void createSaveButton(CallbackInfo ci){
             // center build
             case 1:
                 width = 204;
-                x = this.width / 2 - width/2;
+                x = this.width / 2 - width / 2;
                 y = this.height / 4 + 148 - height;
                 break;
+            // replace s&q build
             case 2:
             default:
                 width = 204;
-                x = this.width / 2 - width/2;
+                x = this.width / 2 - width / 2;
                 y = this.height / 4 + 124 - height;
+
+                saveButton.x = (int) (this.width - (102 * 1.5) - 4);
+                saveButton.y = this.height - 24;
+                saveButton.setWidth((int) (102 * 1.5));
                 break;
         }
 
-
         this.addButton(new ButtonWidget(x, y, width, height, new TranslatableText("menu.quitWorld"), (buttonWidgetX) -> {
-            Client.saveOnQuit = false;
-
-            boolean bl = this.client.isInSingleplayer();
-            boolean bl2 = this.client.isConnectedToRealms();
-            buttonWidgetX.active = false;
-            this.client.world.disconnect();
-            if (bl) {
-                this.client.disconnect(new SaveLevelScreen(new TranslatableText("menu.savingLevel")));
-            } else {
-                this.client.disconnect();
-            }
-
-            if (bl) {
-                this.client.openScreen(new TitleScreen());
-            } else if (bl2) {
-                RealmsBridge realmsBridge = new RealmsBridge();
-                realmsBridge.switchToRealms(new TitleScreen());
-            } else {
-                this.client.openScreen(new MultiplayerScreen(new TitleScreen()));
-            }
-            Client.saveOnQuit = true;
+            FastReset.saveOnQuit = false;
+            saveButton.onPress();
+            FastReset.saveOnQuit = true;
         }));
+        return saveButton;
     }
 }
diff --git a/src/main/java/fast_reset/client/mixin/OptionsScreenMixin.java b/src/main/java/fast_reset/client/mixin/OptionsScreenMixin.java
@@ -1,8 +1,7 @@
 package fast_reset.client.mixin;
 
-import fast_reset.client.Client;
+import fast_reset.client.FastReset;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.screen.options.OptionsScreen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.LiteralText;
@@ -19,23 +18,23 @@ protected OptionsScreenMixin(Text title) {
         super(title);
     }
 
-    private static Text getButtonText(){
-        switch(Client.buttonLocation){
+    private static String getButtonText() {
+        switch (FastReset.buttonLocation) {
             case 0:
-                return new LiteralText("bottom right");
+                return "bottom right";
             case 1:
-                return new LiteralText("center");
+                return "center";
             case 2:
             default:
-                return new LiteralText("replace s&q");
+                return "replace s&q";
         }
     }
 
     @Inject(method = "init", at=@At("TAIL"))
-    public void initInject(CallbackInfo ci){
-        this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 142 - 4, 150, 20, getButtonText(), (buttonWidget) -> {
-            Client.updateButtonLocation();
-            buttonWidget.setMessage(getButtonText());
+    public void initInject(CallbackInfo ci) {
+        this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 142 - 4, 150, 20, new LiteralText(getButtonText()), (buttonWidget) -> {
+            FastReset.updateButtonLocation();
+            buttonWidget.setMessage(new LiteralText(getButtonText()));
         }));
     }
 }
diff --git a/src/main/java/fast_reset/client/mixin/ResetMixin.java b/src/main/java/fast_reset/client/mixin/ResetMixin.java
@@ -1,6 +1,6 @@
 package fast_reset.client.mixin;
 
-import fast_reset.client.Client;
+import fast_reset.client.FastReset;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.world.ServerWorld;
@@ -9,68 +9,54 @@
 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.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.io.IOException;
+import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 
 @Mixin(MinecraftServer.class)
 public class ResetMixin {
     @Shadow @Final protected LevelStorage.Session session;
 
     // kill save on the shutdown
-    @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", ordinal = 0))
-    private boolean getWorldsInjectOne(Iterator<ServerWorld> iterator){
-        if(Client.saveOnQuit){
-            return iterator.hasNext();
-        }
-        while(iterator.hasNext()){
-            iterator.next().savingDisabled = true;
-        }
-        return false;
+    @ModifyConstant(method = "shutdown", constant = @Constant(intValue = 0, ordinal = 0))
+    private int disableWorldSaving(int savingDisabled) {
+        return FastReset.saveOnQuit ? savingDisabled : 1;
     }
 
     @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", ordinal = 1))
-    private boolean getWorldsInjectTwo(Iterator<ServerWorld> iterator){
-        if(Client.saveOnQuit){
+    private boolean closeWorldsRedirect(Iterator<ServerWorld> iterator) {
+        if (FastReset.saveOnQuit) {
             return iterator.hasNext();
         }
 
         new Thread(() -> {
-            synchronized(Client.saveLock){
-                while(iterator.hasNext()){
+            synchronized(FastReset.saveLock) {
+                while(iterator.hasNext()) {
                     ServerWorld world = iterator.next();
                     if (world != null) {
                         try {
                             world.close();
-                        } catch (IOException ignored) {
-
+                        } catch (ConcurrentModificationException | IOException ignored) {
                         }
                     }
                 }
                 try {
                     this.session.deleteSessionLock();
-                } catch (IOException e) {
-                    e.printStackTrace();
+                } catch (IllegalStateException | IOException ignored) {
                 }
             }
         }).start();
         return false;
     }
 
     @Redirect(method = "shutdown", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
-    private void shutdownPlayerSaveInject(PlayerManager playerManager){
-        if(Client.saveOnQuit){
+    private void disablePlayerSaving(PlayerManager playerManager) {
+        if (FastReset.saveOnQuit) {
             playerManager.saveAllPlayerData();
         }
     }
-
-    // kill all things auto save things
-//    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;save(ZZZ)Z"))
-//    private boolean autoSaveInject(MinecraftServer server, boolean a, boolean b, boolean c){
-//        return false;
-//    }
-//
-//    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;saveAllPlayerData()V"))
-//    private void shutdownPlayerDataSaveInject(PlayerManager server){}
 }
diff --git a/src/main/java/fast_reset/client/mixin/ServerChunkManagerMixin.java b/src/main/java/fast_reset/client/mixin/ServerChunkManagerMixin.java
@@ -1,17 +1,17 @@
 package fast_reset.client.mixin;
 
-import fast_reset.client.Client;
+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 abstract class ServerChunkManagerMixin {
+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(Client.saveOnQuit){
+        if (FastReset.saveOnQuit) {
             serverChunkManager.save(flush);
         }
     }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
diff --git a/src/main/resources/fast_reset.mixins.json b/src/main/resources/fast_reset.mixins.json
