mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-10 07:48:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Images are now packed when running from the .jar as well, so non-coding modders should never need to run from source code =)

Browse Source
This commit is contained in:
Yair Morgenstern
2020-01-06 23:56:18 +02:00
parent 1008e9c4f6
commit f97c230be8
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
View File

@ -18,8 +18,7 @@ internal object DesktopLauncher {
@JvmStatic @JvmStatic
fun main(arg: Array<String>) { fun main(arg: Array<String>) {
if (File("../Images").exists()) // So we don't run this from within a fat JAR packImages()
packImages()
val config = LwjglApplicationConfiguration() val config = LwjglApplicationConfiguration()
// Don't activate GL 3.0 because it causes problems for MacOS computers // Don't activate GL 3.0 because it causes problems for MacOS computers
@ -51,10 +50,12 @@ internal object DesktopLauncher {
// This is so they don't look all pixelated // This is so they don't look all pixelated
settings.filterMag = Texture.TextureFilter.MipMapLinearLinear settings.filterMag = Texture.TextureFilter.MipMapLinearLinear
settings.filterMin = Texture.TextureFilter.MipMapLinearLinear settings.filterMin = Texture.TextureFilter.MipMapLinearLinear
TexturePacker.process(settings, "../Images", ".", "game")
if (File("../Images").exists()) // So we don't run this from within a fat JAR
TexturePacker.process(settings, "../Images", ".", "game")
// pack for mods as well // pack for mods as well
val modDirectory = File("../assets/mods") val modDirectory = File("mods")
if(modDirectory.exists()) { if(modDirectory.exists()) {
for (mod in modDirectory.listFiles()!!){ for (mod in modDirectory.listFiles()!!){
TexturePacker.process(settings, mod.path + "/Images", mod.path, "game") TexturePacker.process(settings, mod.path + "/Images", mod.path, "game")