Bump version to 1.0.0-beta6, improve config start dialog system

Author: KdGaming0

build.gradle.kts

@@ -41,7 +41,8 @@ loom {
     log4jConfigs.from(file("log4j2.xml"))
     launchConfigs {
         "client" {
-            arg("--tweakClass", "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker")
+            property("mixin.debug", "true")
+            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
         }
     }
     runConfigs {
@@ -132,10 +133,12 @@ tasks.withType<org.gradle.jvm.tasks.Jar> {
     manifest.attributes.run {
         this["FMLCorePluginContainsFMLMod"] = "true"
         this["ForceLoadAsMod"] = "true"
-        this["TweakClass"] = "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker"
-        if (transformerFile.exists()) {
-            this["FMLAT"] = "${modid}_at.cfg"
-        }
+        // If you don't want mixins, remove these lines:
+        this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
+        this["MixinConfigs"] = "mixins.$modid.json"
+            if (transformerFile.exists())
+                this["FMLAT"] = "${modid}_at.cfg"
+
     }
 }
 

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.kdgaming0.packcore
 mcVersion = 1.8.9
 modid = packcore
-version = 1.0.0-beta4
+version = 1.0.0-beta6

src/main/java/com/github/kdgaming0/packcore/PackCore.java

@@ -4,6 +4,7 @@
 import com.github.kdgaming0.packcore.screen.SEMainMenu;
 import com.github.kdgaming0.packcore.utils.ModpackInfo;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.common.MinecraftForge;
@@ -12,6 +13,7 @@
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.client.event.GuiOpenEvent;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
@@ -33,10 +35,19 @@ public void init(FMLInitializationEvent event) {
 
     @SubscribeEvent
     public void onGuiOpen(GuiOpenEvent event) {
-        // Check if the GUI being opened is the main menu
+        // Check config setting first
+        if (!ModConfig.getEnableCustomMenu()) {
+            return;
+        }
+
         if (event.gui instanceof GuiMainMenu) {
-            // Replace it with your custom menu
-            event.gui = new SEMainMenu();
+            if (!event.isCanceled()) {
+                event.setCanceled(true);
+                Minecraft.getMinecraft().displayGuiScreen(new SEMainMenu());
+                LOGGER.info("PackCore: Loading custom main menu");
+            } else {
+                LOGGER.info("PackCore: Another mod has already modified the main menu");
+            }
         }
     }
 }

src/main/java/com/github/kdgaming0/packcore/config/ModConfig.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.common.Loader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -17,7 +18,7 @@
 public class ModConfig {
     private static final Logger LOGGER = LogManager.getLogger(MOD_ID);
     private static final String CONFIG_FILENAME = "PackCore.json";
-    private static final File CONFIG_FILE = new File(Loader.instance().getConfigDir(), CONFIG_FILENAME);
+    private static final File CONFIG_FILE = new File(new File(Minecraft.getMinecraft().mcDataDir, "config"), CONFIG_FILENAME);
     private static JsonObject configData;
     private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
@@ -28,19 +29,42 @@ public static void loadConfig() {
 
         try (FileReader reader = new FileReader(CONFIG_FILE)) {
             configData = gson.fromJson(reader, JsonObject.class);
+            updateConfigWithDefaults();
         } catch (IOException e) {
             LOGGER.error("Failed to load config file: " + CONFIG_FILE.getAbsolutePath(), e);
             // Create default config if reading fails
             createDefaultConfig();
         }
     }
 
+    private static void updateConfigWithDefaults() {
+        boolean updated = false;
+
+        if (!configData.has("PromptSetDefaultConfig")) {
+            configData.addProperty("PromptSetDefaultConfig", true);
+            updated = true;
+        }
+        if (!configData.has("ShowOptifineGuide")) {
+            configData.addProperty("ShowOptifineGuide", true);
+            updated = true;
+        }
+        if (!configData.has("EnableCustomMenu")) {
+            configData.addProperty("EnableCustomMenu", true);
+            updated = true;
+        }
+
+        if (updated) {
+            saveConfig();
+        }
+    }
+
     private static void createDefaultConfig() {
         JsonObject defaultConfig = new JsonObject();
 
         // Add your config values here
         defaultConfig.addProperty("PromptSetDefaultConfig", true);
         defaultConfig.addProperty("ShowOptifineGuide", true);
+        defaultConfig.addProperty("EnableCustomMenu", true);
 
         configData = defaultConfig; // Set the default config as current
         saveConfig(); // Save to file
@@ -57,6 +81,11 @@ public static boolean getShowOptifineGuide() {
         return configData.get("ShowOptifineGuide").getAsBoolean();
     }
 
+    public static boolean getEnableCustomMenu() {
+        if (configData == null) loadConfig();
+        return configData.get("EnableCustomMenu").getAsBoolean();
+    }
+
     // Setter methods
     public static void setPromptSetDefaultConfig(boolean value) {
         if (configData == null) loadConfig();
@@ -70,6 +99,12 @@ public static void setShowOptifineGuide(boolean value) {
         saveConfig();
     }
 
+    public static void setEnableCustomMenu(boolean value) {
+        if (configData == null) loadConfig();
+        configData.addProperty("EnableCustomMenu", value);
+        saveConfig();
+    }
+
     // Save config to file
     public static void saveConfig() {
         try (FileWriter writer = new FileWriter(CONFIG_FILE)) {

src/main/java/com/github/kdgaming0/packcore/copysystem/ZipSelectionDialog.java

@@ -1,5 +1,6 @@
 package com.github.kdgaming0.packcore.copysystem;
 
+import com.github.kdgaming0.packcore.config.ModConfig;
 import com.github.kdgaming0.packcore.copysystem.utils.ExtractionProgressListener;
 
 import javax.swing.JButton;
@@ -154,6 +155,7 @@ public void actionPerformed(ActionEvent e) {
             @Override
             public void actionPerformed(ActionEvent e) {
                 userFinished = true;
+                ModConfig.setPromptSetDefaultConfig(false); // Disable prompt for next time
                 dispose();
                 System.exit(0); // Exits the game
             }
@@ -274,7 +276,7 @@ protected void done() {
                     } else {
                         JOptionPane.showMessageDialog(
                                 ZipSelectionDialog.this,
-                                "Extraction of \"" + finalSelectedZip + "\" encountered an error.",
+                                "Extraction of \"" + finalSelectedZip + "\" encountered an error. Report this to the mod author.",
                                 "Error",
                                 JOptionPane.ERROR_MESSAGE
                         );
@@ -285,6 +287,7 @@ protected void done() {
                     progressBar.setValue(0);
 
                     userFinished = true;
+                    ModConfig.setPromptSetDefaultConfig(false); // Disable prompt for next time
                     dispose(); // Close dialog to continue Minecraft startup
                 }
             };

src/main/java/com/github/kdgaming0/packcore/mixin/PackCoreShowConfigMixin.java

@@ -0,0 +1,34 @@
+package com.github.kdgaming0.packcore.mixin;
+
+import com.github.kdgaming0.packcore.config.ModConfig;
+import com.github.kdgaming0.packcore.copysystem.ZipSelectionDialog;
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.io.File;
+
+@Mixin(Minecraft.class)
+public class PackCoreShowConfigMixin {
+
+    @Inject(method = "startGame", at = @At("HEAD"))
+    private void onGameStart(CallbackInfo ci) {
+        // Get Minecraft instance and game directory
+        Minecraft mc = (Minecraft)(Object)this;
+        File gameDir = mc.mcDataDir;
+
+        // Load and check config
+        if (packCore$shouldShowDialog()) {
+            // Show the ZIP selection dialog
+            ZipSelectionDialog.showDialog(gameDir);
+        }
+    }
+
+    @Unique
+    private boolean packCore$shouldShowDialog() {
+        return ModConfig.getPromptSetDefaultConfig();
+    }
+}

src/main/java/com/github/kdgaming0/packcore/screen/ConfigGui.kt

@@ -171,6 +171,15 @@ class ConfigGui : WindowScreen(ElementaVersion.V7) {
             ModConfig.setShowOptifineGuide(newValue)
         }
 
+        createToggleSetting(
+            innerContainer,
+            "Enable Custom Main Menu",
+            "Use a custom main menu with a skyblock-themed background. This provides a fuller Skyblock Enhanced experience. Recommended",
+            ModConfig.getEnableCustomMenu()
+        ) { newValue ->
+            ModConfig.setEnableCustomMenu(newValue)
+        }
+
         // Save & Close button
         UIRoundedRectangle(4f).constrain {
             x = CenterConstraint()

src/main/java/com/github/kdgaming0/packcore/screen/SEMainMenu.kt

@@ -76,7 +76,7 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
 
         val buttonContainer2 = UIContainer().constrain {
             x = CenterConstraint()
-            y = 65.pixels()
+            y = 70.pixels()
             width = ChildBasedMaxSizeConstraint()
             height = 100.percent()
         } childOf buttonBackgroundEffect