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

chore: File reorg

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-18 15:25:25 +02:00
parent 5279a11c2f
commit e8f54cc2f5
68 changed files with 101 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.utils.Align
import com.unciv.logic.GameInfo
import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.logic.UncivShowableException
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.multiplayer.OnlineMultiplayer

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

@ -1,6 +1,6 @@
package com.unciv
import com.unciv.logic.CustomFileLocationHelper
import com.unciv.logic.files.CustomFileLocationHelper
import com.unciv.ui.crashhandling.CrashReportSysInfo
import com.unciv.ui.utils.AudioExceptionHelper
import com.unciv.ui.utils.GeneralPlatformSpecificHelpers

3
core/src/com/unciv/logic/GameInfo.kt
View File

@ -18,11 +18,12 @@ import com.unciv.logic.civilization.NotificationCategory
import com.unciv.logic.civilization.NotificationIcon
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.civilization.managers.TechManager
import com.unciv.logic.map.CityDistanceData
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.models.Religion
import com.unciv.models.metadata.GameParameters
import com.unciv.models.ruleset.Difficulty
import com.unciv.models.ruleset.nation.Difficulty
import com.unciv.models.ruleset.ModOptionsConstants
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetCache

2
core/src/com/unciv/logic/GameStarter.kt
View File

@ -6,6 +6,8 @@ import com.unciv.logic.civilization.AlertType
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.civilization.PopupAlert
import com.unciv.logic.files.MapSaver
import com.unciv.logic.map.HexMath
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.logic.map.mapgenerator.MapGenerator

0
core/src/com/unciv/logic/BarbarianManager.kt → core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt
View File

4
core/src/com/unciv/models/AttackableTile.kt → core/src/com/unciv/logic/automation/unit/AttackableTile.kt
View File

@ -1,6 +1,6 @@
package com.unciv.models
package com.unciv.logic.automation.unit
import com.unciv.logic.map.TileInfo
class AttackableTile(val tileToAttackFrom: TileInfo, val tileToAttack: TileInfo,
val movementLeftAfterMovingToAttackTile:Float)
val movementLeftAfterMovingToAttackTile:Float)

1
core/src/com/unciv/logic/automation/unit/BattleHelper.kt
View File

