From 12a293222269301a45a2fe5896c6ae24a59e10e4 Mon Sep 17 00:00:00 2001 From: SeventhM <127357473+SeventhM@users.noreply.github.com> Date: Sun, 20 Oct 2024 19:20:50 -0700 Subject: [PATCH] Lint: Move CollectionExtensions --- .../unciv/logic/automation/civilization/BarbarianManager.kt | 2 +- .../logic/automation/civilization/NextTurnAutomation.kt | 2 +- core/src/com/unciv/logic/automation/unit/UnitAutomation.kt | 2 +- core/src/com/unciv/logic/city/CityConstructions.kt | 4 ++-- .../com/unciv/logic/city/managers/CityExpansionManager.kt | 4 ++-- .../com/unciv/logic/city/managers/CityPopulationManager.kt | 4 ++-- core/src/com/unciv/logic/civilization/CivConstructions.kt | 6 +++--- .../logic/civilization/diplomacy/CityStateFunctions.kt | 2 +- .../com/unciv/logic/civilization/managers/QuestManager.kt | 2 +- .../com/unciv/logic/civilization/managers/TechManager.kt | 2 +- core/src/com/unciv/logic/map/TileMap.kt | 4 ++-- .../mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt | 2 +- .../logic/map/mapgenerator/mapregions/MapRegionResources.kt | 2 +- .../unciv/logic/map/mapgenerator/mapregions/MapRegions.kt | 2 +- core/src/com/unciv/logic/map/tile/Tile.kt | 2 +- .../unciv/models/ruleset/unique/UniqueTriggerActivation.kt | 6 +++--- core/src/com/unciv/models/ruleset/unit/BaseUnit.kt | 2 +- core/src/com/unciv/ui/popups/options/MultiplayerTab.kt | 2 +- core/src/com/unciv/ui/popups/options/SettingsSelect.kt | 2 +- .../unciv/ui/screens/newgamescreen/MapFileSelectTable.kt | 2 +- .../components/extensions => utils}/CollectionExtensions.kt | 0 21 files changed, 28 insertions(+), 28 deletions(-) rename core/src/com/unciv/{ui/components/extensions => utils}/CollectionExtensions.kt (100%) diff --git a/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt b/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt index 3e98a8d50aa41..58ce9a8aa8363 100644 --- a/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt +++ b/core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt @@ -10,7 +10,7 @@ import com.unciv.logic.map.TileMap import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit -import com.unciv.ui.components.extensions.randomWeighted +import com.unciv.utils.randomWeighted import kotlin.math.max import kotlin.math.min import kotlin.math.pow diff --git a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt index d1e175c642ad4..be5e2bbcc39c8 100644 --- a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt @@ -28,8 +28,8 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat -import com.unciv.ui.components.extensions.randomWeighted import com.unciv.ui.screens.victoryscreen.RankingType +import com.unciv.utils.randomWeighted import kotlin.random.Random object NextTurnAutomation { diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt index 0aeba7be82b47..d615ee236f01f 100644 --- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt @@ -21,9 +21,9 @@ import com.unciv.models.UpgradeUnitAction import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit -import com.unciv.ui.components.extensions.randomWeighted import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsPillage import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade +import com.unciv.utils.randomWeighted object UnitAutomation { diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 08868d1a8c7fb..9c3b986c0d8e2 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -30,11 +30,11 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr -import com.unciv.ui.components.extensions.withItem -import com.unciv.ui.components.extensions.withoutItem import com.unciv.ui.components.fonts.Fonts import com.unciv.ui.screens.civilopediascreen.CivilopediaCategories import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.utils.withItem +import com.unciv.utils.withoutItem import kotlin.math.ceil import kotlin.math.min import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt b/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt index aaa75fc32d00e..9d623eb2509ea 100644 --- a/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityExpansionManager.kt @@ -11,8 +11,8 @@ import com.unciv.logic.map.tile.Tile import com.unciv.models.ruleset.unique.LocalUniqueCache import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.components.extensions.toPercent -import com.unciv.ui.components.extensions.withItem -import com.unciv.ui.components.extensions.withoutItem +import com.unciv.utils.withItem +import com.unciv.utils.withoutItem import kotlin.math.max import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt index ed3356d068b70..43fd920a14104 100644 --- a/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt +++ b/core/src/com/unciv/logic/city/managers/CityPopulationManager.kt @@ -11,8 +11,8 @@ import com.unciv.models.Counter import com.unciv.models.ruleset.unique.LocalUniqueCache import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.components.extensions.toPercent -import com.unciv.ui.components.extensions.withItem -import com.unciv.ui.components.extensions.withoutItem +import com.unciv.utils.withItem +import com.unciv.utils.withoutItem import kotlin.math.ceil import kotlin.math.floor import kotlin.math.pow diff --git a/core/src/com/unciv/logic/civilization/CivConstructions.kt b/core/src/com/unciv/logic/civilization/CivConstructions.kt index ea42a25a11312..ff690017b93de 100644 --- a/core/src/com/unciv/logic/civilization/CivConstructions.kt +++ b/core/src/com/unciv/logic/civilization/CivConstructions.kt @@ -9,9 +9,9 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat -import com.unciv.ui.components.extensions.addToMapOfSets -import com.unciv.ui.components.extensions.contains -import com.unciv.ui.components.extensions.yieldAllNotNull +import com.unciv.utils.addToMapOfSets +import com.unciv.utils.contains +import com.unciv.utils.yieldAllNotNull class CivConstructions : IsPartOfGameInfoSerialization { diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt index 26ec9987365fa..de4ffb32c4158 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt @@ -24,8 +24,8 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat -import com.unciv.ui.components.extensions.randomWeighted import com.unciv.ui.screens.victoryscreen.RankingType +import com.unciv.utils.randomWeighted import kotlin.math.min import kotlin.math.pow import kotlin.random.Random diff --git a/core/src/com/unciv/logic/civilization/managers/QuestManager.kt b/core/src/com/unciv/logic/civilization/managers/QuestManager.kt index fca8766bd21a0..f640accedc868 100644 --- a/core/src/com/unciv/logic/civilization/managers/QuestManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/QuestManager.kt @@ -31,8 +31,8 @@ import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.tr -import com.unciv.ui.components.extensions.randomWeighted import com.unciv.ui.components.extensions.toPercent +import com.unciv.utils.randomWeighted import kotlin.random.Random class QuestManager : IsPartOfGameInfoSerialization { diff --git a/core/src/com/unciv/logic/civilization/managers/TechManager.kt b/core/src/com/unciv/logic/civilization/managers/TechManager.kt index f364ad8ad7c03..153a80935ece7 100644 --- a/core/src/com/unciv/logic/civilization/managers/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/TechManager.kt @@ -24,8 +24,8 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.translations.tr import com.unciv.ui.components.MayaCalendar -import com.unciv.ui.components.extensions.withItem import com.unciv.ui.components.fonts.Fonts +import com.unciv.utils.withItem import kotlin.math.ceil import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt index 9d4f4a3bbf2d6..7cafa2c109c31 100644 --- a/core/src/com/unciv/logic/map/TileMap.kt +++ b/core/src/com/unciv/logic/map/TileMap.kt @@ -15,8 +15,8 @@ import com.unciv.models.ruleset.tile.TerrainType import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit -import com.unciv.ui.components.extensions.addToMapOfSets -import com.unciv.ui.components.extensions.contains +import com.unciv.utils.addToMapOfSets +import com.unciv.utils.contains import java.lang.Integer.max import java.util.concurrent.ConcurrentHashMap import kotlin.math.abs diff --git a/core/src/com/unciv/logic/map/mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt b/core/src/com/unciv/logic/map/mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt index 735f1d8f6d17a..20824ca689a46 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt @@ -9,7 +9,7 @@ import com.unciv.models.ruleset.tile.TerrainType import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.components.extensions.randomWeighted +import com.unciv.utils.randomWeighted import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt index 9d684dfc48037..d95623e8b0d73 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt @@ -7,7 +7,7 @@ import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TileResource import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType -import com.unciv.ui.components.extensions.randomWeighted +import com.unciv.utils.randomWeighted import kotlin.random.Random /** This class deals with the internals of *how* to place resources in tiles diff --git a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegions.kt b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegions.kt index 0fe8e4b316604..45861464f69c9 100644 --- a/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegions.kt +++ b/core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegions.kt @@ -19,7 +19,7 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.equalsPlaceholderText import com.unciv.models.translations.getPlaceholderParameters -import com.unciv.ui.components.extensions.randomWeighted +import com.unciv.utils.randomWeighted import com.unciv.utils.Log import com.unciv.utils.Tag import kotlin.math.abs diff --git a/core/src/com/unciv/logic/map/tile/Tile.kt b/core/src/com/unciv/logic/map/tile/Tile.kt index 9196fdb4d3441..00c70eeb73636 100644 --- a/core/src/com/unciv/logic/map/tile/Tile.kt +++ b/core/src/com/unciv/logic/map/tile/Tile.kt @@ -30,10 +30,10 @@ import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.ruleset.unique.UniqueType import com.unciv.ui.components.extensions.withItem -import com.unciv.ui.components.extensions.withoutItem import com.unciv.ui.components.fonts.Fonts import com.unciv.utils.DebugUtils import com.unciv.utils.Log +import com.unciv.utils.withoutItem import kotlin.math.abs import kotlin.math.min import kotlin.random.Random diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index 62f2878726823..d2b7f85e42fe9 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -22,6 +22,7 @@ import com.unciv.logic.map.mapgenerator.NaturalWonderGenerator import com.unciv.logic.map.mapgenerator.RiverGenerator import com.unciv.logic.map.mapunit.MapUnit import com.unciv.logic.map.tile.Tile +import com.unciv.logic.map.tile.TileNormalizer import com.unciv.models.UpgradeUnitAction import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.Event @@ -30,11 +31,10 @@ import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.hasPlaceholderParameters -import com.unciv.ui.components.extensions.addToMapOfSets -import com.unciv.logic.map.tile.TileNormalizer import com.unciv.models.translations.tr -import com.unciv.ui.components.extensions.randomWeighted import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsUpgrade +import com.unciv.utils.addToMapOfSets +import com.unciv.utils.randomWeighted import kotlin.math.roundToInt import kotlin.random.Random diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index d7c6e70483997..4e748ff08f844 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -21,9 +21,9 @@ import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.ui.components.extensions.getNeedMoreAmountString import com.unciv.ui.components.extensions.toPercent -import com.unciv.ui.components.extensions.yieldIfNotNull import com.unciv.ui.objectdescriptions.BaseUnitDescriptions import com.unciv.ui.screens.civilopediascreen.FormattedLine +import com.unciv.utils.yieldIfNotNull import kotlin.math.pow // This is BaseUnit because Unit is already a base Kotlin class and to avoid mixing the two up diff --git a/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt b/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt index cb3d7de6860f4..6b41aa7044ff5 100644 --- a/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt +++ b/core/src/com/unciv/ui/popups/options/MultiplayerTab.kt @@ -16,7 +16,6 @@ import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.brighten import com.unciv.ui.components.extensions.format import com.unciv.ui.components.extensions.isEnabled -import com.unciv.ui.components.extensions.toGdxArray import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toTextButton import com.unciv.ui.components.input.onChange @@ -27,6 +26,7 @@ import com.unciv.ui.popups.options.SettingsSelect.SelectItem import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.utils.Concurrency import com.unciv.utils.launchOnGLThread +import com.unciv.utils.toGdxArray import java.time.Duration import java.time.temporal.ChronoUnit diff --git a/core/src/com/unciv/ui/popups/options/SettingsSelect.kt b/core/src/com/unciv/ui/popups/options/SettingsSelect.kt index 80832c283d606..a59739c7a881e 100644 --- a/core/src/com/unciv/ui/popups/options/SettingsSelect.kt +++ b/core/src/com/unciv/ui/popups/options/SettingsSelect.kt @@ -11,9 +11,9 @@ import com.unciv.models.metadata.GameSettings.GameSetting import com.unciv.models.translations.tr import com.unciv.ui.audio.SoundPlayer import com.unciv.ui.components.input.onChange -import com.unciv.ui.components.extensions.toGdxArray import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.screens.basescreen.BaseScreen +import com.unciv.utils.toGdxArray import kotlin.reflect.KMutableProperty0 diff --git a/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt index bf8b48db95b09..1b82d3f233032 100644 --- a/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt @@ -24,7 +24,6 @@ import com.unciv.ui.components.SmallButtonStyle import com.unciv.ui.components.extensions.disable import com.unciv.ui.components.extensions.enable import com.unciv.ui.components.extensions.pad -import com.unciv.ui.components.extensions.toGdxArray import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toTextButton import com.unciv.ui.components.input.onActivation @@ -33,6 +32,7 @@ import com.unciv.ui.components.widgets.LoadingImage import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.victoryscreen.LoadMapPreview import com.unciv.utils.Concurrency +import com.unciv.utils.toGdxArray import kotlinx.coroutines.Job import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.catch diff --git a/core/src/com/unciv/ui/components/extensions/CollectionExtensions.kt b/core/src/com/unciv/utils/CollectionExtensions.kt similarity index 100% rename from core/src/com/unciv/ui/components/extensions/CollectionExtensions.kt rename to core/src/com/unciv/utils/CollectionExtensions.kt