From f97c230be837c634c71e7e3bbffc0e696d1aad96 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 6 Jan 2020 23:56:18 +0200 Subject: [PATCH] Images are now packed when running from the .jar as well, so non-coding modders should never need to run from source code =) --- desktop/src/com/unciv/app/desktop/DesktopLauncher.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index 89f14d0a22..7b5d963f89 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -18,8 +18,7 @@ internal object DesktopLauncher { @JvmStatic fun main(arg: Array) { - if (File("../Images").exists()) // So we don't run this from within a fat JAR - packImages() + packImages() val config = LwjglApplicationConfiguration() // 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 settings.filterMag = 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 - val modDirectory = File("../assets/mods") + val modDirectory = File("mods") if(modDirectory.exists()) { for (mod in modDirectory.listFiles()!!){ TexturePacker.process(settings, mod.path + "/Images", mod.path, "game")