Skip to content

Commit

Permalink
Lint: Move CollectionExtensions
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeventhM
SeventhM authored Oct 21, 2024
1 parent e0864be commit 12a2932
Show file tree
Hide file tree
Showing 21 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/automation/civilization/BarbarianManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions core/src/com/unciv/logic/city/CityConstructions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/src/com/unciv/logic/city/managers/CityExpansionManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/src/com/unciv/logic/city/managers/CityPopulationManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions core/src/com/unciv/logic/civilization/CivConstructions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/civilization/managers/QuestManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/civilization/managers/TechManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/src/com/unciv/logic/map/TileMap.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/map/mapgenerator/mapregions/LuxuryResourcePlacementLogic.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegionResources.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/map/mapgenerator/mapregions/MapRegions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/map/tile/Tile.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/popups/options/MultiplayerTab.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/popups/options/SettingsSelect.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
0 ...onents/extensions/CollectionExtensions.kt → ...c/com/unciv/utils/CollectionExtensions.kt
View file
File renamed without changes.

0 comments on commit 12a2932

Please sign in to comment.