From f32356ccfb4dc150596b5a9e52f24abd87809eed Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Mon, 23 Nov 2020 17:01:15 -0800 Subject: [PATCH] Reformatted :desktop and :mpqviewer build scripts Reformatted :desktop and :mpqviewer build scripts Moved :mpqviewer resources into src/main/resources Enabled EXCLUDE flag for duplicate dependencies for jar task Excluded many local assets from :desktop:jar --- desktop/build.gradle | 5 +++ mpqviewer/build.gradle | 42 ++++++++---------- .../{assets => src/main/resources}/(listfile) | 0 .../main/resources}/ic_launcher_128.png | Bin .../main/resources}/ic_launcher_16.png | Bin .../main/resources}/ic_launcher_32.png | Bin .../main/resources}/palettes/ACT1/Pal.PL2 | Bin .../main/resources}/palettes/ACT1/pal.dat | Bin .../main/resources}/palettes/ACT2/Pal.PL2 | Bin .../main/resources}/palettes/ACT2/pal.dat | Bin .../main/resources}/palettes/ACT3/Pal.PL2 | Bin .../main/resources}/palettes/ACT3/pal.dat | Bin .../main/resources}/palettes/ACT4/Pal.PL2 | Bin .../main/resources}/palettes/ACT4/pal.dat | Bin .../main/resources}/palettes/ACT5/Pal.PL2 | Bin .../main/resources}/palettes/ACT5/pal.dat | Bin .../main/resources}/palettes/EndGame/Pal.PL2 | Bin .../main/resources}/palettes/EndGame/pal.dat | Bin .../main/resources}/palettes/Menu0/Pal.PL2 | Bin .../main/resources}/palettes/Menu0/pal.dat | Bin .../main/resources}/palettes/STATIC/pal.dat | Bin .../main/resources}/palettes/Sky/Pal.PL2 | Bin .../main/resources}/palettes/Sky/pal.dat | Bin .../resources}/palettes/Trademark/Pal.PL2 | Bin .../resources}/palettes/Trademark/pal.dat | Bin .../main/resources}/palettes/Units/pal.dat | Bin .../main/resources}/palettes/fechar/Pal.PL2 | Bin .../main/resources}/palettes/fechar/pal.dat | Bin .../main/resources}/palettes/loading/Pal.PL2 | Bin .../main/resources}/palettes/loading/pal.dat | Bin .../main/resources}/palettes/menu1/Pal.PL2 | Bin .../main/resources}/palettes/menu1/pal.dat | Bin .../main/resources}/palettes/menu2/Pal.PL2 | Bin .../main/resources}/palettes/menu2/pal.dat | Bin .../main/resources}/palettes/menu3/Pal.PL2 | Bin .../main/resources}/palettes/menu3/pal.dat | Bin .../main/resources}/palettes/menu4/Pal.PL2 | Bin .../main/resources}/palettes/menu4/pal.dat | Bin .../main/resources}/shaders/indexpalette.frag | 0 .../main/resources}/shaders/indexpalette.vert | 0 .../resources}/shaders/indexpalette2.frag | 0 .../resources}/shaders/indexpalette2.vert | 0 .../resources}/shaders/indexpalette3.frag | 0 .../resources}/shaders/indexpalette3.vert | 0 44 files changed, 24 insertions(+), 23 deletions(-) rename mpqviewer/{assets => src/main/resources}/(listfile) (100%) rename mpqviewer/{assets => src/main/resources}/ic_launcher_128.png (100%) rename mpqviewer/{assets => src/main/resources}/ic_launcher_16.png (100%) rename mpqviewer/{assets => src/main/resources}/ic_launcher_32.png (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT1/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT1/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT2/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT2/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT3/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT3/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT4/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT4/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT5/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/ACT5/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/EndGame/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/EndGame/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Menu0/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Menu0/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/STATIC/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Sky/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Sky/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Trademark/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Trademark/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/Units/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/fechar/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/fechar/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/loading/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/loading/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu1/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu1/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu2/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu2/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu3/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu3/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu4/Pal.PL2 (100%) rename mpqviewer/{assets => src/main/resources}/palettes/menu4/pal.dat (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette.frag (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette.vert (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette2.frag (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette2.vert (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette3.frag (100%) rename mpqviewer/{assets => src/main/resources}/shaders/indexpalette3.vert (100%) diff --git a/desktop/build.gradle b/desktop/build.gradle index a1c402ec..2736cdac 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -34,12 +34,17 @@ run { jar { archiveBaseName = appName + duplicatesStrategy = DuplicatesStrategy.EXCLUDE // These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them. // If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave // the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but // don't need ARM Linux support, you can uncomment it safely. // It's always safe to keep that line commented out; it only affects JAR size. // exclude('linux/arm32/**', 'linux/arm64/**') + exclude('data/global/excel/*.bin') // generated bins + exclude('data/*.ods') // source files for excel tables + exclude('lang/*.txt') // source files for i18n tables + exclude('test/**') // test resources dependsOn configurations.runtimeClasspath from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } manifest { diff --git a/mpqviewer/build.gradle b/mpqviewer/build.gradle index c1b21392..68021710 100644 --- a/mpqviewer/build.gradle +++ b/mpqviewer/build.gradle @@ -5,11 +5,7 @@ import org.gradle.internal.os.OperatingSystem [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' -sourceSets.main.resources.srcDirs += [ file('assets').path ] - -project.ext { - visuiVersion = '1.4.2' -} +project.ext.visuiVersion = '1.4.2' dependencies { implementation project(':core') @@ -25,30 +21,30 @@ application { } run { - workingDir = rootProject.file('assets').path setIgnoreExitValue(true) // Required to run LWJGL3 java apps on MacOS - if (OperatingSystem.current() == OperatingSystem.MAC_OS) { - jvmArgs += "-XstartOnFirstThread" - } + if (OperatingSystem.current() == OperatingSystem.MAC_OS) { + jvmArgs += "-XstartOnFirstThread" + } } jar { archiveBaseName = project.name - // These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them. - // If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave - // the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but - // don't need ARM Linux support, you can uncomment it safely. - // It's always safe to keep that line commented out; it only affects JAR size. - // exclude('linux/arm32/**', 'linux/arm64/**') - dependsOn configurations.runtimeClasspath - from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } - manifest { - attributes 'Main-Class': application.mainClass - } + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + // These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them. + // If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave + // the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but + // don't need ARM Linux support, you can uncomment it safely. + // It's always safe to keep that line commented out; it only affects JAR size. + // exclude('linux/arm32/**', 'linux/arm64/**') + dependsOn configurations.runtimeClasspath + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + manifest { + attributes 'Main-Class': application.mainClass + } - doLast { - file(archiveFile).setExecutable(true, false) - } + doLast { + file(archiveFile).setExecutable(true, false) + } } diff --git a/mpqviewer/assets/(listfile) b/mpqviewer/src/main/resources/(listfile) similarity index 100% rename from mpqviewer/assets/(listfile) rename to mpqviewer/src/main/resources/(listfile) diff --git a/mpqviewer/assets/ic_launcher_128.png b/mpqviewer/src/main/resources/ic_launcher_128.png similarity index 100% rename from mpqviewer/assets/ic_launcher_128.png rename to mpqviewer/src/main/resources/ic_launcher_128.png diff --git a/mpqviewer/assets/ic_launcher_16.png b/mpqviewer/src/main/resources/ic_launcher_16.png similarity index 100% rename from mpqviewer/assets/ic_launcher_16.png rename to mpqviewer/src/main/resources/ic_launcher_16.png diff --git a/mpqviewer/assets/ic_launcher_32.png b/mpqviewer/src/main/resources/ic_launcher_32.png similarity index 100% rename from mpqviewer/assets/ic_launcher_32.png rename to mpqviewer/src/main/resources/ic_launcher_32.png diff --git a/mpqviewer/assets/palettes/ACT1/Pal.PL2 b/mpqviewer/src/main/resources/palettes/ACT1/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/ACT1/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/ACT1/Pal.PL2 diff --git a/mpqviewer/assets/palettes/ACT1/pal.dat b/mpqviewer/src/main/resources/palettes/ACT1/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/ACT1/pal.dat rename to mpqviewer/src/main/resources/palettes/ACT1/pal.dat diff --git a/mpqviewer/assets/palettes/ACT2/Pal.PL2 b/mpqviewer/src/main/resources/palettes/ACT2/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/ACT2/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/ACT2/Pal.PL2 diff --git a/mpqviewer/assets/palettes/ACT2/pal.dat b/mpqviewer/src/main/resources/palettes/ACT2/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/ACT2/pal.dat rename to mpqviewer/src/main/resources/palettes/ACT2/pal.dat diff --git a/mpqviewer/assets/palettes/ACT3/Pal.PL2 b/mpqviewer/src/main/resources/palettes/ACT3/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/ACT3/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/ACT3/Pal.PL2 diff --git a/mpqviewer/assets/palettes/ACT3/pal.dat b/mpqviewer/src/main/resources/palettes/ACT3/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/ACT3/pal.dat rename to mpqviewer/src/main/resources/palettes/ACT3/pal.dat diff --git a/mpqviewer/assets/palettes/ACT4/Pal.PL2 b/mpqviewer/src/main/resources/palettes/ACT4/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/ACT4/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/ACT4/Pal.PL2 diff --git a/mpqviewer/assets/palettes/ACT4/pal.dat b/mpqviewer/src/main/resources/palettes/ACT4/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/ACT4/pal.dat rename to mpqviewer/src/main/resources/palettes/ACT4/pal.dat diff --git a/mpqviewer/assets/palettes/ACT5/Pal.PL2 b/mpqviewer/src/main/resources/palettes/ACT5/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/ACT5/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/ACT5/Pal.PL2 diff --git a/mpqviewer/assets/palettes/ACT5/pal.dat b/mpqviewer/src/main/resources/palettes/ACT5/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/ACT5/pal.dat rename to mpqviewer/src/main/resources/palettes/ACT5/pal.dat diff --git a/mpqviewer/assets/palettes/EndGame/Pal.PL2 b/mpqviewer/src/main/resources/palettes/EndGame/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/EndGame/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/EndGame/Pal.PL2 diff --git a/mpqviewer/assets/palettes/EndGame/pal.dat b/mpqviewer/src/main/resources/palettes/EndGame/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/EndGame/pal.dat rename to mpqviewer/src/main/resources/palettes/EndGame/pal.dat diff --git a/mpqviewer/assets/palettes/Menu0/Pal.PL2 b/mpqviewer/src/main/resources/palettes/Menu0/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/Menu0/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/Menu0/Pal.PL2 diff --git a/mpqviewer/assets/palettes/Menu0/pal.dat b/mpqviewer/src/main/resources/palettes/Menu0/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/Menu0/pal.dat rename to mpqviewer/src/main/resources/palettes/Menu0/pal.dat diff --git a/mpqviewer/assets/palettes/STATIC/pal.dat b/mpqviewer/src/main/resources/palettes/STATIC/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/STATIC/pal.dat rename to mpqviewer/src/main/resources/palettes/STATIC/pal.dat diff --git a/mpqviewer/assets/palettes/Sky/Pal.PL2 b/mpqviewer/src/main/resources/palettes/Sky/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/Sky/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/Sky/Pal.PL2 diff --git a/mpqviewer/assets/palettes/Sky/pal.dat b/mpqviewer/src/main/resources/palettes/Sky/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/Sky/pal.dat rename to mpqviewer/src/main/resources/palettes/Sky/pal.dat diff --git a/mpqviewer/assets/palettes/Trademark/Pal.PL2 b/mpqviewer/src/main/resources/palettes/Trademark/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/Trademark/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/Trademark/Pal.PL2 diff --git a/mpqviewer/assets/palettes/Trademark/pal.dat b/mpqviewer/src/main/resources/palettes/Trademark/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/Trademark/pal.dat rename to mpqviewer/src/main/resources/palettes/Trademark/pal.dat diff --git a/mpqviewer/assets/palettes/Units/pal.dat b/mpqviewer/src/main/resources/palettes/Units/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/Units/pal.dat rename to mpqviewer/src/main/resources/palettes/Units/pal.dat diff --git a/mpqviewer/assets/palettes/fechar/Pal.PL2 b/mpqviewer/src/main/resources/palettes/fechar/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/fechar/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/fechar/Pal.PL2 diff --git a/mpqviewer/assets/palettes/fechar/pal.dat b/mpqviewer/src/main/resources/palettes/fechar/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/fechar/pal.dat rename to mpqviewer/src/main/resources/palettes/fechar/pal.dat diff --git a/mpqviewer/assets/palettes/loading/Pal.PL2 b/mpqviewer/src/main/resources/palettes/loading/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/loading/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/loading/Pal.PL2 diff --git a/mpqviewer/assets/palettes/loading/pal.dat b/mpqviewer/src/main/resources/palettes/loading/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/loading/pal.dat rename to mpqviewer/src/main/resources/palettes/loading/pal.dat diff --git a/mpqviewer/assets/palettes/menu1/Pal.PL2 b/mpqviewer/src/main/resources/palettes/menu1/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/menu1/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/menu1/Pal.PL2 diff --git a/mpqviewer/assets/palettes/menu1/pal.dat b/mpqviewer/src/main/resources/palettes/menu1/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/menu1/pal.dat rename to mpqviewer/src/main/resources/palettes/menu1/pal.dat diff --git a/mpqviewer/assets/palettes/menu2/Pal.PL2 b/mpqviewer/src/main/resources/palettes/menu2/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/menu2/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/menu2/Pal.PL2 diff --git a/mpqviewer/assets/palettes/menu2/pal.dat b/mpqviewer/src/main/resources/palettes/menu2/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/menu2/pal.dat rename to mpqviewer/src/main/resources/palettes/menu2/pal.dat diff --git a/mpqviewer/assets/palettes/menu3/Pal.PL2 b/mpqviewer/src/main/resources/palettes/menu3/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/menu3/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/menu3/Pal.PL2 diff --git a/mpqviewer/assets/palettes/menu3/pal.dat b/mpqviewer/src/main/resources/palettes/menu3/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/menu3/pal.dat rename to mpqviewer/src/main/resources/palettes/menu3/pal.dat diff --git a/mpqviewer/assets/palettes/menu4/Pal.PL2 b/mpqviewer/src/main/resources/palettes/menu4/Pal.PL2 similarity index 100% rename from mpqviewer/assets/palettes/menu4/Pal.PL2 rename to mpqviewer/src/main/resources/palettes/menu4/Pal.PL2 diff --git a/mpqviewer/assets/palettes/menu4/pal.dat b/mpqviewer/src/main/resources/palettes/menu4/pal.dat similarity index 100% rename from mpqviewer/assets/palettes/menu4/pal.dat rename to mpqviewer/src/main/resources/palettes/menu4/pal.dat diff --git a/mpqviewer/assets/shaders/indexpalette.frag b/mpqviewer/src/main/resources/shaders/indexpalette.frag similarity index 100% rename from mpqviewer/assets/shaders/indexpalette.frag rename to mpqviewer/src/main/resources/shaders/indexpalette.frag diff --git a/mpqviewer/assets/shaders/indexpalette.vert b/mpqviewer/src/main/resources/shaders/indexpalette.vert similarity index 100% rename from mpqviewer/assets/shaders/indexpalette.vert rename to mpqviewer/src/main/resources/shaders/indexpalette.vert diff --git a/mpqviewer/assets/shaders/indexpalette2.frag b/mpqviewer/src/main/resources/shaders/indexpalette2.frag similarity index 100% rename from mpqviewer/assets/shaders/indexpalette2.frag rename to mpqviewer/src/main/resources/shaders/indexpalette2.frag diff --git a/mpqviewer/assets/shaders/indexpalette2.vert b/mpqviewer/src/main/resources/shaders/indexpalette2.vert similarity index 100% rename from mpqviewer/assets/shaders/indexpalette2.vert rename to mpqviewer/src/main/resources/shaders/indexpalette2.vert diff --git a/mpqviewer/assets/shaders/indexpalette3.frag b/mpqviewer/src/main/resources/shaders/indexpalette3.frag similarity index 100% rename from mpqviewer/assets/shaders/indexpalette3.frag rename to mpqviewer/src/main/resources/shaders/indexpalette3.frag diff --git a/mpqviewer/assets/shaders/indexpalette3.vert b/mpqviewer/src/main/resources/shaders/indexpalette3.vert similarity index 100% rename from mpqviewer/assets/shaders/indexpalette3.vert rename to mpqviewer/src/main/resources/shaders/indexpalette3.vert