From 8cd841220d3c511681e793ee831172b30188aa4a Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 24 Jun 2022 22:50:21 +0930
Subject: [PATCH] Added more stuff for the standalone installer

---
 Readme.md         |  1 +
 build.gradle      | 34 +++++++++++++++++++++-------------
 gradle.properties |  2 ++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Readme.md b/Readme.md
index aaf8f1bb1..2ae06c107 100644
--- a/Readme.md
+++ b/Readme.md
@@ -130,6 +130,7 @@ If your IDE fails to auto-detect the source jars when browsing Minecraft classes
 
 ## Useful commands
 
+Run the standalone jar: `./gradlew run`\
 Only build Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
 Only build Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
 Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
diff --git a/build.gradle b/build.gradle
index a92b1605a..dc8a06cd2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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")
-}
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8728f9bc5..9177b7f49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,8 @@ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues
 # Global Plugin versions
 toml_version=3.6.5
 json_version=1.1.1
+flatlaf_version=2.3
+svgSalamander_version=1.1.3
 manifold_version=2022.1.18
 enabled_platforms=fabric,forge
 mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19