Merge branch 'main' of https://gitlab.com/jeseibel/distant-horizons

build.gradle

@@ -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")
@@ -302,7 +305,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"

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java

@@ -29,9 +29,15 @@ public class ModChecker implements IModChecker
 	public static final ModChecker INSTANCE = new ModChecker();
 	
 	@Override
-	public boolean isModLoaded(String modid)
+	public boolean isModLoaded(String modid) 
 	{
-		return ModList.get().isLoaded(modid);
+		return ModList.get().isLoaded(modid); 
+	}
+	
+	@Override
+	public File modLocation(String modid) 
+	{
+		return ModList.get().getModFileById(modid).getFile().getFilePath().toFile(); 
 	}
 	
 	@Override

versionProperties/1.16.5.properties

@@ -5,6 +5,7 @@ parchment_version=1.16.5:2022.03.06
 compatible_minecraft_versions=["1.16.4", "1.16.5"]
 accessWidenerVersion=1_16
 builds_for=fabric,forge
+embed_joml=true
 
 # Netty
 netty_version=4.1.25.Final

versionProperties/1.17.1.properties

@@ -5,6 +5,7 @@ parchment_version=1.17.1:2021.12.12
 compatible_minecraft_versions=["1.17", "1.17.1"]
 accessWidenerVersion=1_17
 builds_for=fabric,forge
+embed_joml=true
 
 # Netty
 netty_version=4.1.25.Final

versionProperties/1.18.2.properties

@@ -5,6 +5,7 @@ parchment_version=1.18.2:2022.11.06
 compatible_minecraft_versions=["1.18.2"]
 accessWidenerVersion=1_18
 builds_for=fabric,forge
+embed_joml=true
 
 # Netty
 netty_version=4.1.68.Final

versionProperties/1.19.2.properties

@@ -5,6 +5,7 @@ parchment_version=1.19.2:2022.11.27
 compatible_minecraft_versions=["1.19.2"]
 accessWidenerVersion=1_19_2
 builds_for=fabric,forge
+embed_joml=true
 
 # Netty
 netty_version=4.1.77.Final