mirror of
https://gitlab.com/2009scape/09launcher.git
synced 2025-12-09 16:45:54 -07:00
Fix default server mode, add incorrect java version warning
This commit is contained in:
ceikry
parent
c5caec90f3
commit
dfbe3414a1
3 changed files with 106 additions and 2 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
import com.sun.java.accessibility.util.AWTEventMonitor
|
import com.sun.java.accessibility.util.AWTEventMonitor
|
||||||
|
import jvmwarn.JVMVersionWarning
|
||||||
import launcherupdate.LauncherUpdateNotification
|
import launcherupdate.LauncherUpdateNotification
|
||||||
import settingseditor.Json
|
import settingseditor.Json
|
||||||
import settingseditor.SettingsWindow
|
import settingseditor.SettingsWindow
|
||||||
|
|
@ -229,12 +230,18 @@ object MainWindow : JFrame("2009scape Launcher") {
|
||||||
Json.parse()
|
Json.parse()
|
||||||
val t = Thread {
|
val t = Thread {
|
||||||
if(Settings.CHECK_FOR_UPDATES) {
|
if(Settings.CHECK_FOR_UPDATES) {
|
||||||
|
val javaVersion = System.getProperty("java.specification.version")
|
||||||
|
if (!javaVersion.startsWith("1.8") && !javaVersion.startsWith("11"))
|
||||||
|
{
|
||||||
|
JVMVersionWarning.open()
|
||||||
|
return@Thread
|
||||||
|
}
|
||||||
Updater.checkLauncherUpdate()
|
Updater.checkLauncherUpdate()
|
||||||
while (Updater.launcherStatus == Updater.UpdateStatus.CHECKING) {
|
while (Updater.launcherStatus == Updater.UpdateStatus.CHECKING) {
|
||||||
Thread.sleep(100L)
|
Thread.sleep(100L)
|
||||||
}
|
}
|
||||||
if (Updater.launcherLocalMD5 != Updater.launcherRemoteMD5) {
|
if (Updater.launcherLocalMD5 != Updater.launcherRemoteMD5) {
|
||||||
System.out.println("Trying to open")
|
println("Trying to open")
|
||||||
LauncherUpdateNotification.open()
|
LauncherUpdateNotification.open()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
96
src/main/kotlin/jvmwarn/JVMVersionWarning.kt
Normal file
96
src/main/kotlin/jvmwarn/JVMVersionWarning.kt
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
package jvmwarn
|
||||||
|
|
||||||
|
import Checkbox
|
||||||
|
import ImgButton
|
||||||
|
import settingseditor.Json
|
||||||
|
import java.awt.*
|
||||||
|
import java.net.URI
|
||||||
|
import javax.swing.JFrame
|
||||||
|
import javax.swing.JLabel
|
||||||
|
import javax.swing.JPanel
|
||||||
|
import javax.swing.JSeparator
|
||||||
|
import kotlin.system.exitProcess
|
||||||
|
|
||||||
|
object JVMVersionWarning : JFrame() {
|
||||||
|
init {
|
||||||
|
isUndecorated = true
|
||||||
|
isVisible = false
|
||||||
|
isResizable = false
|
||||||
|
defaultCloseOperation = HIDE_ON_CLOSE
|
||||||
|
isAutoRequestFocus = true
|
||||||
|
isAlwaysOnTop = true
|
||||||
|
preferredSize = Dimension(250,150)
|
||||||
|
size = Dimension(250,150)
|
||||||
|
layout = BorderLayout()
|
||||||
|
setLocationRelativeTo(null)
|
||||||
|
|
||||||
|
val textArea = getDarkPanel(BorderLayout())
|
||||||
|
val label = getLabel("<html><div style='text-align: center;'><br/>Unsupported Java version!<br/>Requires: Java 8 or 11.<br/><br/>Would you like to be taken to the download page for OpenJDK 11?</div></html>")
|
||||||
|
textArea.add(label, BorderLayout.NORTH)
|
||||||
|
add(textArea, BorderLayout.CENTER)
|
||||||
|
|
||||||
|
|
||||||
|
val buttons = getThemedPanel(BorderLayout())
|
||||||
|
val yesButton = ImgButton("/save_hi.png")
|
||||||
|
yesButton.onClick {
|
||||||
|
val osName = System.getProperty("os.name").toLowerCase()
|
||||||
|
val url = if(osName.contains("win"))
|
||||||
|
{
|
||||||
|
"https://api.adoptium.net/v3/installer/latest/11/ga/windows/x64/jre/hotspot/normal/eclipse?project=jdk"
|
||||||
|
}
|
||||||
|
else if(osName.contains("lin"))
|
||||||
|
{
|
||||||
|
"https://api.adoptium.net/v3/binary/latest/11/ga/linux/x64/jre/hotspot/normal/eclipse?project=jdk"
|
||||||
|
}
|
||||||
|
else "https://adoptium.net/temurin/releases"
|
||||||
|
|
||||||
|
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
|
||||||
|
Desktop.getDesktop().browse(URI(url));
|
||||||
|
}
|
||||||
|
|
||||||
|
exitProcess(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
val noButton = ImgButton("/update_no.png")
|
||||||
|
noButton.onClick {
|
||||||
|
isVisible = false
|
||||||
|
MainWindow.isEnabled = true
|
||||||
|
}
|
||||||
|
|
||||||
|
buttons.add(getSeparator(), BorderLayout.NORTH)
|
||||||
|
buttons.add(yesButton, BorderLayout.WEST)
|
||||||
|
buttons.add(noButton, BorderLayout.EAST)
|
||||||
|
add(buttons, BorderLayout.SOUTH)
|
||||||
|
pack()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getThemedPanel(layout: LayoutManager? = null): JPanel {
|
||||||
|
val panel = if(layout == null) JPanel() else JPanel(layout)
|
||||||
|
panel.background = Color(102,90,69)
|
||||||
|
return panel
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getDarkPanel(layout: LayoutManager? = null): JPanel {
|
||||||
|
val panel = if(layout == null) JPanel() else JPanel(layout)
|
||||||
|
panel.background = Color(82,73,51)
|
||||||
|
return panel
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getSeparator(): JSeparator {
|
||||||
|
val sep = JSeparator(JSeparator.HORIZONTAL)
|
||||||
|
sep.background = Color(57,49,39)
|
||||||
|
sep.foreground = Color(57,49,39)
|
||||||
|
return sep
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getLabel(text: String): JLabel {
|
||||||
|
val label = JLabel(text)
|
||||||
|
label.foreground = Color(227,208,179)
|
||||||
|
return label
|
||||||
|
}
|
||||||
|
|
||||||
|
fun open() {
|
||||||
|
isVisible = true
|
||||||
|
MainWindow.isEnabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -136,7 +136,8 @@ object Json {
|
||||||
{
|
{
|
||||||
"play.2009scape.org" -> 0
|
"play.2009scape.org" -> 0
|
||||||
"test.2009scape.org" -> 1
|
"test.2009scape.org" -> 1
|
||||||
else -> 2
|
"localhost" -> 2
|
||||||
|
else -> 0 //live
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
println("error parsing settings, replacing with defaults...")
|
println("error parsing settings, replacing with defaults...")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue