Merge branch 'main' of https://gitlab.com/jeseibel/minecraft-lod-mod

Readme.md

@@ -193,8 +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
-
-FlatLaf for Java Swing theming (for development testing, may remove later, and not included in compiled jars)\
-https://www.formdev.com/flatlaf/

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}")
+        // SVG (not needed atm)
+//        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
         
         // Netty
         // Breaks 1.16.5
@@ -308,11 +304,8 @@ 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"
+        // SVG (not needed atm)
+//        relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"
         
         // Netty
         relocate "io.netty", "${librariesLocation}.netty"

fabric/build.gradle

@@ -54,12 +54,11 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
     // Fabric API
-    addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
     addModJar(fabricApi.module("fabric-api-base", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
     addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-entity-events-v1", rootProject.fabric_api_version))
 

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -96,7 +96,7 @@ public class SodiumAccessor implements ISodiumAccessor
 		LevelAccessor height = Minecraft.getInstance().level;
 		// TODO: Maybe use a mixin to make this more efficient
 		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> {
-			FakeChunkEntity AABB = new FakeChunkEntity(chunk.getX(), chunk.getZ(), height.getMaxBuildHeight());
+			FakeChunkEntity AABB = new FakeChunkEntity(chunk.x, chunk.z, height.getMaxBuildHeight());
 			return (renderer.isEntityVisible(AABB));
 		}).collect(Collectors.toCollection(HashSet::new));
 	}

fabric/src/main/resources/fabric.mod.json

@@ -39,7 +39,6 @@
         "fabricloader": "*",
         "fabric-api-base": "*",
         "fabric-lifecycle-events-v1": "*",
-        "fabric-key-binding-api-v1": "*",
         "fabric-resource-loader-v0": "*",
         "minecraft": $compatible_minecraft_versions,
         "java": ">=${java_version}"

forge/src/main/resources/META-INF/mods.toml

@@ -8,7 +8,7 @@ issueTrackerURL = "${issues}"
     modId = "distanthorizons" #//mandatory
     version = "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
     displayName = "${mod_name}" #//mandatory
-    authors = ["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
+    authors = ["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"] # Should be done with `$authors`, but architectury complains
     #//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
     displayURL = "${homepage}"
     description = "${description}" #//mandatory. The description text for the mod