Som bugfix and implement minecraft launcher

glitchless · May 10, 2019 · 0139ccf · 0139ccf
1 parent 19659f0
commit 0139ccf
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 13 deletions.
diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/downloader/ComposerDownloader.kt b/src/main/kotlin/ru/lionzxy/tplauncher/downloader/ComposerDownloader.kt
@@ -1,6 +1,8 @@
 package ru.lionzxy.tplauncher.downloader
 
 import ru.lionzxy.tplauncher.minecraft.MinecraftAccountManager
+import ru.lionzxy.tplauncher.utils.ConfigHelper
+import ru.lionzxy.tplauncher.utils.setWritableToFolder
 import sk.tomsik68.mclauncher.api.ui.IProgressMonitor
 
 class ComposerDownloader(minecraftAccountManager: MinecraftAccountManager) {
@@ -13,6 +15,7 @@ class ComposerDownloader(minecraftAccountManager: MinecraftAccountManager) {
                 download(it, progressMonitor)
             }
         }
+        ConfigHelper.getDefaultDirectory().setWritableToFolder()
     }
 
     private fun download(downloader: IDownloader, progressMonitor: IProgressMonitor) {

diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/downloader/InitialDownloader.kt b/src/main/kotlin/ru/lionzxy/tplauncher/downloader/InitialDownloader.kt
@@ -33,6 +33,6 @@ class InitialDownloader : IDownloader {
     }
 
     override fun shouldDownload(): Boolean {
-        return ConfigHelper.config.downloadFirstPack ?: false
+        return !(ConfigHelper.config.downloadFirstPack ?: false)
     }
 }
diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftAccountManager.kt b/src/main/kotlin/ru/lionzxy/tplauncher/minecraft/MinecraftAccountManager.kt
@@ -28,6 +28,10 @@ class MinecraftAccountManager() {
         }
     }
 
+    fun launch() {
+        MinecraftLauncher.launch(minecraftInstance, session!!)
+    }
+
     private fun isLoggedInternal(): Boolean {
         val profile = ConfigHelper.config.profile ?: return false
         return !profile.email.isNullOrEmpty()

diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/main/MainController.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/main/MainController.kt
@@ -6,6 +6,8 @@ import ru.lionzxy.tplauncher.utils.runAsync
 import ru.lionzxy.tplauncher.view.main.states.*
 import sk.tomsik68.mclauncher.api.ui.IProgressMonitor
 import sk.tomsik68.mclauncher.impl.login.yggdrasil.YDServiceAuthenticationException
+import java.lang.Thread.sleep
+import java.util.concurrent.TimeUnit
 
 class MainController(val stateMachine: IImplementState, val progressMonitor: IProgressMonitor) {
     val minecraftAccountManager = MinecraftAccountManager()
@@ -47,16 +49,15 @@ class MainController(val stateMachine: IImplementState, val progressMonitor: IPr
 
         try {
             minecraftAccountManager.login(email, password)
-            stateMachine.setState(LoggedState(email))
-            onGameStart()
+            onGameStart(LoggedState(email))
         } catch (exp: YDServiceAuthenticationException) {
-            stateMachine.setState(ErrorInitialState(exp.reason))
             exp.printStackTrace()
+            stateMachine.setState(ErrorInitialState(exp.reason ?: exp.localizedMessage))
         }
     }
 
-    fun onGameStart() {
-        val currentState = stateMachine.currentState() as? LoggedState ?: return
+    fun onGameStart(baseState: BaseState = stateMachine.currentState()) {
+        val currentState = baseState as? LoggedState ?: return
         stateMachine.setState(GameLoadingState(currentState))
         progressMonitor.setProgress(-1)
 
@@ -72,6 +73,13 @@ class MainController(val stateMachine: IImplementState, val progressMonitor: IPr
             )
             e.printStackTrace()
         }
+
+        minecraftAccountManager.launch()
+
+        progressMonitor.setStatus("Запускаем Minecraft...")
+        progressMonitor.setProgress(-1)
+        sleep(TimeUnit.MINUTES.toMillis(1))
+        stateMachine.setState(MinecraftLaunchedState(currentState))
     }
 
     fun onPasswordOrLoginChange() {

diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/main/MainWindow.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/main/MainWindow.kt
@@ -59,6 +59,7 @@ class MainWindow : View(), IImplementState {
     }
 
     override val root = stackpane {
+        maxWidth = 592.0
         vbox {
             titleLabel = label("games.glitchless.ru") {
                 onMouseClicked =
@@ -185,7 +186,7 @@ class MainWindow : View(), IImplementState {
                 margin = Insets(DEFAULT_MARGIN)
             }
             alignment = Pos.TOP_RIGHT
-            onMouseClicked = CloseListener()
+            onMouseClicked = CloseListener(this@MainWindow)
         }
         val moveWindowHandler = MoveWindowHandler(this@MainWindow)
         onMouseDragged = moveWindowHandler
@@ -263,6 +264,5 @@ class MainWindow : View(), IImplementState {
             registerLabel.hide()
         }
         primaryStage.sizeToScene()
-        println(root.width)
     }
 }
diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/main/listener/CloseListener.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/main/listener/CloseListener.kt
@@ -1,12 +1,12 @@
 package ru.lionzxy.tplauncher.view.main.listener
 
-import javafx.application.Platform
 import javafx.event.EventHandler
 import javafx.scene.input.MouseEvent
+import tornadofx.View
 
-class CloseListener : EventHandler<MouseEvent> {
+class CloseListener(val view: View) : EventHandler<MouseEvent> {
     override fun handle(p0: MouseEvent?) {
-        Platform.exit()
+        view.close()
     }
 
 }
diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/main/states/GameLoadingState.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/main/states/GameLoadingState.kt
@@ -1,6 +1,6 @@
 package ru.lionzxy.tplauncher.view.main.states
 
-class GameLoadingState(email: String) : LoggedState(email) {
+open class GameLoadingState(email: String) : LoggedState(email) {
     constructor(loggedState: LoggedState) : this(loggedState.email)
 
     override var disableProgressBar = false

diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/main/states/MinecraftLaunchedState.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/main/states/MinecraftLaunchedState.kt
@@ -0,0 +1,5 @@
+package ru.lionzxy.tplauncher.view.main.states
+
+class MinecraftLaunchedState(state: LoggedState) : GameLoadingState(state) {
+    override var isOpen = false
+}
diff --git a/src/main/kotlin/ru/lionzxy/tplauncher/view/settings/SettingsWindow.kt b/src/main/kotlin/ru/lionzxy/tplauncher/view/settings/SettingsWindow.kt
@@ -118,7 +118,7 @@ class SettingsWindow : View() {
                 margin = Insets(Constants.DEFAULT_MARGIN)
             }
             alignment = Pos.TOP_RIGHT
-            onMouseClicked = CloseListener()
+            onMouseClicked = CloseListener(this@SettingsWindow)
         }
         val moveWindowHandler = MoveWindowHandler(this@SettingsWindow)
         onMouseDragged = moveWindowHandler