diff --git a/build.gradle b/build.gradle index adb7a5c3f1..838f12f916 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ buildscript { dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'com.android.tools.build:gradle:3.0.1' + classpath "com.badlogicgames.gdx:gdx-tools:1.9.8" } } diff --git a/core/build.gradle b/core/build.gradle index 45f183a492..bd295c0c39 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,14 +3,18 @@ sourceCompatibility = 1.8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' sourceSets.main.java.srcDirs = ["src/"] -def TEXPACK_DIR = "$System.env.TEXPACK_DIR" +import com.badlogic.gdx.tools.texturepacker.TexturePacker -task packSprites(type: Exec){ - commandLine "java", "-cp", TEXPACK_DIR, "com.badlogic.gdx.tools.texturepacker.TexturePacker", "assets-raw/sprites/", "assets/sprites/", "sprites.atlas" +task packSprites(){ + doLast { + TexturePacker.process("core/assets-raw/sprites/", "core/assets/sprites/", "sprites.atlas") + } } -task packUI(type: Exec){ - commandLine "java", "-cp", TEXPACK_DIR, "com.badlogic.gdx.tools.texturepacker.TexturePacker", "assets-raw/ui/", "assets/ui/", "uiskin.atlas" +task packUI(){ + doLast { + TexturePacker.process("core/assets-raw/ui/", "core/assets/ui/", "uiskin.atlas") + } } task pack(){ diff --git a/desktop/build.gradle b/desktop/build.gradle index fcf8cffd46..f4e47fba0c 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -6,7 +6,7 @@ sourceSets.main.java.srcDirs = [ "src/" ] project.ext.mainClassName = "io.anuke.mindustry.desktop.DesktopLauncher" project.ext.assetsDir = new File("../core/assets"); -def PACKR_DIR = System.getenv('HOME') + "/Documents/Packr/" +def PACKR_DIR = "$System.env.PACKR_DIR" def ICON_DIR = new File("core/assets/sprites/icon.icns") task run(dependsOn: classes, type: JavaExec) { diff --git a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml index f7ce42f271..e1a5cefdca 100644 --- a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml +++ b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml @@ -1,5 +1,4 @@ -