Added more stuff for the standalone installer
This commit is contained in:
+21
-13
@@ -114,6 +114,8 @@ architectury {
|
||||
subprojects { p ->
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
apply plugin: "dev.architectury.loom"
|
||||
if (p == project(":core"))
|
||||
apply plugin: "application"
|
||||
|
||||
loom {
|
||||
silentMojangMappingsLicense()
|
||||
@@ -150,14 +152,17 @@ subprojects { p ->
|
||||
implementation("com.googlecode.json-simple:json-simple:${rootProject.json_version}")
|
||||
|
||||
// Theming
|
||||
implementation("com.formdev:flatlaf:2.2")
|
||||
implementation("com.formdev:flatlaf:${rootProject.flatlaf_version}")
|
||||
// svg
|
||||
implementation("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}")
|
||||
implementation("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
|
||||
|
||||
// JUnit tests
|
||||
implementation("org.junit.jupiter:junit-jupiter:5.8.2")
|
||||
implementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
||||
|
||||
|
||||
if (p == project(":fabric") || p == project(":forge")) {
|
||||
if (p == project(":core") || p == project(":fabric") || p == project(":forge")) {
|
||||
// Compression
|
||||
common 'org.tukaani:xz:1.9'
|
||||
common 'org.apache.commons:commons-compress:1.21'
|
||||
@@ -167,7 +172,10 @@ subprojects { p ->
|
||||
shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
|
||||
shadowMe("com.googlecode.json-simple:json-simple:${rootProject.json_version}") {}
|
||||
// Theming
|
||||
shadowMe("com.formdev:flatlaf:2.2")
|
||||
shadowMe("com.formdev:flatlaf:${rootProject.flatlaf_version}")
|
||||
// svg
|
||||
shadowMe("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}")
|
||||
shadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
|
||||
}
|
||||
|
||||
if (p != project(":forge")) {
|
||||
@@ -183,7 +191,7 @@ subprojects { p ->
|
||||
shadowMe(project(":core")) { transitive false }
|
||||
}
|
||||
|
||||
if (p == project(":fabric") || p == project(":forge")) {
|
||||
if (p == project(":core") || p == project(":fabric") || p == project(":forge")) {
|
||||
shadowJar {
|
||||
configurations = [project.configurations.shadowMe]
|
||||
|
||||
@@ -192,9 +200,11 @@ subprojects { p ->
|
||||
relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
|
||||
// Toml & Json for config
|
||||
relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
|
||||
relocate 'com.googlecode.json-simple', 'shaded.googlecode.json-simple'
|
||||
relocate 'com.googlecode.json-simple', 'shaded.googlecode.json-simple' // FIXME: This is a massive library that is located in lots of different spots
|
||||
// Theming
|
||||
relocate 'com.formdev.flatlaf', 'shaded.formdev.flatlaf'
|
||||
// svg
|
||||
relocate 'com.kitfox.svg', 'shared.kitfox.svg'
|
||||
}
|
||||
|
||||
remapJar {
|
||||
@@ -211,6 +221,11 @@ subprojects { p ->
|
||||
'Main-Class': 'com.seibel.lod.core.JarMain' // When changing the main of the jar change this line
|
||||
}
|
||||
}
|
||||
if (p == project(":core")) {
|
||||
application {
|
||||
mainClass.set('com.seibel.lod.core.JarMain')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
allprojects { p ->
|
||||
@@ -376,11 +391,4 @@ allprojects { p ->
|
||||
runClient.enabled = false
|
||||
runServer.enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// this deletes the merged folder so we don't carry over
|
||||
// the previous merges to each new build job in the CI/CD pipeline
|
||||
task deleteMerged(type: Delete) {
|
||||
delete files("./Merged")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user