From 43476ba91efd1fa4a4cee2f4be2f8b60d475e9aa Mon Sep 17 00:00:00 2001
From: Pyrofab <pyrofab@ladysnake.org>
Date: Tue, 2 Jan 2024 13:24:56 +0100
Subject: [PATCH] Update dependencies

---
 build.gradle                      | 17 +++++++++++------
 changelog.md                      |  1 +
 gradle.properties                 |  8 +-------
 gradle/libs.versions.toml         | 14 ++++++++++++++
 src/main/resources/quilt.mod.json | 14 ++++++++++++++
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2af8dba0..c21ad135 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,6 +49,9 @@ repositories {
 	maven {
 		name "modrinth"
 		url "https://api.modrinth.com/maven"
+		content {
+			includeGroup('maven.modrinth')
+		}
 	}
 
 	maven { url 'https://masa.dy.fi/maven' }
@@ -83,22 +86,24 @@ dependencies {
 	}
 
 	// midnightlib
-	modImplementation include("maven.modrinth:midnightlib:${midnightlib_version}-quilt")
+	modImplementation(libs.midnightLib)
+	include(libs.midnightLib)
 
 	// satin
-	modImplementation include("org.ladysnake:satin:${satin_version}") {
+	modImplementation(libs.satin) {
 		exclude group: 'net.fabricmc'
 	}
+	include(libs.satin)
 
 	// lodestone lib
-	modImplementation include("team.lodestar.lodestone:LodestoneLib-Quilt:${lodestone_version}") {
+	modImplementation(libs.lodestoneLib) {
 		exclude group: 'io.github.ladysnake'
 	}
+	include(libs.lodestoneLib)
 
 	// iris and sodium
-	modCompileOnly("maven.modrinth:sodium:${project.sodium_version}")
-	modRuntimeOnly("maven.modrinth:sodium:${project.sodium_version}")
-	modRuntimeOnly("maven.modrinth:iris:${project.iris_version}")
+	modLocalImplementation(libs.sodium)
+	modLocalImplementation(libs.iris)
 	runtimeOnly compileOnly("org.anarres:jcpp:1.4.14") // for iris
 }
 
diff --git a/changelog.md b/changelog.md
index b3d22968..df9652b2 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ Brought to you on 1.20.1 by the combined efforts of SzczurekYT and Motschen (big
 - Updated to 1.20.1
 - Updated config screen
 - Added Swedish localization (Thanks Dontknow09 !)
+- Fixed crash when Satin was not installed separately
 - *Dev thing: changed maven group and package to `org.ladysnake`*
 
 ------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 5097496d..a4a6e2d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,13 +7,7 @@ version = 3.0.0
 maven_group = org.ladysnake
 archives_base_name = effective
 
-#Mod Depencencies
-mod_menu_version=7.2.1
-sodium_version=mc1.20.1-0.5.1
-iris_version=1.6.7+1.20.1
-satin_version = 1.14.0
-midnightlib_version= 1.4.1
-lodestone_version = 0.0.4+1.20.1
+### For dependencies, look at gradle/libs.versions.toml
 
 # Release metadata
 modrinth_id = pcPXJeZi
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eea4e486..a9b685cc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,14 @@ quilt-loader = "0.23.0-beta.1"
 
 quilt-quiltedFabricApi = "7.1.1+0.86.1-1.20.1"
 
+# Third party dependencies
+# The latest versions should be available at https://ladysnake.org/tools/dependencies
+iris = "1.6.11+1.20.1"
+lodestoneLib = "0.0.4+1.20.1"
+midnightLib = "1.4.1-quilt"
 modmenu = "7.2.2"
+satin = "1.14.0"
+sodium = "mc1.20.1-0.5.3"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -16,7 +23,14 @@ quilt-loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt-loade
 
 quilt-quiltedFabricApi = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilt-quiltedFabricApi" }
 quilt-quiltedFabricApi-deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilt-quiltedFabricApi" }
+
+# Third party dependencies
+iris = { module = "maven.modrinth:iris", version.ref = "iris" }
+lodestoneLib = { module = "team.lodestar.lodestone:LodestoneLib-Quilt", version.ref = "lodestoneLib" }
+midnightLib = { module = "maven.modrinth:midnightlib", version.ref = "midnightLib" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu"}
+satin = { module = "org.ladysnake:satin", version.ref = "satin" }
+sodium = { module = "maven.modrinth:sodium", version.ref = "sodium"}
 
 # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 [bundles]
diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
index eed52725..ca92c982 100644
--- a/src/main/resources/quilt.mod.json
+++ b/src/main/resources/quilt.mod.json
@@ -47,6 +47,20 @@
 			{
 				"id": "lodestone",
 				"versions": "*"
+			},
+			{
+				"id": "midnightlib",
+				"versions": "*"
+			},
+			{
+				"id": "satin",
+				"versions": "*"
+			}
+		],
+		"breaks": [
+			{
+				"id": "sodium",
+				"versions": "<0.5.0"
 			}
 		]
 	},