Bump version to 1.0.0-beta4, enhance Optifine detection, and update installation guide

KdGaming0 · KdGaming0 · commit 6a3ed1ead920 · 2025-01-29T08:00:17.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -41,8 +41,6 @@ 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")
         }
     }
@@ -135,9 +133,6 @@ 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"
         }
diff --git a/gradle.properties b/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-beta2
+version = 1.0.0-beta4
diff --git a/src/main/java/com/github/kdgaming0/packcore/copysystem/ZipSelectionDialog.java b/src/main/java/com/github/kdgaming0/packcore/copysystem/ZipSelectionDialog.java
@@ -78,7 +78,7 @@ private void initializeUI() {
         JLabel introLabel = new JLabel("<html><body style='width:450px;'>"
                 + "<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>Normal (1080p / 1440p):</i></b> Recommended for most players. This option has more features enabled by default, offering a rich and complex experience.<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>"
diff --git a/src/main/java/com/github/kdgaming0/packcore/screen/OptifineGuide.kt b/src/main/java/com/github/kdgaming0/packcore/screen/OptifineGuide.kt
@@ -112,15 +112,20 @@ class OptifineGuide : UIContainer() {
 
         val guideInstructionsText = MarkdownComponent(
             """
-    ## Optifine install guide
+    ### Optifine install guide
+    PackCore have detected that you don't have Optifine installed. (If this is wrong please ignore this message)
+    Optifine is a mod that can help you get better performance in Minecraft. It is recommended to install it. (Because of licensing issues can I not include it in the modpack)
+    
     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.
+    4. Open the installation folder.
+        - It should be 3 dots on the right side of the installation close to the play button.
         - 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.
+    7. Close the game and reopen it.
+    8. Have fun with better performance.
     """.trimIndent()
         ).constrain {
             x = CenterConstraint()
diff --git a/src/main/java/com/github/kdgaming0/packcore/screen/SEMainMenu.kt b/src/main/java/com/github/kdgaming0/packcore/screen/SEMainMenu.kt
@@ -34,6 +34,15 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
     private var optifineWindowOpen = false
     private var optifineGuide: OptifineGuide? = null
 
+    private fun isOptiFineInstalled(): Boolean {
+        return try {
+            Class.forName("optifine.OptiFineClassTransformer")
+            true
+        } catch (e: ClassNotFoundException) {
+            false
+        }
+    }
+
     init {
         // Set the background image
         val background = UIPanorama().constrain {
@@ -67,7 +76,7 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
 
         val buttonContainer2 = UIContainer().constrain {
             x = CenterConstraint()
-            y = 60.pixels()
+            y = 65.pixels()
             width = ChildBasedMaxSizeConstraint()
             height = 100.percent()
         } childOf buttonBackgroundEffect
@@ -95,7 +104,7 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
             UMinecraft.getMinecraft().displayGuiScreen(GuiOptions(this, UMinecraft.getMinecraft().gameSettings))
         } childOf buttonContainer3
 
-        CreateMenuButton("Mod Options") {
+        CreateMenuButton("PackCore Options") {
             UScreen.displayScreen(ConfigGui())
         } childOf buttonContainer3
 
@@ -195,7 +204,7 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
             y = CenterConstraint()
         } childOf labeBox
 
-        if (!Loader.isModLoaded("optifine")) {
+        if (!isOptiFineInstalled()) {
             CreateMenuButtonInfo("Optifine Guide") {
                 if (!optifineWindowOpen) {
                     optifineWindowOpen = true
@@ -361,7 +370,7 @@ class SEMainMenu : WindowScreen(ElementaVersion.V7) {
 
     override fun afterInitialization() {
         // Only show if Optifine is not loaded AND the guide is enabled in config
-        if (!Loader.isModLoaded("optifine") &&
+        if (!isOptiFineInstalled() &&
             ModConfig.getShowOptifineGuide() &&
             !optifineWindowOpen &&
             optifineGuide == null) {
diff --git a/src/main/java/com/github/kdgaming0/packcore/tweaker/PackConfigTweaker.java b/src/main/java/com/github/kdgaming0/packcore/tweaker/PackConfigTweaker.java
@@ -5,6 +5,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -37,6 +38,10 @@ public void acceptOptions(List<String> args, File gameDir, File assetsDir, Strin
 
     @Override
     public void injectIntoClassLoader(LaunchClassLoader classLoader) {
+        @SuppressWarnings("unchecked")
+        List<String> tweakClasses = (List<String>) Launch.blackboard.get("TweakClasses");
+        tweakClasses.add("org.spongepowered.asm.launch.MixinTweaker");
+
         loadConfig();
 
         // Check if PromptSetDefaultConfig is true

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ loom {`
`41`	`41`	`log4jConfigs.from(file("log4j2.xml"))`
`42`	`42`	`launchConfigs {`
`43`	`43`	`"client" {`
`44`		`- property("mixin.debug", "true")`
`45`		`- arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")`
`46`	`44`	`arg("--tweakClass", "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker")`
`47`	`45`	`}`
`48`	`46`	`}`
`@@ -135,9 +133,6 @@ tasks.withType<org.gradle.jvm.tasks.Jar> {`
`135`	`133`	`this["FMLCorePluginContainsFMLMod"] = "true"`
`136`	`134`	`this["ForceLoadAsMod"] = "true"`
`137`	`135`	`this["TweakClass"] = "com.github.kdgaming0.packcore.tweaker.PackConfigTweaker"`
`138`		`- // If you don't want mixins, remove these lines:`
`139`		`- this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"`
`140`		`- this["MixinConfigs"] = "mixins.$modid.json"`
`141`	`136`	`if (transformerFile.exists()) {`
`142`	`137`	`this["FMLAT"] = "${modid}_at.cfg"`
`143`	`138`	`}`