Added Microsoft Login Java Checker

gradle.properties

@@ -1,4 +1,9 @@
 org.gradle.jvmargs=-Xmx6g -XX:+UseParallelGC
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.workers.max=12
+org.gradle.configureondemand=true
+org.gradle.caching=true
 
 mod_version=indev
 maven_group=net.aspw

src/main/java/net/aspw/client/Launch.kt

@@ -32,7 +32,7 @@ object Launch {
     // Client information
     const val CLIENT_BEST = "NightX"
     const val CLIENT_FOLDER = "NightX-Client"
-    const val CLIENT_VERSION = "B95"
+    const val CLIENT_VERSION = "B96"
     const val CLIENT_PROTOCOL_RANGE = "1.8 to 24w09a"
     const val CLIENT_CREATOR = "As_pw"
     const val CLIENT_WEBSITE = "https://aspw-w.github.io/AspieAPI/NightX"
@@ -59,6 +59,10 @@ object Launch {
 
     private var lastTick: Long = 0L
 
+    private val allowJavaRange = 181..Int.MAX_VALUE
+    private var javaVersion = System.getProperty("java.version")
+    var useAltManager = javaVersion in "1.8.0_$allowJavaRange" && MinecraftInstance.mc.isJava64bit
+
     // Discord RPC
     lateinit var discordRPC: DiscordRPC
 

src/main/java/net/aspw/client/visual/client/altmanager/menus/GuiAddAccount.kt

@@ -4,6 +4,7 @@ import com.thealtening.AltService.EnumAltService
 import net.aspw.client.Launch
 import net.aspw.client.auth.account.CrackedAccount
 import net.aspw.client.features.module.impl.visual.Interface
+import net.aspw.client.utils.misc.MiscUtils
 import net.aspw.client.utils.render.RenderUtils
 import net.aspw.client.visual.client.altmanager.GuiAltManager
 import net.minecraft.client.gui.GuiButton
@@ -25,7 +26,9 @@ class GuiAddAccount(private val prevGui: GuiAltManager) : GuiScreen() {
         Keyboard.enableRepeatEvents(true)
 
         // Login via Microsoft account
-        buttonList.add(GuiButton(3, width / 2 - 100, 143, "Microsoft Login"))
+        if (Launch.useAltManager)
+            buttonList.add(GuiButton(3, width / 2 - 100, 133, "Microsoft Login"))
+        else buttonList.add(GuiButton(4, width / 2 - 100, 133, "Update Java for Microsoft Login"))
 
         // Add and back button
         buttonList.add(
@@ -57,21 +60,8 @@ class GuiAddAccount(private val prevGui: GuiAltManager) : GuiScreen() {
             34,
             0xffffff
         )
-        this.drawCenteredString(
-            mc.fontRendererObj, "Requires 64 bit java version 181 or higher to login microsoft account",
-            width / 2,
-            118,
-            0xffffff
-        )
-        this.drawCenteredString(
-            mc.fontRendererObj, "64 bit java: " + if (mc.isJava64bit) "§etrue" else "§cfalse",
-            width / 2,
-            128,
-            0xffffff
-        )
         this.drawCenteredString(mc.fontRendererObj, status, width / 2, height - 74, 0xffffff)
         username.drawTextBox()
-
         if (username.text.isEmpty() && !username.isFocused) {
             this.drawCenteredString(
                 mc.fontRendererObj, "§7Username (Cracked)",
@@ -92,11 +82,11 @@ class GuiAddAccount(private val prevGui: GuiAltManager) : GuiScreen() {
         when (button.id) {
             0 -> mc.displayGuiScreen(prevGui)
 
-            1 -> {
-                checkAndAddAccount(username.text, account = CrackedAccount())
-            }
+            1 -> checkAndAddAccount(username.text, account = CrackedAccount())
 
             3 -> mc.displayGuiScreen(GuiMicrosoftLogin(this))
+
+            4 -> MiscUtils.showURL("https://www.oracle.com/jp/java/technologies/javase/javase8-archive-downloads.html")
         }
     }