From b449072a696f3614cf3db25e90f7020823a63739 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Fri, 31 Mar 2023 19:47:32 +1030
Subject: [PATCH] Reverted back to using swing for the base run jar

---
 Readme.md         |  4 ++--
 build.gradle      | 30 +++++++++---------------------
 gradle.properties |  2 +-
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/Readme.md b/Readme.md
index 88a7c58e8..c0fbd7aed 100644
--- a/Readme.md
+++ b/Readme.md
@@ -170,5 +170,5 @@ https://github.com/TheElectronWill/night-config
 SVG Salamander for SVG support\
 https://github.com/blackears/svgSalamander
 
-JavaFX for standalone jar and config ui\
-https://openjfx.io/
+FlatLaf for theming (for development testing, may remove later)\
+https://www.formdev.com/flatlaf/
diff --git a/build.gradle b/build.gradle
index 04330e785..9270a2aa8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,9 +10,6 @@ plugins {
     // Manifold preprocessor
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
 
-    // JavaFX library (useful for ui stuff)
-    id "org.openjfx.javafxplugin" version "0.0.13"
-
     // Provides mc libraries to core
 //    id "org.spongepowered.gradle.vanilla" version '0.2.1-SNAPSHOT' apply false
 }
@@ -100,7 +97,6 @@ subprojects { p ->
     // Apply plugins
     apply plugin: "java"
     apply plugin: "com.github.johnrengelman.shadow"
-    apply plugin: "org.openjfx.javafxplugin"
     if (isMinecraftSubProject)
         apply plugin: "systems.manifold.manifold-gradle-plugin"
     if (p == project(":core"))
@@ -139,11 +135,6 @@ subprojects { p ->
             mainClass.set("com.seibel.lod.core.jar.JarMain")
         }
     }
-    // Remember, to shadow it you need to add it in the dependency part
-    javafx {
-        version = "${rootProject.javafx_version}"
-        modules = ["javafx.swing", "javafx.controls", "javafx.graphics"]
-    }
 
     dependencies {
         //=====================//
@@ -156,8 +147,8 @@ subprojects { p ->
             annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
 
         // Log4j
-        implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-        implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+        shadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+        shadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
 
         // JOML
         implementation("org.joml:joml:${rootProject.joml_version}")
@@ -174,18 +165,12 @@ subprojects { p ->
         shadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
         shadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
 
+        // Theming
+        shadowMe("com.formdev:flatlaf:${rootProject.flatlaf_version}")
+
         // SVG
         shadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
-
-        // JavaFX/OpenJFX
-        // Remember, you also need to define jfx modules in its own jfx thing
-        // This part of the code is just to shadow the libraries
-        // FIXME: This doesnt work, find a workaround
-        shadowMe("org.openjfx:javafx:${rootProject.javafx_version}")
-        shadowMe("org.openjfx:javafx-base:${rootProject.javafx_version}")
-        shadowMe("org.openjfx:javafx-swing:${rootProject.javafx_version}")
-        shadowMe("org.openjfx:javafx-controls:${rootProject.javafx_version}")
-        shadowMe("org.openjfx:javafx-graphics:${rootProject.javafx_version}")
+        shadowMe("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}")
 
 
         // Remember, for lwjgl dependancies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
@@ -254,6 +239,9 @@ subprojects { p ->
         // NightConfig (includes Toml & Json)
         relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
 
+        // Theming
+        relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
+
         // SVG
         relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
 
diff --git a/gradle.properties b/gradle.properties
index 35110ad83..ff47522d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ mod_discord=https://discord.gg/xAB8G4cENx
 manifold_version=2023.1.0
 toml_version=3.6.4
 nightconfig_version=3.6.6
-javafx_version=19
+flatlaf_version=3.0
 svgSalamander_version=1.1.3
 
 log4j_version=2.19.0