From ca7fb9c3bee532ccb4fc37569b77ae98b3fa4caf Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 11 Apr 2018 23:46:00 +0300 Subject: [PATCH] Multiple IDE-suggested fixes --- android/build.gradle | 4 +-- build.gradle | 2 +- core/src/com/unciv/{ui => }/UnCivGame.kt | 7 ++-- core/src/com/unciv/logic/battle/Battle.kt | 4 +-- .../unciv/logic/city/CityExpansionManager.kt | 2 +- core/src/com/unciv/logic/city/CityInfo.kt | 2 +- .../unciv/logic/civilization/PolicyManager.kt | 2 +- core/src/com/unciv/logic/map/TileInfo.kt | 6 ++-- .../com/unciv/models/gamebasics/Building.kt | 36 +++++++++---------- .../unciv/models/gamebasics/StringUtils.java | 14 -------- .../models/gamebasics/TileImprovement.kt | 8 ++--- .../unciv/models/gamebasics/TileResource.kt | 4 +-- .../com/unciv/ui/cityscreen/CityStatsTable.kt | 2 +- .../ui/pickerscreens/PolicyPickerScreen.kt | 3 +- core/src/com/unciv/ui/tilegroups/TileGroup.kt | 2 +- .../com/unciv/ui/tilegroups/WorldTileGroup.kt | 2 +- .../unciv/ui/utils/CameraStageBaseScreen.kt | 4 +-- core/src/com/unciv/ui/utils/GameSaver.kt | 16 ++++----- core/src/com/unciv/ui/utils/ImageGetter.kt | 13 ++----- .../com/unciv/ui/worldscreen/BattleTable.kt | 2 +- .../com/unciv/ui/worldscreen/WorldScreen.kt | 2 +- .../unciv/ui/worldscreen/unit/UnitActions.kt | 2 +- desktop/build.gradle | 4 +++ .../unciv/game/desktop/DesktopLauncher.java | 4 +-- ios/src/com/unciv/game/IOSLauncher.java | 2 +- 25 files changed, 65 insertions(+), 84 deletions(-) rename core/src/com/unciv/{ui => }/UnCivGame.kt (96%) delete mode 100644 core/src/com/unciv/models/gamebasics/StringUtils.java diff --git a/android/build.gradle b/android/build.gradle index 55c41280ae..81645a24fb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 38 - versionName "1.4.5" + versionCode 39 + versionName "1.4.6" } buildTypes { release { diff --git a/build.gradle b/build.gradle index f7294a83ed..8170a23ff5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlinVersion = '1.2.21' + ext.kotlinVersion = '1.2.31' dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" diff --git a/core/src/com/unciv/ui/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt similarity index 96% rename from core/src/com/unciv/ui/UnCivGame.kt rename to core/src/com/unciv/UnCivGame.kt index 6da6e03a74..7bc2d56136 100644 --- a/core/src/com/unciv/ui/UnCivGame.kt +++ b/core/src/com/unciv/UnCivGame.kt @@ -1,4 +1,4 @@ -package com.unciv.ui +package com.unciv import com.badlogic.gdx.Game import com.badlogic.gdx.Gdx @@ -10,6 +10,7 @@ import com.unciv.logic.map.TileMap import com.unciv.models.gamebasics.* import com.unciv.models.gamebasics.Unit import com.unciv.models.stats.INamed +import com.unciv.ui.GameSettings import com.unciv.ui.utils.GameSaver import com.unciv.ui.worldscreen.WorldScreen @@ -22,9 +23,9 @@ class UnCivGame : Game() { setupGameBasics() Current = this - if (GameSaver.GetSave("Autosave").exists()) { + if (GameSaver.getSave("Autosave").exists()) { try { - GameSaver.LoadGame(this, "Autosave") + GameSaver.loadGame(this, "Autosave") gameInfo.getPlayerCivilization().civName="Babylon" gameInfo.tileMap.values.forEach { if (it.owner == "Player") it.owner = "Babylon" diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 885559871c..0c46198e94 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -15,7 +15,7 @@ class Battle(val gameInfo:GameInfo) { && it.unit!!.owner == attacker.getCivilization().civName && it.unit!!.getBaseUnit().unitType == UnitType.Melee } - if(numberOfAttackersSurroundingDefender >1) modifiers.put("Flanking",0.15f) + if(numberOfAttackersSurroundingDefender >1) modifiers["Flanking"] = 0.15f } return modifiers @@ -24,7 +24,7 @@ class Battle(val gameInfo:GameInfo) { fun getDefenceModifiers(attacker: ICombatant, defender: ICombatant): HashMap { val modifiers = HashMap() val tileDefenceBonus = defender.getTile().getDefensiveBonus() - if(tileDefenceBonus > 0) modifiers.put("Terrain",tileDefenceBonus) + if(tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus return modifiers } diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index 78e2ece741..8ae9bb3be6 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -26,7 +26,7 @@ class CityExpansionManager { for (i in 2..3) { val tiles = cityInfo.civInfo.gameInfo.tileMap.getTilesInDistance(cityInfo.cityLocation, i).filter { it.owner == null } - if (tiles.size == 0) continue + if (tiles.isEmpty()) continue val chosenTile = tiles.maxBy { cityInfo.rankTile(it) } chosenTile!!.owner = cityInfo.civInfo.civName tilesClaimed++ diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 1460fd5787..6a0d59644d 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -84,7 +84,7 @@ class CityInfo { name = CityNames[civInfo.cities.size] this.cityLocation = cityLocation civInfo.cities.add(this) - civInfo.gameInfo.addNotification(name + " has been founded!", cityLocation) + civInfo.gameInfo.addNotification("$name has been founded!", cityLocation) if (civInfo.policies.isAdopted("Legalism") && civInfo.cities.size <= 4) cityConstructions.addCultureBuilding() if (civInfo.cities.size == 1) { cityConstructions.builtBuildings.add("Palace") diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt index f37b16ece7..7665fd1352 100644 --- a/core/src/com/unciv/logic/civilization/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt @@ -2,7 +2,7 @@ package com.unciv.logic.civilization import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.Policy -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.pickerscreens.GreatPersonPickerScreen diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index a48404ef18..4647bc8fb8 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -8,7 +8,7 @@ import com.unciv.models.gamebasics.Terrain import com.unciv.models.gamebasics.TileImprovement import com.unciv.models.gamebasics.TileResource import com.unciv.models.stats.Stats -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame class TileInfo { @Transient lateinit var tileMap: TileMap @@ -58,7 +58,7 @@ class TileInfo { fun getOwner(): CivilizationInfo? { return if (owner == null) null - else tileMap.gameInfo!!.civilizations.first { it.civName == owner } + else tileMap.gameInfo.civilizations.first { it.civName == owner } } fun getTerrainFeature(): Terrain? { @@ -148,7 +148,7 @@ class TileInfo { } SB.appendln(this.baseTerrain) if (terrainFeature != null) SB.appendln(terrainFeature!!) - if (hasViewableResource(tileMap.gameInfo!!.getPlayerCivilization())) SB.appendln(resource!!) + if (hasViewableResource(tileMap.gameInfo.getPlayerCivilization())) SB.appendln(resource!!) if (roadStatus !== RoadStatus.None && !isCityCenter) SB.appendln(roadStatus) if (improvement != null) SB.appendln(improvement!!) if (improvementInProgress != null) SB.appendln("$improvementInProgress in ${this.turnsToImprovement} turns") diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt index 93a7cc6f5e..f2444e3c2e 100644 --- a/core/src/com/unciv/models/gamebasics/Building.kt +++ b/core/src/com/unciv/models/gamebasics/Building.kt @@ -5,7 +5,7 @@ import com.unciv.logic.city.IConstruction import com.unciv.models.stats.NamedStats import com.unciv.models.stats.Stats import com.unciv.ui.ScienceVictoryScreen -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.VictoryScreen import com.unciv.ui.pickerscreens.PolicyPickerScreen @@ -14,28 +14,28 @@ class Building : NamedStats(), IConstruction, ICivilopedia { override val description: String get() = getDescription(false, listOf()) - @JvmField var requiredTech: String? = null + var requiredTech: String? = null - @JvmField var cost: Int = 0 - @JvmField var maintenance = 0 - @JvmField var percentStatBonus: Stats? = null - @JvmField var specialistSlots: Stats? = null - @JvmField var greatPersonPoints: Stats? = null + var cost: Int = 0 + var maintenance = 0 + var percentStatBonus: Stats? = null + var specialistSlots: Stats? = null + var greatPersonPoints: Stats? = null /** Extra cost percentage when purchasing */ - @JvmField var hurryCostModifier: Int = 0 - @JvmField var isWonder = false - @JvmField var requiredBuilding: String? = null - @JvmField var requiredBuildingInAllCities: String? = null + var hurryCostModifier: Int = 0 + var isWonder = false + var requiredBuilding: String? = null + var requiredBuildingInAllCities: String? = null /** A strategic resource that will be consumed by this building */ - @JvmField var requiredResource: String? = null + var requiredResource: String? = null /** City can only be built if one of these resources is nearby - it must be improved! */ - @JvmField var requiredNearbyImprovedResources: List? = null - @JvmField var cannotBeBuiltWith: String? = null + var requiredNearbyImprovedResources: List? = null + var cannotBeBuiltWith: String? = null // Uniques - @JvmField var providesFreeBuilding: String? = null - @JvmField var freeTechs: Int = 0 - @JvmField var unique: String? = null // for wonders which have individual functions that are totally unique + var providesFreeBuilding: String? = null + var freeTechs: Int = 0 + var unique: String? = null // for wonders which have individual functions that are totally unique /** @@ -82,7 +82,7 @@ class Building : NamedStats(), IConstruction, ICivilopedia { fun getDescription(forBuildingPickerScreen: Boolean, adoptedPolicies: List): String { val stats = getStats(adoptedPolicies) val stringBuilder = StringBuilder() - if (!forBuildingPickerScreen) stringBuilder.appendln("Cost: " + cost) + if (!forBuildingPickerScreen) stringBuilder.appendln("Cost: $cost") if (isWonder) stringBuilder.appendln("Wonder") if (!forBuildingPickerScreen && requiredTech != null) stringBuilder.appendln("Requires $requiredTech to be researched") diff --git a/core/src/com/unciv/models/gamebasics/StringUtils.java b/core/src/com/unciv/models/gamebasics/StringUtils.java deleted file mode 100644 index 37ae9eb1c0..0000000000 --- a/core/src/com/unciv/models/gamebasics/StringUtils.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.unciv.models.gamebasics; - -import java.util.Collection; - -public class StringUtils { - public static String join(String delimiter, Collection collection) { - StringBuilder stringBuilder = new StringBuilder(); - for (String str : collection) { - if (stringBuilder.length() != 0) stringBuilder.append(delimiter); - stringBuilder.append(str); - } - return stringBuilder.toString(); - } -} diff --git a/core/src/com/unciv/models/gamebasics/TileImprovement.kt b/core/src/com/unciv/models/gamebasics/TileImprovement.kt index b821029395..e6241d300e 100644 --- a/core/src/com/unciv/models/gamebasics/TileImprovement.kt +++ b/core/src/com/unciv/models/gamebasics/TileImprovement.kt @@ -1,11 +1,9 @@ package com.unciv.models.gamebasics import com.unciv.logic.civilization.CivilizationInfo -import com.unciv.models.stats.Stats import com.unciv.models.stats.NamedStats - -import java.util.ArrayList -import java.util.HashMap +import com.unciv.models.stats.Stats +import java.util.* class TileImprovement : NamedStats(), ICivilopedia { @@ -42,7 +40,7 @@ class TileImprovement : NamedStats(), ICivilopedia { stringBuilder.appendln(it.key + " for " + it.value.joinToString(", ")) } - if (techRequired != null) stringBuilder.appendln("Tech required: " + techRequired) + if (techRequired != null) stringBuilder.appendln("Tech required: $techRequired") return stringBuilder.toString() } diff --git a/core/src/com/unciv/models/gamebasics/TileResource.kt b/core/src/com/unciv/models/gamebasics/TileResource.kt index f503fbbbb5..5f81a41679 100644 --- a/core/src/com/unciv/models/gamebasics/TileResource.kt +++ b/core/src/com/unciv/models/gamebasics/TileResource.kt @@ -10,8 +10,8 @@ class TileResource : NamedStats(), ICivilopedia { stringBuilder.appendln(this.clone().toString()) stringBuilder.appendln("Can be found on " + terrainsCanBeFoundOn.joinToString()) stringBuilder.appendln() - stringBuilder.appendln("Improved by " + improvement) - stringBuilder.appendln("Bonus stats for improvement: " + improvementStats) + stringBuilder.appendln("Improved by $improvement") + stringBuilder.appendln("Bonus stats for improvement: $improvementStats") return stringBuilder.toString() } diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index 9f54302a11..bc166b3362 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -5,7 +5,7 @@ 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.models.gamebasics.Building -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.pickerscreens.ConstructionPickerScreen import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.ImageGetter diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index 9708c794ad..4be4ff5aaa 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -7,7 +7,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.Policy -import com.unciv.models.gamebasics.StringUtils import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.ImageGetter @@ -86,7 +85,7 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( pickedPolicy = policy var policyText = policy.name + "\r\n" + policy.description + "\r\n" if (!policy.name.endsWith("Complete") && policy.requires!!.isNotEmpty()) - policyText += "Requires " + StringUtils.join(", ", policy.requires) + policyText += "Requires " + policy.requires!!.joinToString() descriptionLabel.setText(policyText) } diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index e3d4acae4b..b4fe89e6d2 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -79,7 +79,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { if(!isViewable) hexagon.color = hexagon.color.lerp(Color.BLACK,0.6f) - if (tileInfo.hasViewableResource(tileInfo.tileMap!!.gameInfo!!.getPlayerCivilization()) && resourceImage == null) { // Need to add the resource image! + if (tileInfo.hasViewableResource(tileInfo.tileMap.gameInfo.getPlayerCivilization()) && resourceImage == null) { // Need to add the resource image! val fileName = "ResourceIcons/" + tileInfo.resource + "_(Civ5).png" resourceImage = ImageGetter.getImage(fileName) resourceImage!!.setSize(20f, 20f) diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index d069599ba3..79c676f275 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt @@ -6,7 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.logic.map.TileInfo -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.cityscreen.CityScreen import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.utils.CameraStageBaseScreen diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 05f854c7c6..1737d7af38 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -15,7 +15,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.viewport.ExtendViewport import com.unciv.models.gamebasics.GameBasics -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.cityscreen.addClickListener open class CameraStageBaseScreen : Screen { @@ -59,7 +59,7 @@ open class CameraStageBaseScreen : Screen { fun displayTutorials(name: String) { if (game.gameInfo.tutorial.contains(name)) return game.gameInfo.tutorial.add(name) - val texts = GameBasics.Tutorials.get(name)!! + val texts = GameBasics.Tutorials[name]!! tutorialTexts.addAll(texts) if (!isTutorialShowing) displayTutorial() } diff --git a/core/src/com/unciv/ui/utils/GameSaver.kt b/core/src/com/unciv/ui/utils/GameSaver.kt index 0527831e6e..a9f417ec84 100644 --- a/core/src/com/unciv/ui/utils/GameSaver.kt +++ b/core/src/com/unciv/ui/utils/GameSaver.kt @@ -4,21 +4,21 @@ import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.utils.Json import com.unciv.logic.GameInfo -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame object GameSaver { - val saveFilesFolder = "SaveFiles" + private const val saveFilesFolder = "SaveFiles" - fun GetSave(GameName: String): FileHandle { - return Gdx.files.local(saveFilesFolder + "/" + GameName) + fun getSave(GameName: String): FileHandle { + return Gdx.files.local("$saveFilesFolder/$GameName") } - fun SaveGame(game: UnCivGame, GameName: String) { - GetSave(GameName).writeString(Json().toJson(game.gameInfo), false) + fun saveGame(game: UnCivGame, GameName: String) { + getSave(GameName).writeString(Json().toJson(game.gameInfo), false) } - fun LoadGame(game: UnCivGame, GameName: String) { - game.gameInfo = Json().fromJson(GameInfo::class.java, GetSave(GameName).readString()) + fun loadGame(game: UnCivGame, GameName: String) { + game.gameInfo = Json().fromJson(GameInfo::class.java, getSave(GameName).readString()) game.gameInfo.setTransients() } } diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 19b03fc266..1243f5ce49 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -1,18 +1,15 @@ package com.unciv.ui.utils import com.badlogic.gdx.Gdx -import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.scenes.scene2d.ui.Image -import com.badlogic.gdx.scenes.scene2d.utils.Drawable import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable - -import java.util.HashMap +import java.util.* object ImageGetter { - var textureRegionByFileName = HashMap() - val WhiteDot = "skin/whiteDot.png" + private var textureRegionByFileName = HashMap() + const val WhiteDot = "skin/whiteDot.png" fun getImage(fileName: String): Image { return Image(getTextureRegion(fileName)) @@ -25,10 +22,6 @@ object ImageGetter { return drawable } - fun getSingleColorDrawable(color: Color): Drawable { - return getDrawable(WhiteDot).tint(color) - } - private fun getTextureRegion(fileName: String): TextureRegion { try { if (!textureRegionByFileName.containsKey(fileName)) diff --git a/core/src/com/unciv/ui/worldscreen/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/BattleTable.kt index 8e0d0ea337..ea4c92243d 100644 --- a/core/src/com/unciv/ui/worldscreen/BattleTable.kt +++ b/core/src/com/unciv/ui/worldscreen/BattleTable.kt @@ -5,7 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.unciv.logic.battle.* import com.unciv.logic.map.UnitType -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.disable diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index b569beaadf..97080a1fce 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -118,7 +118,7 @@ class WorldScreen : CameraStageBaseScreen() { game.gameInfo.nextTurn() unitTable.currentlyExecutingAction = null - GameSaver.SaveGame(game, "Autosave") + GameSaver.saveGame(game, "Autosave") update() displayTutorials("NextTurn") } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index f9c111c568..1c6f179e00 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -5,7 +5,7 @@ import com.unciv.logic.map.MapUnit import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.Building import com.unciv.models.gamebasics.GameBasics -import com.unciv.ui.UnCivGame +import com.unciv.UnCivGame import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.pickerscreens.ImprovementPickerScreen import com.unciv.ui.pickerscreens.TechPickerScreen diff --git a/desktop/build.gradle b/desktop/build.gradle index 829bbff221..a14115e32c 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -53,3 +53,7 @@ task afterEclipseImport(description: "Post processing after project generation", printer.print(classpath) } } + +dependencies { + compile project(path: ':core') +} \ No newline at end of file diff --git a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java index 24c31adc2d..184bff437c 100644 --- a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java +++ b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java @@ -2,9 +2,9 @@ package com.unciv.game.desktop; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import com.unciv.ui.UnCivGame; +import com.unciv.UnCivGame; -public class DesktopLauncher { +class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); new LwjglApplication(new UnCivGame(), config); diff --git a/ios/src/com/unciv/game/IOSLauncher.java b/ios/src/com/unciv/game/IOSLauncher.java index 5c05690d95..7935c27082 100644 --- a/ios/src/com/unciv/game/IOSLauncher.java +++ b/ios/src/com/unciv/game/IOSLauncher.java @@ -6,7 +6,7 @@ import org.robovm.apple.uikit.UIApplication; import com.badlogic.gdx.backends.iosrobovm.IOSApplication; import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration; -public class IOSLauncher extends IOSApplication.Delegate { +class IOSLauncher extends IOSApplication.Delegate { @Override protected IOSApplication createApplication() { IOSApplicationConfiguration config = new IOSApplicationConfiguration();