Auto-confirm future FML queries for this world after first confirmation

Author: quentin452

src/main/java/fr/iamacat/optimizationsandtweaks/OptimizationsAndTweaks.java

@@ -12,6 +12,7 @@
 import fr.iamacat.optimizationsandtweaks.config.OptimizationsandTweaksConfig;
 import fr.iamacat.optimizationsandtweaks.eventshandler.EntityItemSpawningEventHandler;
 import fr.iamacat.optimizationsandtweaks.eventshandler.TidyChunkBackportEventHandler;
+import fr.iamacat.optimizationsandtweaks.eventshandler.WorldUnloadEventHandler;
 import fr.iamacat.optimizationsandtweaks.proxy.CommonProxy;
 import fr.iamacat.optimizationsandtweaks.utilsformods.experienceore.ExperienceOreConfig;
 import fr.iamacat.optimizationsandtweaks.utilsformods.mythandmonsters.recurrentcomplextrewrite.FileInjector;
@@ -57,6 +58,10 @@ public void init(FMLInitializationEvent event) {
             EntityItemSpawningEventHandler eventHandler = new EntityItemSpawningEventHandler();
             MinecraftForge.EVENT_BUS.register(eventHandler);
         }
+        if (OptimizationsandTweaksConfig.enableFMLAutoConfirmAfterFirstConfirmation) {
+            WorldUnloadEventHandler worldUnloadHandler = new WorldUnloadEventHandler();
+            MinecraftForge.EVENT_BUS.register(worldUnloadHandler);
+        }
         MinecraftForge.EVENT_BUS.register(proxy);
     }
 

src/main/java/fr/iamacat/optimizationsandtweaks/asm/Mixin.java

@@ -76,6 +76,8 @@ public enum Mixin implements IMixin {
         "core.MixinFMLClientHandler"),
     common_core_MixinFMLServerHandler(Side.COMMON, m -> OptimizationsandTweaksConfig.enableMixinFMLServerHandler,
         "core.MixinFMLServerHandler"),
