From a1ffa2e099eeba4e62321444916a4eaf8d36765c Mon Sep 17 00:00:00 2001 From: comp500 Date: Tue, 23 Nov 2021 19:13:54 +0000 Subject: [PATCH] Update Sodium dependency, bump version and dep requirement --- build.gradle | 14 +++++++++++++- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 365ff4a..7f511fb 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,19 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. - modImplementation "maven.modrinth:sodium:mc1.17.1-0.3.0" + // Use development builds of Sodium on the main branch + if (grgit != null && grgit.branch.current().name.contains("/main")) { + // Note: yarn version must be the same as Indium's dev env + // Jitpack doesn't work with Gradle 7, so this is the easiest solution + implementation("me.jellysquid.mods:sodium-fabric") { + version { + branch = "1.17.x/dev" + } + transitive = false + } + } else { + modImplementation "maven.modrinth:sodium:mc1.17.1-0.3.3" + } // Transitive dependency of Sodium implementation("org.joml:joml:1.10.2") diff --git a/gradle.properties b/gradle.properties index 2d6ad23..8a39853 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.17.1 yarn_mappings=1.17.1+build.1 loader_version=0.11.6 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=link.infra archives_base_name=indium # Dependencies diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7bbd313..67740bb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "depends": { "fabricloader": ">=0.8.0", "minecraft": "1.17.x", - "sodium": "~0.3.0", + "sodium": "~0.3.3", "fabric-renderer-api-v1": ">=0.3.0" } }