Merge branch 'master' of github.com:EaterLabs/emo-aardvark

EaterLabs · Oct 24, 2019 · 5f804fa · 5f804fa
2 parents a5e6c80 + 415a847
commit 5f804fa
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ the remote profile looks like the following:
   "servers": [	
     {
       "name": "Eater's server",
-      "ip": "raquel.voor.money"
+      "ip": "minecraft.example.org"
     }
   ]
 }

diff --git a/build.gradle b/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     implementation 'net.swiftzer.semver:semver:1.0.0'
     implementation 'javax.servlet:javax.servlet-api:4.0.1'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.61'
+    implementation 'com.mojang:authlib:1.5.22'
 }
 
 compileKotlin {

diff --git a/src/main/kotlin/controllers/AardvarkController.kt b/src/main/kotlin/controllers/AardvarkController.kt
@@ -105,34 +105,42 @@ class AardvarkController : Controller() {
             profiles[profile.location] = ProfileState.Preparing
         }
 
-        val launcherJson = File("${profile.location}/.emo/launcher.json")
-
-        val requiresOwnJava = if (launcherJson.exists()) {
-            val launchOptions = settingsKlaxon.parse<LaunchOptions>(launcherJson.readText())
-            launchOptions?.java != null
-        } else settings.javaStyle !is JavaStyle.System
-
-        val defaultJava: String? = if (requiresOwnJava) {
-            val style = settings.javaStyle
-            when (style) {
-                is JavaStyle.MinecraftJDK -> checkMinecraftJDK()
-                is JavaStyle.AdoptOpenJDK -> checkAdoptOpenJDK(style)
-                else -> null
+        try {
+            val launcherJson = File("${profile.location}/.emo/launcher.json")
+
+            val requiresOwnJava = if (launcherJson.exists()) {
+                val launchOptions = settingsKlaxon.parse<LaunchOptions>(launcherJson.readText())
+                launchOptions?.java != null
+            } else settings.javaStyle !is JavaStyle.System
+
+            val defaultJava: String? = if (requiresOwnJava) {
+                val style = settings.javaStyle
+                when (style) {
+                    is JavaStyle.MinecraftJDK -> checkMinecraftJDK()
+                    is JavaStyle.AdoptOpenJDK -> checkAdoptOpenJDK(style)
+                    else -> null
+                }
+            } else
+                null
+
+            if (profile.location !in profileProcessWatchers) {
+                profileProcessWatchers.add(profile.location)
+                emoController.getProcessProperty(profile).onChange {
+                    profiles[profile.location] = if (it == null || !it.isAlive)
+                        ProfileState.Stopped
+                    else
+                        ProfileState.Running
+                }
             }
-        } else
-            null
 
-        if (profile.location !in profileProcessWatchers) {
-            profileProcessWatchers.add(profile.location)
-            emoController.getProcessProperty(profile).onChange {
-                profiles[profile.location] = if (it == null || !it.isAlive)
-                    ProfileState.Stopped
-                else
-                    ProfileState.Running
+            emoController.play(profile, defaultJava)
+        } catch (e: Throwable) {
+            GlobalScope.launch(Dispatchers.JavaFx) {
+                profiles[profile.location] = ProfileState.Stopped
             }
-        }
 
-        emoController.play(profile, defaultJava)
+            throw e
+        }
     }
 
     private val java: String

diff --git a/src/main/kotlin/fragments/ProfileFragment.kt b/src/main/kotlin/fragments/ProfileFragment.kt
@@ -1,5 +1,6 @@
 package me.eater.emo.aardvark.fragments
 
+import com.mojang.authlib.exceptions.AuthenticationException
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon
 import javafx.geometry.Pos
 import javafx.scene.layout.Priority
@@ -12,7 +13,10 @@ import me.eater.emo.aardvark.controllers.AardvarkController
 import me.eater.emo.aardvark.controllers.EmoController
 import me.eater.emo.aardvark.controllers.InstallerController
 import me.eater.emo.aardvark.utils.*
+import me.eater.emo.aardvark.views.AccountsView
+import me.eater.emo.aardvark.views.MainWindow
 import me.eater.emo.aardvark.views.ProfilesView
+import me.eater.emo.aardvark.views.account.AccountLoginView
 import me.eater.emo.aardvark.views.profile.InstallerView
 import me.eater.emo.aardvark.views.profile.ProfileSettings
 import me.eater.emo.emo.dto.repository.Modpack
@@ -109,7 +113,20 @@ class ProfileFragment : Fragment() {
                 when (profileState) {
                     AardvarkController.ProfileState.Running -> aardvarkController.stop(profile.profile)
                     AardvarkController.ProfileState.Stopped -> GlobalScope.launch {
-                        aardvarkController.play(profile.profile)
+                        try {
+                            aardvarkController.play(profile.profile)
+                        } catch (e: AuthenticationException) {
+                            GlobalScope.launch(Dispatchers.JavaFx) {
+                                val accountsView = find<AccountsView>()
+                                val accountLoginView = find<AccountLoginView>()
+                                val mainWindow = find<MainWindow>()
+                                mainWindow.selectAccounts()
+                                accountsView.root.center.replaceWith(accountLoginView.root)
+                                accountLoginView.tryLogin(emoController.account, e) {
+                                    mainWindow.selectProfiles()
+                                }
+                            }
+                        }
                     }
                     else -> {
                     }

diff --git a/src/main/kotlin/views/account/AccountLoginView.kt b/src/main/kotlin/views/account/AccountLoginView.kt
@@ -1,5 +1,6 @@
 package me.eater.emo.aardvark.views.account
 
+import com.mojang.authlib.exceptions.AuthenticationException
 import javafx.event.EventHandler
 import javafx.geometry.Pos
 import javafx.scene.control.Label
@@ -9,6 +10,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.javafx.JavaFx
 import kotlinx.coroutines.launch
+import me.eater.emo.Account
 import me.eater.emo.aardvark.controllers.EmoController
 import tornadofx.*
 
@@ -24,6 +26,8 @@ class AccountLoginView : View() {
 
     private val accountListView: AccountListView by inject()
 
+    private var actionAfterLogin: (() -> Unit)? = null
+
     override fun onDock() {
         password = ""
         username = ""
@@ -115,8 +119,25 @@ class AccountLoginView : View() {
                     return@ui
                 }
 
+                val action = actionAfterLogin
+                if (action != null) {
+                    actionAfterLogin = null
+                    action()
+                    return@ui
+                }
+
                 replaceWith(accountListView)
             }
         }
     }
+
+    fun tryLogin(account: Account?, e: AuthenticationException, afterLogin: () -> Unit) {
+        account?.username?.let {
+            username = it
+        }
+        actionAfterLogin = afterLogin
+        errorLabel.text = e.message
+        hasError = true
+        passwordField.requestFocus()
+    }
 }
diff --git a/src/main/kotlin/views/profile/InstallerView.kt b/src/main/kotlin/views/profile/InstallerView.kt
@@ -1,20 +1,28 @@
 package me.eater.emo.aardvark.views.profile
 
+import com.mojang.authlib.exceptions.AuthenticationException
 import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon
 import javafx.animation.Timeline
 import javafx.beans.value.WritableValue
 import javafx.scene.control.Label
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.javafx.JavaFx
 import kotlinx.coroutines.launch
 import me.eater.emo.aardvark.controllers.AardvarkController
+import me.eater.emo.aardvark.controllers.EmoController
 import me.eater.emo.aardvark.controllers.InstallerController
 import me.eater.emo.aardvark.fragments.ModpackFragment
 import me.eater.emo.aardvark.utils.*
+import me.eater.emo.aardvark.views.AccountsView
+import me.eater.emo.aardvark.views.MainWindow
+import me.eater.emo.aardvark.views.account.AccountLoginView
 import tornadofx.*
 
 class InstallerView : View() {
     private val installerController: InstallerController by inject()
     private val aardvarkController: AardvarkController by inject()
+    private val emoController: EmoController by inject()
     private var modpackSlot = vbox()
 
     private val rotateProperty = object : WritableValue<Double> {
@@ -150,11 +158,24 @@ class InstallerView : View() {
                                     val state = installerController.state
 
                                     if (state is InstallerController.State.Done) {
+                                        replaceWith<ProfileListingView>()
+
                                         GlobalScope.launch {
-                                            aardvarkController.play(state.profile)
+                                            try {
+                                                aardvarkController.play(state.profile)
+                                            } catch (e: AuthenticationException) {
+                                                GlobalScope.launch(Dispatchers.JavaFx) {
+                                                    val accountsView = find<AccountsView>()
+                                                    val accountLoginView = find<AccountLoginView>()
+                                                    val mainWindow = find<MainWindow>()
+                                                    mainWindow.selectAccounts()
+                                                    accountsView.root.center.replaceWith(accountLoginView.root)
+                                                    accountLoginView.tryLogin(emoController.account, e) {
+                                                        mainWindow.selectProfiles()
+                                                    }
+                                                }
+                                            }
                                         }
-
-                                        replaceWith<ProfileListingView>()
                                     }
                                 }
                             }