Update version to 1.0.0-beta2 and enhance main menu with new buttons and Optifine guide

Author: KdGaming0

build.gradle.kts

@@ -20,6 +20,13 @@ val mcVersion: String by project
 val version: String by project
 val modid: String by project
 
+// You can adjust these to the proper versions you want to use.
+val elementaVersion = "2.0.0"            // Replace with latest Elementa version if desired
+val ucVersion = "1.0.3"                 // Replace with latest UniversalCraft version if desired
+
+val mixinGroup = "$baseGroup.mixin"
+val transformerFile = file("src/main/resources/accesstransformer.cfg")
+
 // -------------------------------------------------------------------------------------------------
 // Toolchains
 // -------------------------------------------------------------------------------------------------
@@ -34,6 +41,8 @@ loom {
     log4jConfigs.from(file("log4j2.xml"))
     launchConfigs {
         "client" {
+            property("mixin.debug", "true")
+            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
             arg("--tweakClass", "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker")
         }
     }
@@ -48,6 +57,14 @@ loom {
     }
     forge {
         pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
+        mixinConfig("mixins.$modid.json")
+        if (transformerFile.exists()) {
+            println("Installing access transformer")
+            accessTransformer(transformerFile)
+        }
+    }
+    mixin {
+        defaultRefmapName.set("mixins.$modid.refmap.json")
     }
 }
 
