wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed joml being embedded on versions where mc already embeds it

Browse Source
This commit is contained in:
coolGi
2024-02-08 17:47:13 +10:30
parent 0ccdcfbb6d
commit 6a6a87a3f7
6 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+6 -2
View File
@@ -200,7 +200,10 @@ subprojects { p ->
implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
// JOML
forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
if (project.hasProperty("embed_joml") && embed_joml == "true")
forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
else
implementation("org.joml:joml:${rootProject.joml_version}")
// JUnit tests
implementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -300,7 +303,8 @@ subprojects { p ->
// relocate "org.sqlite", "${librariesLocation}.sqlite"
// JOML
relocate "org.joml", "${librariesLocation}.joml"
if (project.hasProperty("embed_joml") && embed_joml == "true")
relocate "org.joml", "${librariesLocation}.joml"
// NightConfig (includes Toml & Json)
relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"