From ba1f647a8ef4cdf3136074c666eb8450ccba0366 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 1 May 2021 23:59:29 +0300 Subject: [PATCH] Changed loading of tile set configs to work also on PC, from within a JAR file --- core/src/com/unciv/models/tilesets/TileSetCache.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/models/tilesets/TileSetCache.kt b/core/src/com/unciv/models/tilesets/TileSetCache.kt index 006a5b051c..53b936ac88 100644 --- a/core/src/com/unciv/models/tilesets/TileSetCache.kt +++ b/core/src/com/unciv/models/tilesets/TileSetCache.kt @@ -3,6 +3,7 @@ package com.unciv.models.tilesets import com.badlogic.gdx.Gdx import com.badlogic.gdx.files.FileHandle import com.unciv.JsonParser +import com.unciv.ui.utils.ImageGetter object TileSetCache : HashMap(){ fun loadTileSetConfigs(consoleMode: Boolean = false, printOutput: Boolean = false){ @@ -10,8 +11,8 @@ object TileSetCache : HashMap(){ var tileSetName = "" //load internal TileSets - val fileHandles = if (consoleMode) FileHandle("jsons/TileSets").list() - else Gdx.files.internal("jsons/TileSets").list() + val fileHandles: Sequence = if (consoleMode) FileHandle("jsons/TileSets").list().asSequence() + else ImageGetter.getAvailableTilesets().map { Gdx.files.internal("jsons/TileSets/$it.json")}.filter { it.exists() } for (configFile in fileHandles){ tileSetName = configFile.nameWithoutExtension().removeSuffix("Config")