From fae58503a84facfd9898aac07386952109399296 Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 27 Aug 2023 00:59:36 +0930 Subject: [PATCH 1/2] Removed flatlaf --- Readme.md | 3 --- build.gradle | 7 ------- 2 files changed, 10 deletions(-) diff --git a/Readme.md b/Readme.md index 6875690be..ffc3317bf 100644 --- a/Readme.md +++ b/Readme.md @@ -195,6 +195,3 @@ https://github.com/TheElectronWill/night-config SVG Salamander for SVG support\ https://github.com/blackears/svgSalamander - -FlatLaf for Java Swing theming (for development testing, may remove later, and not included in compiled jars)\ -https://www.formdev.com/flatlaf/ diff --git a/build.gradle b/build.gradle index f40fda823..1c0a778d9 100644 --- a/build.gradle +++ b/build.gradle @@ -223,12 +223,8 @@ subprojects { p -> forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}") forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}") - // Theming - forgeShadowMe("com.formdev:flatlaf:${rootProject.flatlaf_version}") - // SVG forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}") - forgeShadowMe("com.formdev:flatlaf-extras:${rootProject.flatlaf_version}") // Netty // Breaks 1.16.5 @@ -308,9 +304,6 @@ subprojects { p -> // NightConfig (includes Toml & Json) relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig" - // Theming - relocate "com.formdev.flatlaf", "${librariesLocation}.formdev.flatlaf" - // SVG relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg" From 34bb512f030c4e4752e8be390805bd74fec17b3b Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 27 Aug 2023 01:02:05 +0930 Subject: [PATCH 2/2] Disabled SVG from being included in the jar --- Readme.md | 2 +- build.gradle | 8 ++++---- coreSubProjects | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index ffc3317bf..48e52f592 100644 --- a/Readme.md +++ b/Readme.md @@ -193,5 +193,5 @@ https://github.com/lz4/lz4-java NightConfig for Json & Toml (config handling)\ https://github.com/TheElectronWill/night-config -SVG Salamander for SVG support\ +SVG Salamander for SVG support (not being used atm)\ https://github.com/blackears/svgSalamander diff --git a/build.gradle b/build.gradle index 1c0a778d9..7b19a6a3d 100644 --- a/build.gradle +++ b/build.gradle @@ -223,8 +223,8 @@ subprojects { p -> forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}") forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}") - // SVG - forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}") + // SVG (not needed atm) +// forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}") // Netty // Breaks 1.16.5 @@ -304,8 +304,8 @@ subprojects { p -> // NightConfig (includes Toml & Json) relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig" - // SVG - relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg" + // SVG (not needed atm) +// relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg" // Netty relocate "io.netty", "${librariesLocation}.netty" diff --git a/coreSubProjects b/coreSubProjects index 9e4307685..0979d75a5 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 9e43076853b7c20c0b58f003411b7703294b17f1 +Subproject commit 0979d75a5d77ea2abd138ee882d71bd18b2c492f