@@ -65,7 +82,7 @@ repositories {
     // DevAuth repository (if you need it for debugging/logging in with alt)
     maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
     // Essential's public Maven for Elementa
-    maven(url = "https://repo.essential.gg/repository/maven-public")
+    maven("https://repo.essential.gg/repository/maven-public")
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -84,6 +101,12 @@ dependencies {
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
     forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
 
+    // Sponge Mixin library (if you're using mixins)
+    shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+        isTransitive = false
+    }
+    annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
+
     // Add DevAuth for debugging if desired
     runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.2.1")
 
@@ -112,6 +135,12 @@ tasks.withType<org.gradle.jvm.tasks.Jar> {
         this["FMLCorePluginContainsFMLMod"] = "true"
         this["ForceLoadAsMod"] = "true"
         this["TweakClass"] = "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker"
+        // 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-beta1
+version = 1.0.0-beta2

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

@@ -79,9 +79,10 @@ private void initializeUI() {
                 + "<h2>Welcome to Skyblock Enhanced!</h2>"
                 + "Before playing, please select the ready-to-use zip file that best matches your needs for the best experience:<br><br>"
                 + "<b><i>Normal (1080p / 1440p):</i></b> Recommended for most players. This option has more features enabled by default, offering a rich and complex experience. However, new players may find it overwhelming at first due to the amount of on-screen information when joining Skyblock for the first time with mods.<br>"
-                + "<b><i>Lite (1080p / 1440p):</i></b> Designed for complete beginners, with fewer features enabled to simplify the experience. This is a great starting point to get familiar with the mod features. As you gain experience, you can enable additional features to create your perfect setup.<br><br>"
-                + "Custom configurations you’ve added will also appear here. (You can create them in-game via <i>/packcore</i> or the <i>packcore</i> button in the ESC menu.)<br><br>"
+                + "<b><i>Lite (3-5 Business Days) (1080p / 1440p):</i></b> Designed for complete beginners, with fewer features enabled to simplify the experience. This is a great starting point to get familiar with the mod features. As you gain experience, you can enable additional features to create your perfect setup.<br><br>"
+                + "Custom configurations you’ve added will also appear here. (You can create them in-game via <i>/packcore</i> or the <i>Config Management</i> button on the main menu.)<br><br>"
                 + "If you skip this step, mods will use their default settings, as if downloaded individually and clicked play. This will cause many features to be disabled and have overlapping GUI elements. (I can't promise there won't be any overlapping with the ready-to-use configs but there will be less.)<br><br>"
+                + "<b>If you are updating from a <i>pre-2.0</i> version of <b>Skyblock Enhanced</b> and don't want to reset the configs, click <b><i>Skip</i></b>.</b><br><br>"
                 + "Click <b><i>Extract</i></b> to apply your chosen configuration or <b><i>Skip</i></b> to launch Minecraft with default mod settings."
                 + "</body></html>"
         );

src/main/java/com/github/kdgaming0/packcore/init/AutoDiscoveryMixinPlugin.java

@@ -0,0 +1,188 @@
+package com.github.kdgaming0.packcore.init;
+
+import org.spongepowered.asm.lib.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ * A mixin plugin to automatically discover all mixins in the current JAR.
+ * <p>
+ * This mixin plugin automatically scans your entire JAR (or class directory, in case of an in-IDE launch) for classes inside of your
+ * mixin package and registers those. It does this recursively for sub packages of the mixin package as well. This means you will need
+ * to only have mixin classes inside of your mixin package, which is good style anyway.
+ *
+ * @author Linnea Gräf
+ */
+public class AutoDiscoveryMixinPlugin implements IMixinConfigPlugin {
+    private static final List<AutoDiscoveryMixinPlugin> mixinPlugins = new ArrayList<>();
+
+    public static List<AutoDiscoveryMixinPlugin> getMixinPlugins() {
+        return mixinPlugins;
+    }
+
+    private String mixinPackage;
+
+    @Override
+    public void onLoad(String mixinPackage) {
+        this.mixinPackage = mixinPackage;
+        mixinPlugins.add(this);
+    }
+
+    /**
+     * Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root.
+     * In either case the return value of this + the class name will resolve back to the original class url, or to other
+     * class urls for other classes.
+     */
+    public URL getBaseUrlForClassUrl(URL classUrl) {
+        String string = classUrl.toString();
+        if (classUrl.getProtocol().equals("jar")) {
+            try {
+                return new URL(string.substring(4).split("!")[0]);
+            } catch (MalformedURLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        if (string.endsWith(".class")) {
+            try {
+                return new URL(string.replace("\\", "/")
+                        .replace(getClass().getCanonicalName()
+                                .replace(".", "/") + ".class", ""));
+            } catch (MalformedURLException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return classUrl;
+    }
+
+    /**
+     * Get the package that contains all the mixins. This value is set by mixin itself using {@link #onLoad}.
+     */
+    public String getMixinPackage() {
+        return mixinPackage;
+    }
+
+    /**
+     * Get the path inside the class root to the mixin package
+     */
+    public String getMixinBaseDir() {
+        return mixinPackage.replace(".", "/");
+    }
+
+    /**
+     * A list of all discovered mixins.
+     */
+    private List<String> mixins = null;
+
+    /**
+     * Try to add mixin class ot the mixins based on the filepath inside of the class root.
+     * Removes the {@code .class} file suffix, as well as the base mixin package.
+     * <p><b>This method cannot be called after mixin initialization.</p>
+     *
+     * @param className the name or path of a class to be registered as a mixin.
+     */
+    public void tryAddMixinClass(String className) {
+        String norm = (className.endsWith(".class") ? className.substring(0, className.length() - ".class".length()) : className)
+                .replace("\\", "/")
+                .replace("/", ".");
+        if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".")) {
+            mixins.add(norm.substring(getMixinPackage().length() + 1));
+        }
+    }
+
+    /**
+     * Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()}
+     */
+    @Override
+    public List<String> getMixins() {
+        if (mixins != null) return mixins;
+        System.out.println("Trying to discover mixins");
+        mixins = new ArrayList<>();
+        URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation();
+        System.out.println("Found classes at " + classUrl);
+        Path file;
+        try {
+            file = Paths.get(getBaseUrlForClassUrl(classUrl).toURI());
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+        System.out.println("Base directory found at " + file);
+        if (Files.isDirectory(file)) {
+            walkDir(file);
+        } else {
+            walkJar(file);
+        }
+        System.out.println("Found mixins: " + mixins);
+
+        return mixins;
+    }
+
+    /**
+     * Search through directory for mixin classes based on {@link #getMixinBaseDir}.
+     *
+     * @param classRoot The root directory in which classes are stored for the default package.
+     */
+    private void walkDir(Path classRoot) {
+        System.out.println("Trying to find mixins from directory");
+        try (Stream<Path> classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) {
+            classes.map(it -> classRoot.relativize(it).toString())
+                    .forEach(this::tryAddMixinClass);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Read through a JAR file, trying to find all mixins inside.
+     */
+    private void walkJar(Path file) {
+        System.out.println("Trying to find mixins from jar file");
+        try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) {
+            ZipEntry next;
+            while ((next = zis.getNextEntry()) != null) {
+                tryAddMixinClass(next.getName());
+                zis.closeEntry();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+    }
+
+    @Override
+    public String getRefMapperConfig() {
+        return null;
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        return true;
+    }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+    }
+}

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

@@ -112,21 +112,16 @@ class OptifineGuide : UIContainer() {
 
         val guideInstructionsText = MarkdownComponent(
             """
-            ## Optifine install guide
-            1. Download Optifine from [here](https://optifine.net/downloads)
-            2. Open the downloaded file
-            3. Click install
-            4. Open the Minecraft launcher
-            5. Click the installations tab
-            6. Click the new installation button
-            7. Name the installation
-            8. Select the version you installed Optifine for
-            9. Click create
-            10. Select the new installation
-            11. Click play
-            12. Enjoy Optifine!
-            13. If you have any issues, please contact support
-            """.trimIndent()
+    ## Optifine install guide
+    1. Go to the Optfine website and download Optifine for 1.8.9. [Direct link to The download.](https://optifine.net/adloadx?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar)
+    2. When you have downloaded find it in the Download folder in the File Explorer.
+    3. Open the Modrinth app and locate the SkyBlock Enhanced installation.
+        - It should be 3 dots on the right side of the installation.
+        - Click on the 3 dots and then click on Open Folder.
+    5. Then locate the mods folder and open it.
+    6. When opened copy the Optifine file over from the Download folder and into the mods folder that you just opened.
+    7. Click play and have fun.
+    """.trimIndent()
         ).constrain {
             x = CenterConstraint()
             width = 100.percent() - 10.pixels()