mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 16:49:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Changed loading of tile set configs to work also on PC, from within a JAR file

Browse Source
This commit is contained in:
Yair Morgenstern
2021-05-01 23:59:29 +03:00
parent 94c0995b23
commit ba1f647a8e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/models/tilesets/TileSetCache.kt
View File

@ -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<String, TileSetConfig>(){
fun loadTileSetConfigs(consoleMode: Boolean = false, printOutput: Boolean = false){
@ -10,8 +11,8 @@ object TileSetCache : HashMap<String, TileSetConfig>(){
var tileSetName = ""
//load internal TileSets
val fileHandles = if (consoleMode) FileHandle("jsons/TileSets").list()
else Gdx.files.internal("jsons/TileSets").list()
val fileHandles: Sequence<FileHandle> = 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")