diff --git a/Readme.md b/Readme.md index 5d2e8df03..f746e7247 100644 --- a/Readme.md +++ b/Readme.md @@ -89,7 +89,7 @@ This branch support 4 built versions: - 1.18.2 - 1.18.1 (which also runs on 1.18) - 1.17.1 (which also runs on 1.17) - - 1.16.5 (which also runs 1.16.5) + - 1.16.5 (which also runs 1.16.4) To switch between active versions, change `mcVer=1.?` in `gradle.properties` file. diff --git a/build.gradle b/build.gradle index 8676c7084..65c844e4d 100644 --- a/build.gradle +++ b/build.gradle @@ -133,7 +133,7 @@ subprojects { p -> // Toml & Json for config implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") - implementation("com.googlecode.json-simple:json-simple:1.1.1") + implementation("com.googlecode.json-simple:json-simple:${rootProject.json_version}") if (p != project(":forge")) { // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies diff --git a/fabric/build.gradle b/fabric/build.gradle index 6d7dbe70f..ec4c0e315 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -52,9 +52,11 @@ dependencies { // Sodium addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium) - implementation "org.joml:joml:1.10.2" - modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version)) - modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version)) + if (rootProject.enable_sodium != "0") { + implementation "org.joml:joml:1.10.2" + modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version)) + modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version)) + } // Lithium addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium) @@ -85,7 +87,7 @@ dependencies { // Toml & Json for config shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {} - shadowMe("com.googlecode.json-simple:json-simple:1.1.1") {} + shadowMe("com.googlecode.json-simple:json-simple:${rootProject.json_version}") {} common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/forge/build.gradle b/forge/build.gradle index 745f7e7ac..9f8697ec9 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -48,7 +48,7 @@ dependencies { // Toml & Json for config shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {} - shadowMe("com.googlecode.json-simple:json-simple:1.1.1") {} + shadowMe("com.googlecode.json-simple:json-simple:${rootProject.json_version}") {} // Compression forgeDependencies('org.tukaani:xz:1.9') diff --git a/gradle.properties b/gradle.properties index d7769e480..84a50ac43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,9 @@ mod_source=https://gitlab.com/jeseibel/minecraft-lod-mod/ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues # Global Plugin versions -toml_version=3.6.4 -manifold_version=2022.1.7 +toml_version=3.6.5 +json_version=1.1.1 +manifold_version=2022.1.11 mcVersions=1.16.5,1.17.1,1.18.1,1.18.2 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: