Skip to content

Commit 38b44ec

Browse files
committed
Move LinuxX11SaverLoader to Desktop as should be
1 parent d352dfe commit 38b44ec

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

Diff for: build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ project(":desktop") {
6060

6161
dependencies {
6262
"implementation"(project(":core"))
63+
"implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
6364
"implementation"("com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion")
6465
"implementation"("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop")
6566

Diff for: core/src/com/unciv/logic/files/UncivFiles.kt

-5
Original file line numberDiff line numberDiff line change
@@ -394,11 +394,6 @@ class UncivFiles(
394394
* Platform dependent saver-loader to custom system locations
395395
*/
396396
var saverLoader: PlatformSaverLoader = PlatformSaverLoader.None
397-
get() {
398-
if (field.javaClass.simpleName == "DesktopSaverLoader" && LinuxX11SaverLoader.isRequired())
399-
field = LinuxX11SaverLoader()
400-
return field
401-
}
402397

403398
/** Specialized function to access settings before Gdx is initialized.
404399
*

Diff for: desktop/src/com/unciv/app/desktop/DesktopLauncher.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ internal object DesktopLauncher {
5757
Fonts.fontImplementation = DesktopFont()
5858

5959
// Setup Desktop saver-loader
60-
UncivFiles.saverLoader = DesktopSaverLoader()
60+
UncivFiles.saverLoader = if (LinuxX11SaverLoader.isRequired()) LinuxX11SaverLoader() else DesktopSaverLoader()
6161
UncivFiles.preferExternalStorage = false
6262

6363
// Solves a rendering problem in specific GPUs and drivers.

Diff for: core/src/com/unciv/logic/files/LinuxX11SaverLoader.kt renamed to desktop/src/com/unciv/app/desktop/LinuxX11SaverLoader.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package com.unciv.logic.files
1+
package com.unciv.app.desktop
22

33
import com.badlogic.gdx.Gdx
44
import com.unciv.UncivGame
5+
import com.unciv.logic.files.FileChooser
6+
import com.unciv.logic.files.PlatformSaverLoader
57
import com.unciv.utils.Concurrency
68
import java.awt.GraphicsEnvironment
79
import java.io.File
@@ -24,8 +26,8 @@ class LinuxX11SaverLoader : PlatformSaverLoader {
2426
if (suggestedLocation.startsWith(File.separator)) Gdx.files.absolute(suggestedLocation)
2527
else if (Gdx.files.external(suggestedLocation).parent().exists()) Gdx.files.external(suggestedLocation)
2628
else UncivGame.Current.files.getLocalFile(suggestedLocation)
27-
FileChooser.createSaveDialog(stage, "Save game", startLocation) {
28-
success, file ->
29+
30+
FileChooser.createSaveDialog(stage, "Save game", startLocation) { success, file ->
2931
if (!success)
3032
onError(PlatformSaverLoader.Cancelled())
3133
else

0 commit comments

Comments
 (0)