diff --git a/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt b/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt index 8fea37a9c..df66ef78c 100644 --- a/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt +++ b/buildSrc/src/main/kotlin/dev/engine_room/gradle/subproject/SubprojectPlugin.kt @@ -99,6 +99,7 @@ class SubprojectPlugin: Plugin { private fun setupDependencies(project: Project) { project.dependencies.apply { val minecraft_version: String by project + val parchment_minecraft_version: String by project val parchment_version: String by project val loom = project.the() @@ -106,7 +107,7 @@ class SubprojectPlugin: Plugin { add("mappings", loom.layered { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip") + parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip") }) add("api", "com.google.code.findbugs:jsr305:3.0.2") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 3f9247a3f..de32f0ef5 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -72,7 +72,7 @@ jarSets { dependencies { modCompileOnly("net.fabricmc:fabric-loader:${property("fabric_loader_version")}") - modCompileOnly(":sodium-fabric-0.6.0-beta.2+mc1.21.1") + modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-fabric") testImplementation("org.junit.jupiter:junit-jupiter:5.8.1") } diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 3fb91957c..0e6bc0621 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -72,7 +72,7 @@ dependencies { modImplementation("net.fabricmc:fabric-loader:${property("fabric_loader_version")}") modApi("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}") - modCompileOnly(":sodium-fabric-0.6.0-beta.2+mc1.21.1") + modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-fabric") modCompileOnly("maven.modrinth:iris:${property("iris_version")}-fabric") "forApi"(project(path = ":common", configuration = "commonApiOnly")) diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index af5bb02bb..8ecf5d447 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -82,7 +82,7 @@ repositories { dependencies { neoForge("net.neoforged:neoforge:${property("neoforge_version")}") - modCompileOnly(":sodium-neoforge-0.6.0-beta.2+mc1.21.1") + modCompileOnly("maven.modrinth:sodium:${property("sodium_version")}-neoforge") modCompileOnly("maven.modrinth:iris:${property("iris_version")}-neoforge") "forApi"(project(path = ":common", configuration = "commonApiOnly")) diff --git a/gradle.properties b/gradle.properties index 2986c22f9..04e0c97fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,16 +21,17 @@ neoforge_version_range = [21.1.66,) java_version = 21 arch_loom_version = 1.7.412 cursegradle_version = 1.4.0 +parchment_minecraft_version = 1.21 parchment_version = 2024.07.07 # Minecraft build dependency versions minecraft_version = 1.21.1 neoforge_version = 21.1.66 fabric_loader_version = 0.16.5 -fabric_api_version = 0.105.0+1.21 +fabric_api_version = 0.105.0+1.21.1 # Build dependency mod versions -sodium_version = mc1.21-0.6.0-beta.1 +sodium_version = mc1.21-0.6.0-beta.2 iris_version = 1.8.0-beta.1+1.21 # Publication info diff --git a/libs/sodium-fabric-0.6.0-beta.2+mc1.21.1.jar b/libs/sodium-fabric-0.6.0-beta.2+mc1.21.1.jar deleted file mode 100644 index 537f16846..000000000 Binary files a/libs/sodium-fabric-0.6.0-beta.2+mc1.21.1.jar and /dev/null differ diff --git a/libs/sodium-neoforge-0.6.0-beta.2+mc1.21.1.jar b/libs/sodium-neoforge-0.6.0-beta.2+mc1.21.1.jar deleted file mode 100644 index 0dd80d861..000000000 Binary files a/libs/sodium-neoforge-0.6.0-beta.2+mc1.21.1.jar and /dev/null differ