@ -8,7 +8,6 @@ import com.unciv.logic.battle.MapUnitCombatant
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.PathsToTilesWithinTurn
import com.unciv.logic.map.TileInfo
import com.unciv.models.AttackableTile
import com.unciv.models.ruleset.unique.UniqueType
object BattleHelper {

2
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -3,7 +3,7 @@ package com.unciv.logic.automation.unit
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.automation.Automation
import com.unciv.logic.automation.ThreatLevel
import com.unciv.logic.automation.civilization.NextTurnAutomation

2
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -17,7 +17,7 @@ import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.models.AttackableTile
import com.unciv.logic.automation.unit.AttackableTile
import com.unciv.models.UnitActionType
import com.unciv.models.helpers.UnitMovementMemoryType
import com.unciv.models.ruleset.unique.StateForConditionals

2
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -19,7 +19,7 @@ import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.models.Counter
import com.unciv.models.ruleset.ModOptionsConstants
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.tile.ResourceSupplyList
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.unique.StateForConditionals

8
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -35,11 +35,11 @@ import com.unciv.logic.trade.TradeEvaluation
import com.unciv.logic.trade.TradeRequest
import com.unciv.models.Counter
import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.CityStateType
import com.unciv.models.ruleset.Difficulty
import com.unciv.models.ruleset.Era
import com.unciv.models.ruleset.nation.CityStateType
import com.unciv.models.ruleset.nation.Difficulty
import com.unciv.models.ruleset.tech.Era
import com.unciv.models.ruleset.ModOptionsConstants
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Policy
import com.unciv.models.ruleset.Victory
import com.unciv.models.ruleset.tile.ResourceSupplyList

2
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -12,7 +12,7 @@ import com.unciv.logic.civilization.NotificationIcon
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.civilization.PopupAlert
import com.unciv.logic.civilization.Proximity
import com.unciv.models.ruleset.CityStateType
import com.unciv.models.ruleset.nation.CityStateType
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.tile.ResourceSupplyList
import com.unciv.models.ruleset.unique.StateForConditionals

2
core/src/com/unciv/logic/civilization/managers/TechManager.kt
View File

@ -13,7 +13,7 @@ import com.unciv.logic.civilization.PopupAlert
import com.unciv.logic.civilization.TechAction
import com.unciv.logic.map.MapSize
import com.unciv.logic.map.RoadStatus
import com.unciv.models.ruleset.Era
import com.unciv.models.ruleset.tech.Era
import com.unciv.models.ruleset.tech.Technology
import com.unciv.models.ruleset.unique.UniqueMap
import com.unciv.models.ruleset.unique.UniqueTarget

6
core/src/com/unciv/logic/CustomFileLocationHelper.kt → core/src/com/unciv/logic/files/CustomFileLocationHelper.kt
View File

@ -1,7 +1,7 @@
package com.unciv.logic
package com.unciv.logic.files
import com.unciv.logic.UncivFiles.CustomLoadResult
import com.unciv.logic.UncivFiles.CustomSaveResult
import com.unciv.logic.files.UncivFiles.CustomLoadResult
import com.unciv.logic.files.UncivFiles.CustomSaveResult
import com.unciv.utils.concurrency.Concurrency
import java.io.InputStream
import java.io.OutputStream

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

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

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

@ -1,4 +1,4 @@
package com.unciv.logic
package com.unciv.logic.files
import com.badlogic.gdx.Files
import com.badlogic.gdx.Gdx
@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.SerializationException
import com.unciv.UncivGame
import com.unciv.json.fromJsonFile
import com.unciv.json.json
import com.unciv.logic.*
import com.unciv.models.metadata.GameSettings
import com.unciv.models.metadata.doMigrations
import com.unciv.models.metadata.isMigrationNecessary
@ -86,7 +87,9 @@ class UncivFiles(
fun getSaves(autoSaves: Boolean = true): Sequence<FileHandle> {
val saves = getSaves(SAVE_FILES_FOLDER)
val filteredSaves = if (autoSaves) { saves } else { saves.filter { !it.name().startsWith(AUTOSAVE_FILE_NAME) }}
val filteredSaves = if (autoSaves) { saves } else { saves.filter { !it.name().startsWith(
AUTOSAVE_FILE_NAME
) }}
return filteredSaves
}
@ -429,7 +432,9 @@ class UncivFiles(
return loadGameByName(AUTOSAVE_FILE_NAME)
} catch (ex: Exception) {
// silent fail if we can't read the autosave for any reason - try to load the last autosave by turn number first
val autosaves = getSaves().filter { it.name() != AUTOSAVE_FILE_NAME && it.name().startsWith(AUTOSAVE_FILE_NAME) }
val autosaves = getSaves().filter { it.name() != AUTOSAVE_FILE_NAME && it.name().startsWith(
AUTOSAVE_FILE_NAME
) }
return loadGameFromFile(autosaves.maxByOrNull { it.lastModified() }!!)
}
}

4
core/src/com/unciv/logic/CityDistance.kt → core/src/com/unciv/logic/map/CityDistance.kt
View File

@ -1,9 +1,9 @@
package com.unciv.logic
package com.unciv.logic.map
import com.badlogic.gdx.math.Vector2
import com.unciv.logic.GameInfo
import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.TileInfo
class CityDistance(
val city: CityInfo,

6
core/src/com/unciv/logic/HexMath.kt → core/src/com/unciv/logic/map/HexMath.kt
View File

@ -1,9 +1,7 @@
package com.unciv.logic
package com.unciv.logic.map
import com.badlogic.gdx.math.Vector2
import com.badlogic.gdx.math.Vector3
import com.unciv.logic.map.MapParameters
import com.unciv.logic.map.MapShape
import kotlin.math.*
@Suppress("MemberVisibilityCanBePrivate", "unused") // this is a library offering optional services
@ -238,7 +236,7 @@ object HexMath {
}
// Statically allocate the Vectors (in World coordinates)
// of the 6 clock directions for border and road drawing in TileGroup
// of the 6 clock directions for border and road drawing in TileGroup
private val clockPositionToWorldVectorMap: Map<Int,Vector2> = mapOf(
2 to hex2WorldCoords(Vector2(0f, -1f)),
4 to hex2WorldCoords(Vector2(1f, 0f)),

6
core/src/com/unciv/logic/map/MapParameters.kt
View File

@ -1,8 +1,8 @@
package com.unciv.logic.map
import com.unciv.logic.HexMath.getEquivalentHexagonalRadius
import com.unciv.logic.HexMath.getEquivalentRectangularSize
import com.unciv.logic.HexMath.getNumberOfTilesInHexagon
import com.unciv.logic.map.HexMath.getEquivalentHexagonalRadius
import com.unciv.logic.map.HexMath.getEquivalentRectangularSize
import com.unciv.logic.map.HexMath.getNumberOfTilesInHexagon
import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.models.metadata.BaseRuleset

1
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -3,7 +3,6 @@
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo

3
core/src/com/unciv/logic/map/TileMap.kt
View File

@ -3,12 +3,11 @@ package com.unciv.logic.map
import com.badlogic.gdx.math.Rectangle
import com.badlogic.gdx.math.Vector2
import com.unciv.logic.GameInfo
import com.unciv.logic.HexMath
import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.mapgenerator.MapLandmassGenerator
import com.unciv.models.metadata.Player
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.tile.TerrainType
import com.unciv.models.ruleset.unique.UniqueType

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -2,7 +2,7 @@ package com.unciv.logic.map
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.HexMath.getDistance
import com.unciv.logic.map.HexMath.getDistance
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.helpers.UnitMovementMemoryType
import com.unciv.models.ruleset.unique.UniqueType

2
core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
View File

@ -2,7 +2,7 @@ package com.unciv.logic.map.mapgenerator
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapParameters
import com.unciv.logic.map.MapShape

2
core/src/com/unciv/logic/map/mapgenerator/MapLandmassGenerator.kt
View File

@ -1,6 +1,6 @@
package com.unciv.logic.map.mapgenerator
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.map.*
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.tile.TerrainType

2
core/src/com/unciv/logic/map/mapgenerator/MapRegions.kt
View File

@ -3,7 +3,7 @@ package com.unciv.logic.map.mapgenerator
import com.badlogic.gdx.math.Rectangle
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapResources
import com.unciv.logic.map.MapShape

2
core/src/com/unciv/logic/multiplayer/storage/OnlineMultiplayerFiles.kt
View File

@ -4,7 +4,7 @@ import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.GameInfoPreview
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
/**
* Allows access to games stored on a server for multiplayer purposes.

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

@ -11,6 +11,10 @@ import com.unciv.models.Counter
import com.unciv.models.ModConstants
import com.unciv.models.metadata.BaseRuleset
import com.unciv.models.metadata.GameParameters
import com.unciv.models.ruleset.nation.CityStateType
import com.unciv.models.ruleset.nation.Difficulty
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.tech.Era
import com.unciv.models.ruleset.tech.TechColumn
import com.unciv.models.ruleset.tech.Technology
import com.unciv.models.ruleset.tile.Terrain

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

@ -3,6 +3,8 @@ package com.unciv.models.ruleset
import com.badlogic.gdx.graphics.Color
import com.unciv.Constants
import com.unciv.logic.map.RoadStatus
import com.unciv.models.ruleset.nation.getContrastRatio
import com.unciv.models.ruleset.nation.getRelativeLuminance
import com.unciv.models.ruleset.tile.TerrainType
import com.unciv.models.ruleset.unique.IHasUniques
import com.unciv.models.ruleset.unique.StateForConditionals

2
core/src/com/unciv/models/ruleset/CityStateType.kt → core/src/com/unciv/models/ruleset/nation/CityStateType.kt
View File

@ -1,4 +1,4 @@
package com.unciv.models.ruleset
package com.unciv.models.ruleset.nation
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueMap

7
core/src/com/unciv/models/ruleset/Difficulty.kt → core/src/com/unciv/models/ruleset/nation/Difficulty.kt
View File

@ -1,9 +1,10 @@
package com.unciv.models.ruleset
package com.unciv.models.ruleset.nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.stats.INamed
import com.unciv.ui.civilopedia.ICivilopediaText
import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.ui.civilopedia.ICivilopediaText
import com.unciv.ui.utils.Fonts
class Difficulty: INamed, ICivilopediaText {
@ -88,7 +89,7 @@ class Difficulty: INamed, ICivilopediaText {
if (aiMajorCivBonusStartingUnits.isNotEmpty()) {
lines += FormattedLine()
lines += FormattedLine("{Major AI civilization bonus starting units}:", indent = 1)
aiMajorCivBonusStartingUnits.groupBy { it }.map {
aiMajorCivBonusStartingUnits.groupBy { it }.map {
it.key to it.value.size
}.forEach {
lines += FormattedLine(Unique(if (it.second == 1) "[${it.first}]" else "${it.second} [${it.first}]"), indent = 2)

4
core/src/com/unciv/models/ruleset/Nation.kt → core/src/com/unciv/models/ruleset/nation/Nation.kt
View File

@ -1,7 +1,9 @@
package com.unciv.models.ruleset
package com.unciv.models.ruleset.nation
import com.badlogic.gdx.graphics.Color
import com.unciv.Constants
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetObject
import com.unciv.models.ruleset.unique.UniqueFlag
import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType

5
core/src/com/unciv/models/ruleset/Era.kt → core/src/com/unciv/models/ruleset/tech/Era.kt
View File

@ -1,6 +1,9 @@
package com.unciv.models.ruleset
package com.unciv.models.ruleset.tech
import com.badlogic.gdx.graphics.Color
import com.unciv.models.ruleset.IRulesetObject
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetObject
import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.UniqueTarget
import com.unciv.models.ruleset.unique.UniqueType

4
core/src/com/unciv/models/translations/TranslationFileWriter.kt
View File

@ -8,6 +8,10 @@ import com.unciv.logic.civilization.managers.SpyAction
import com.unciv.models.metadata.BaseRuleset
import com.unciv.models.metadata.LocaleCode
import com.unciv.models.ruleset.*
import com.unciv.models.ruleset.nation.CityStateType
import com.unciv.models.ruleset.nation.Difficulty
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.tech.Era
import com.unciv.models.ruleset.tech.TechColumn
import com.unciv.models.ruleset.tile.Terrain
import com.unciv.models.ruleset.tile.TileImprovement

2
core/src/com/unciv/ui/crashhandling/CrashScreen.kt
View File

@ -8,7 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.models.ruleset.RulesetCache
import com.unciv.ui.images.IconTextButton
import com.unciv.ui.images.ImageGetter

3
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -20,10 +20,9 @@ import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.json.json
import com.unciv.logic.city.PerpetualConstruction
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.skins.SkinCache
import com.unciv.models.stats.Stats
import com.unciv.models.tilesets.TileSetCache
import com.unciv.ui.utils.*
import com.unciv.ui.utils.extensions.*

2
core/src/com/unciv/ui/images/Portrait.kt
View File

@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.stats.Stats
import com.unciv.ui.utils.extensions.center
@ -15,7 +14,6 @@ import com.unciv.ui.utils.extensions.darken
import com.unciv.ui.utils.extensions.surroundWithCircle
import com.unciv.ui.utils.extensions.toGroup
import com.unciv.ui.utils.extensions.toLabel
import com.unciv.utils.Log
open class Portrait(val type: Type, val imageName: String, val size: Float, val borderSize: Float = 2f) : Group() {

2
core/src/com/unciv/ui/map/TileGroupMap.kt
View File

@ -3,7 +3,7 @@ package com.unciv.ui.map
import com.badlogic.gdx.graphics.g2d.Batch
import com.badlogic.gdx.math.Vector2
import com.badlogic.gdx.scenes.scene2d.Group
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.ui.cityscreen.CityTileGroup

3
core/src/com/unciv/ui/mapeditor/EditorMapHolder.kt
View File

@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.ui.map.TileGroupMap
@ -17,7 +17,6 @@ import com.unciv.ui.tilegroups.TileGroup
import com.unciv.ui.tilegroups.TileSetStrings
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.ZoomableScrollPane
import com.unciv.ui.utils.extensions.center
import com.unciv.ui.utils.extensions.onClick

2
core/src/com/unciv/ui/mapeditor/MapEditorEditSubTabs.kt
View File

@ -7,7 +7,7 @@ import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.tile.Terrain

2
core/src/com/unciv/ui/mapeditor/MapEditorFilesTable.kt
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.models.ruleset.RulesetCache
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.utils.BaseScreen

2
core/src/com/unciv/ui/mapeditor/MapEditorLoadTab.kt
View File

@ -5,7 +5,7 @@ import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.Constants
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.logic.UncivShowableException
import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.translations.tr

2
core/src/com/unciv/ui/mapeditor/MapEditorOptionsTab.kt
View File

@ -5,7 +5,7 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.models.translations.tr
import com.unciv.ui.popup.ToastPopup
import com.unciv.ui.utils.BaseScreen

3
core/src/com/unciv/ui/mapeditor/MapEditorSaveTab.kt
View File

@ -5,9 +5,8 @@ import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextField
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.logic.map.MapGeneratedMainType
import com.unciv.logic.map.MapType
import com.unciv.logic.map.TileMap
import com.unciv.models.translations.tr
import com.unciv.ui.popup.ConfirmPopup

2
core/src/com/unciv/ui/mapeditor/MapEditorViewTab.kt
View File

@ -9,7 +9,7 @@ import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.models.Counter
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.stats.Stats
import com.unciv.models.translations.tr

3
core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
View File

@ -5,10 +5,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Array
import com.unciv.UncivGame
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.logic.UncivShowableException
import com.unciv.logic.map.MapGeneratedMainType
import com.unciv.logic.map.MapType
import com.unciv.models.ruleset.RulesetCache
import com.unciv.ui.popup.Popup
import com.unciv.ui.utils.BaseScreen

2
core/src/com/unciv/ui/newgamescreen/NationTable.kt
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.Constants
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.ui.civilopedia.FormattedLine.IconDisplay
import com.unciv.ui.civilopedia.MarkupRenderer

5
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -11,10 +11,9 @@ import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.GameStarter
import com.unciv.logic.IdChecker
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.MapGeneratedMainType
import com.unciv.logic.map.MapType
import com.unciv.logic.multiplayer.OnlineMultiplayer
import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
import com.unciv.models.metadata.GameSetupInfo
@ -25,7 +24,6 @@ import com.unciv.ui.pickerscreens.PickerScreen
import com.unciv.ui.popup.ConfirmPopup
import com.unciv.ui.popup.Popup
import com.unciv.ui.popup.ToastPopup
import com.unciv.ui.saves.LoadGameScreen
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.ExpanderTab
import com.unciv.ui.utils.RecreateOnResize
@ -37,7 +35,6 @@ import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.pad
import com.unciv.ui.utils.extensions.toLabel
import com.unciv.ui.utils.extensions.toTextButton
import com.unciv.ui.worldscreen.WorldScreen
import com.unciv.utils.Log
import com.unciv.utils.concurrency.Concurrency
import com.unciv.utils.concurrency.launchOnGLThread

2
core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
View File

@ -14,7 +14,7 @@ import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.multiplayer.FriendList
import com.unciv.models.metadata.GameParameters
import com.unciv.models.metadata.Player
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.translations.tr
import com.unciv.ui.audio.MusicMood

4
core/src/com/unciv/ui/options/DebugTab.kt
View File

@ -2,8 +2,8 @@ package com.unciv.ui.options
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UncivGame
import com.unciv.logic.UncivFiles
import com.unciv.logic.MapSaver
import com.unciv.logic.files.UncivFiles
import com.unciv.logic.files.MapSaver
import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.ui.utils.BaseScreen

2
core/src/com/unciv/ui/overviewscreen/GlobalPoliticsOverviewTable.kt
View File

@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus

2
core/src/com/unciv/ui/overviewscreen/WonderOverviewTable.kt
View File

@ -8,7 +8,7 @@ import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.TileInfo
import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.Era
import com.unciv.models.ruleset.tech.Era
import com.unciv.models.ruleset.QuestName
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr

2
core/src/com/unciv/ui/saves/LoadGameScreen.kt
View File

@ -8,7 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.SerializationException
import com.unciv.Constants
import com.unciv.logic.MissingModsException
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.logic.UncivShowableException
import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.translations.tr

2
core/src/com/unciv/ui/saves/SaveGameScreen.kt
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.models.translations.tr
import com.unciv.ui.popup.ConfirmPopup
import com.unciv.ui.popup.ToastPopup

2
core/src/com/unciv/ui/saves/VerticalFileListScrollPane.kt
View File

@ -7,7 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.utils.AutoScrollPane
import com.unciv.ui.utils.BaseScreen

2
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -9,7 +9,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo

2
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -26,7 +26,7 @@ import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.models.AttackableTile
import com.unciv.logic.automation.unit.AttackableTile
import com.unciv.models.UncivSound
import com.unciv.models.helpers.MapArrowType
import com.unciv.models.helpers.MiscArrowTypes

2
core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
View File

@ -13,7 +13,7 @@ import com.unciv.logic.battle.CityCombatant
import com.unciv.logic.battle.ICombatant
import com.unciv.logic.battle.MapUnitCombatant
import com.unciv.logic.map.TileInfo
import com.unciv.models.AttackableTile
import com.unciv.logic.automation.unit.AttackableTile
import com.unciv.models.UncivSound
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr

2
core/src/com/unciv/ui/worldscreen/minimap/MinimapTile.kt
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame
import com.unciv.logic.HexMath
import com.unciv.logic.map.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.TileInfo
import com.unciv.ui.images.IconCircleGroup

2
desktop/src/com/unciv/app/desktop/CustomFileLocationHelperDesktop.kt
View File

@ -1,7 +1,7 @@
package com.unciv.app.desktop
import com.badlogic.gdx.Gdx
import com.unciv.logic.CustomFileLocationHelper
import com.unciv.logic.files.CustomFileLocationHelper
import java.awt.Component
import java.awt.EventQueue
import java.awt.event.WindowEvent

4
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -11,8 +11,8 @@ import com.sun.jna.Native
import com.unciv.UncivGame
import com.unciv.UncivGameParameters
import com.unciv.json.json
import com.unciv.logic.SETTINGS_FILE_NAME
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.SETTINGS_FILE_NAME
import com.unciv.logic.files.UncivFiles
import com.unciv.models.metadata.ScreenSize
import com.unciv.models.metadata.WindowState
import com.unciv.ui.utils.Fonts

2
tests/src/com/unciv/dev/FasterUIDevelopment.kt
View File

@ -12,7 +12,7 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent
import com.badlogic.gdx.scenes.scene2d.InputListener
import com.unciv.UncivGame
import com.unciv.UncivGameParameters
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.logic.multiplayer.throttle
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.images.ImageWithCustomSize

2
tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
View File

@ -9,7 +9,7 @@ import com.unciv.logic.civilization.transients.CapitalConnectionsFinder
import com.unciv.logic.map.RoadStatus
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.ruleset.tile.TerrainType

2
tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
View File

@ -3,7 +3,7 @@ package com.unciv.logic.civilization.diplomacy
import com.unciv.logic.GameInfo
import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.testing.GdxTestRunner
import io.mockk.every
import io.mockk.mockk

2
tests/src/com/unciv/logic/map/FreshWaterTests.kt
View File

@ -2,7 +2,7 @@ package com.unciv.logic.map
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.MapSaver
import com.unciv.logic.files.MapSaver
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetCache
import com.unciv.testing.GdxTestRunner

2
tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
View File

@ -8,6 +8,8 @@ import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.diplomacy.DiplomacyManager
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
import com.unciv.models.ruleset.*
import com.unciv.models.ruleset.nation.Difficulty
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.testing.GdxTestRunner
import org.junit.Assert

1
tests/src/com/unciv/logic/map/VisibilityTests.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.math.Vector2
import com.unciv.logic.GameInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.ruleset.*
import com.unciv.models.ruleset.nation.Nation
import com.unciv.testing.GdxTestRunner
import org.junit.Before
import org.junit.Test

2
tests/src/com/unciv/testing/SerializationTests.kt
View File

@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx
import com.unciv.UncivGame
import com.unciv.json.json
import com.unciv.logic.GameInfo
import com.unciv.logic.UncivFiles
import com.unciv.logic.files.UncivFiles
import com.unciv.logic.GameStarter
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.MapParameters

2
tests/src/com/unciv/uniques/TestGame.kt
View File

@ -18,7 +18,7 @@ import com.unciv.models.ruleset.Belief
import com.unciv.models.ruleset.BeliefType
import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.IRulesetObject
import com.unciv.models.ruleset.Nation
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.ruleset.Policy
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.RulesetCache