+    common_core_MixinStartupQuery(Side.COMMON, m -> OptimizationsandTweaksConfig.enableFMLAutoConfirmAfterFirstConfirmation,
+        "core.MixinStartupQuery"),
     /*
      * todo need to fix was loaded to early crash
      * common_core_MixinLoader(Side.COMMON, m ->

src/main/java/fr/iamacat/optimizationsandtweaks/config/OptimizationsandTweaksConfig.java

@@ -227,6 +227,10 @@ public class OptimizationsandTweaksConfig {
     @Config.DefaultBoolean(true)
     @Config.RequiresWorldRestart
     public static boolean enableMixinFMLServerHandler;
+    @Config.Comment("Auto-confirm future FML queries after first confirmation")
+    @Config.DefaultBoolean(true)
+    @Config.RequiresWorldRestart
+    public static boolean enableFMLAutoConfirmAfterFirstConfirmation;
     /*
      * todo need to fix was loaded to early crash
      * @Config.Comment("Optimize Loader")

src/main/java/fr/iamacat/optimizationsandtweaks/eventshandler/WorldUnloadEventHandler.java

@@ -0,0 +1,13 @@
+package fr.iamacat.optimizationsandtweaks.eventshandler;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import fr.iamacat.optimizationsandtweaks.utils.optimizationsandtweaks.vanilla.StartupQueryState;
+
+public class WorldUnloadEventHandler {
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        StartupQueryState.resetConfirmation();
+    }
+}

src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/core/MixinFMLServerHandler.java

@@ -12,21 +12,43 @@
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.IFMLSidedHandler;
 import cpw.mods.fml.common.StartupQuery;
 import cpw.mods.fml.common.functions.GenericIterableFactory;
 import cpw.mods.fml.server.FMLServerHandler;
 
+import fr.iamacat.optimizationsandtweaks.config.OptimizationsandTweaksConfig;
+
 @Mixin(FMLServerHandler.class)
 public abstract class MixinFMLServerHandler implements IFMLSidedHandler {
 
     @Shadow
     private MinecraftServer server;
+    
+    @Unique
+    private MinecraftServer lastServer;
+
+    @Unique
+    private static boolean hasConfirmedOnce = false;
 
     @Override
     public void queryUser(StartupQuery query) throws InterruptedException {
+        if (OptimizationsandTweaksConfig.enableFMLAutoConfirmAfterFirstConfirmation) {
+            if (server != lastServer) {
+                // reset confirmation when new world/server
+                hasConfirmedOnce = false;
+                lastServer = server;
+            }
+            if (hasConfirmedOnce) {
+                FMLLog.info("Auto-confirming query due to previous confirmation.");
+                query.setResult(true);
+                query.finish();
+                return;
+            }
+        }
         if (query.getResult() == null) {
             FMLLog.warning("%s", query.getText());
             query.finish();
@@ -61,6 +83,9 @@ public void queryUser(StartupQuery query) throws InterruptedException {
                                     query.setResult(true);
                                     done.set(true);
                                     it.remove();
+                                    if (OptimizationsandTweaksConfig.enableFMLAutoConfirmAfterFirstConfirmation) {   
+                                        hasConfirmedOnce = true;
+                                    }
                                     break;
                                 case "/fml cancel":
                                     FMLLog.info("cancelled");
@@ -92,4 +117,4 @@ public void queryUser(StartupQuery query) throws InterruptedException {
             query.finish();
         }
     }
-}
+}

src/main/java/fr/iamacat/optimizationsandtweaks/mixins/common/core/MixinStartupQuery.java

@@ -0,0 +1,32 @@
+package fr.iamacat.optimizationsandtweaks.mixins.common.core;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.StartupQuery;
+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.CallbackInfoReturnable;
+
+import fr.iamacat.optimizationsandtweaks.utils.optimizationsandtweaks.vanilla.StartupQueryState;
+
+@Mixin(StartupQuery.class)
+public class MixinStartupQuery {
+
+    @Inject(method = "confirm", at = @At("HEAD"), cancellable = true, remap = false)
+    private static void optimizationsAndTweaks$handleAutoConfirm(String text, CallbackInfoReturnable<Boolean> cir) {
+        if (StartupQueryState.hasConfirmedOnce() && StartupQueryState.isWorldRepairQuery(text)) {
+            FMLLog.info("[Optimizations] Auto-confirming world repair query due to previous confirmation.");
+            cir.setReturnValue(true);
+            return;
+        }
+        
+        StartupQueryState.updateLastQueryText(text);
+    }
+
+    @Inject(method = "confirm", at = @At("RETURN"), remap = false)
+    private static void optimizationsAndTweaks$trackConfirmation(String text, CallbackInfoReturnable<Boolean> cir) {
+        if (cir.getReturnValue() != null && cir.getReturnValue() && StartupQueryState.isWorldRepairQuery(text)) {
+            StartupQueryState.markConfirmedOnce();
+        }
+    }
+}

src/main/java/fr/iamacat/optimizationsandtweaks/utils/optimizationsandtweaks/vanilla/StartupQueryState.java

@@ -0,0 +1,43 @@
+package fr.iamacat.optimizationsandtweaks.utils.optimizationsandtweaks.vanilla;
+
+import cpw.mods.fml.common.FMLLog;
+
+public final class StartupQueryState {
+
+    private static boolean hasConfirmedOnce = false;
+    private static String lastQueryText = "";
+
+    private StartupQueryState() {
+    }
+
+    public static boolean hasConfirmedOnce() {
+        return hasConfirmedOnce;
+    }
+
+    public static void markConfirmedOnce() {
+        hasConfirmedOnce = true;
+    }
+
+    public static void updateLastQueryText(String text) {
+        lastQueryText = text != null ? text : "";
+    }
+
+    public static boolean isWorldRepairQuery(String text) {
+        if (text == null || text.isEmpty()) return false;
+
+        return text.contains("save is damaged") ||
+               text.contains("automatic repair") ||
+               text.contains("world backup") ||
+               text.contains("items need to be removed") ||
+               text.contains("items need to be relocated") ||
+               text.contains("mods are missing") ||
+               text.contains("Missing mods") ||
+               text.contains("Forge Mod Loader detected");
+    }
+
+    public static void resetConfirmation() {
+        hasConfirmedOnce = false;
+        lastQueryText = "";
+        FMLLog.info("[Optimizations] Reset world repair auto-confirmation state.");
+    }
+}