AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-23 03:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: more ui class reorg

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-19 07:54:24 +02:00
parent 70f81d1657
commit 13be70615d
21 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/UncivGame.kt
View File

@ -31,7 +31,7 @@ import com.unciv.ui.crashhandling.wrapCrashHandlingUnit
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.ConfirmPopup
import com.unciv.ui.popups.Popup
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen
import com.unciv.ui.components.BaseScreen
import com.unciv.ui.components.extensions.center

2
core/src/com/unciv/logic/files/MapSaver.kt
View File

@ -5,7 +5,7 @@ import com.badlogic.gdx.files.FileHandle
import com.unciv.json.json
import com.unciv.logic.map.MapParameters
import com.unciv.logic.map.TileMap
import com.unciv.ui.savescreens.Gzip
import com.unciv.ui.screens.savescreens.Gzip
object MapSaver {

2
core/src/com/unciv/logic/files/UncivFiles.kt
View File

@ -12,7 +12,7 @@ import com.unciv.logic.*
import com.unciv.models.metadata.GameSettings
import com.unciv.models.metadata.doMigrations
import com.unciv.models.metadata.isMigrationNecessary
import com.unciv.ui.savescreens.Gzip
import com.unciv.ui.screens.savescreens.Gzip
import com.unciv.utils.Log
import com.unciv.utils.concurrency.Concurrency
import com.unciv.utils.debug

1
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -31,7 +31,6 @@ import com.unciv.models.stats.INamed
import com.unciv.models.stats.NamedStats
import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.colorFromRGB
import com.unciv.ui.components.getRelativeTextDistance
import com.unciv.utils.Log
import com.unciv.utils.debug
import kotlin.collections.set

1
core/src/com/unciv/models/ruleset/RulesetValidator.kt
View File

@ -13,7 +13,6 @@ import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.INamed
import com.unciv.models.stats.Stats
import com.unciv.ui.components.getRelativeTextDistance
class RulesetValidator(val ruleset: Ruleset) {

2
core/src/com/unciv/ui/components/TextSimilarity.kt → core/src/com/unciv/models/ruleset/TextSimilarity.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.components
package com.unciv.models.ruleset
/**
* Algorithm:

2
core/src/com/unciv/ui/components/TextureArraySpriteBatch.java → core/src/com/unciv/ui/screens/basescreen/TextureArraySpriteBatch.java
View File

@ -1,4 +1,4 @@
package com.unciv.ui.components;
package com.unciv.ui.screens.basescreen;
import java.nio.IntBuffer;
import java.util.Arrays;

1
core/src/com/unciv/ui/screens/basescreen/UncivStage.kt
View File

@ -9,7 +9,6 @@ import com.badlogic.gdx.utils.viewport.Viewport
import com.unciv.UncivGame
import com.unciv.logic.event.Event
import com.unciv.logic.event.EventBus
import com.unciv.ui.components.TextureArraySpriteBatch
import com.unciv.ui.crashhandling.wrapCrashHandling
import com.unciv.ui.crashhandling.wrapCrashHandlingUnit
import com.unciv.utils.Log

4
core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt
View File

@ -39,8 +39,8 @@ import com.unciv.ui.popups.ToastPopup
import com.unciv.ui.popups.closeAllPopups
import com.unciv.ui.popups.hasOpenPopups
import com.unciv.ui.popups.popups
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.savescreens.QuickSave
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.QuickSave
import com.unciv.ui.screens.civilopediascreen.CivilopediaScreen
import com.unciv.ui.screens.newgamescreen.NewGameScreen
import com.unciv.ui.screens.pickerscreens.ModManagementScreen

2
core/src/com/unciv/ui/screens/multiplayerscreens/AddMultiplayerGameScreen.kt
View File

@ -7,7 +7,7 @@ import com.unciv.models.translations.tr
import com.unciv.ui.screens.pickerscreens.PickerScreen
import com.unciv.ui.popups.Popup
import com.unciv.ui.popups.ToastPopup
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.components.UncivTextField
import com.unciv.ui.components.extensions.enable
import com.unciv.ui.components.extensions.onClick

2
core/src/com/unciv/ui/screens/multiplayerscreens/EditMultiplayerGameInfoScreen.kt
View File

@ -8,7 +8,7 @@ import com.unciv.ui.screens.pickerscreens.PickerScreen
import com.unciv.ui.popups.ConfirmPopup
import com.unciv.ui.popups.Popup
import com.unciv.ui.popups.ToastPopup
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.components.UncivTextField
import com.unciv.ui.components.extensions.disable
import com.unciv.ui.components.extensions.enable

2
core/src/com/unciv/ui/screens/multiplayerscreens/MultiplayerHelpers.kt
View File

@ -6,7 +6,7 @@ import com.unciv.logic.multiplayer.OnlineMultiplayer
import com.unciv.logic.multiplayer.OnlineMultiplayerGame
import com.unciv.models.translations.tr
import com.unciv.ui.popups.Popup
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.components.BaseScreen
import com.unciv.ui.components.extensions.formatShort
import com.unciv.ui.components.extensions.toCheckBox

2
core/src/com/unciv/ui/savescreens/Gzip.kt → core/src/com/unciv/ui/screens/savescreens/Gzip.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.badlogic.gdx.utils.Base64Coder
import java.io.BufferedReader

2
core/src/com/unciv/ui/savescreens/LoadGameScreen.kt → core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.files.FileHandle

2
core/src/com/unciv/ui/savescreens/LoadOrSaveScreen.kt → core/src/com/unciv/ui/screens/savescreens/LoadOrSaveScreen.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox

7
core/src/com/unciv/ui/savescreens/QuickSave.kt → core/src/com/unciv/ui/screens/savescreens/QuickSave.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.unciv.Constants
import com.unciv.ui.screens.mainmenuscreen.MainMenuScreen
@ -77,7 +77,10 @@ object QuickSave {
Log.error("Could not autoload game", ex)
launchOnGLThread {
loadingPopup.close()
val (message) = LoadGameScreen.getLoadExceptionMessage(ex, "Cannot resume game!")
val (message) = LoadGameScreen.getLoadExceptionMessage(
ex,
"Cannot resume game!"
)
ToastPopup(message, screen)
}
return@run

2
core/src/com/unciv/ui/savescreens/SaveGameScreen.kt → core/src/com/unciv/ui/screens/savescreens/SaveGameScreen.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.files.FileHandle

2
core/src/com/unciv/ui/savescreens/VerticalFileListScrollPane.kt → core/src/com/unciv/ui/screens/savescreens/VerticalFileListScrollPane.kt
View File

@ -1,4 +1,4 @@
package com.unciv.ui.savescreens
package com.unciv.ui.screens.savescreens
import com.badlogic.gdx.Input
import com.badlogic.gdx.files.FileHandle

6
core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
View File

@ -38,9 +38,9 @@ import com.unciv.ui.screens.pickerscreens.TechPickerScreen
import com.unciv.ui.popups.Popup
import com.unciv.ui.popups.ToastPopup
import com.unciv.ui.popups.hasOpenPopups
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.savescreens.QuickSave
import com.unciv.ui.savescreens.SaveGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.QuickSave
import com.unciv.ui.screens.savescreens.SaveGameScreen
import com.unciv.ui.components.BaseScreen
import com.unciv.ui.components.KeyCharAndCode
import com.unciv.ui.components.extensions.centerX

4
core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt
View File

@ -10,8 +10,8 @@ import com.unciv.ui.popups.options.addMusicCurrentlyPlaying
import com.unciv.ui.popups.options.addMusicPauseSlider
import com.unciv.ui.popups.options.addMusicVolumeSlider
import com.unciv.ui.popups.Popup
import com.unciv.ui.savescreens.LoadGameScreen
import com.unciv.ui.savescreens.SaveGameScreen
import com.unciv.ui.screens.savescreens.LoadGameScreen
import com.unciv.ui.screens.savescreens.SaveGameScreen
import com.unciv.ui.screens.victoryscreen.VictoryScreen
import com.unciv.ui.screens.worldscreen.WorldScreen

0
core/src/com/unciv/utils/concurrency/Concurrency.kt → core/src/com/unciv/utils/Concurrency.kt
View File