From 46838337176ef4f8366e1a2ace24ef2f9a73ef53 Mon Sep 17 00:00:00 2001
From: LostLuma <lilly@lostluma.net>
Date: Wed, 18 Oct 2023 14:46:04 +0200
Subject: [PATCH] Properly use dependency catalog in build script, Loom 1.4

---
 build.gradle              | 15 ++++++++++++---
 gradle/libs.versions.toml | 15 ++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9f554a2..da75c41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,15 @@ base {
 	archivesName = project.archives_base_name
 }
 
+loom {
+	mods {
+		"server_stats" {
+			sourceSet("main")
+			dependency(libs.gson.get())
+		}
+	}
+}
+
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
@@ -28,11 +37,11 @@ dependencies {
 	minecraft libs.minecraft
 
 	mappings loom.layered {
-		mappings "net.ornithemc:feather:${libs.versions.minecraft.get()}+build.${libs.versions.feather.build.get()}:v2"
-		addLayer ploceus.nestedMappings()
+		mappings variantOf(libs.feather) { classifier("v2") }
+		addLayer ploceus.nestedMappings() // Required for nests
 	}
-	nests "net.ornithemc:nests:${libs.versions.minecraft.get()}+build.${libs.versions.nests.build.get()}"
 
+	nests libs.nests
 	modImplementation libs.quilt.loader
 
 	shadow libs.gson
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d6d5fd6..55d8c31 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,9 @@
 [versions]
-# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 minecraft = "1.3.2"
-quilt_loader = "0.19.2"
+quilt_loader = "0.20.2"
 
-feather_build = "11"
-nests_build = "1"
+nests = "1.3.2+build.1"
+feather = "1.3.2+build.11"
 
 gson = "2.10.1"
 
@@ -12,12 +11,14 @@ gson = "2.10.1"
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
 
+nests = { module = "net.ornithemc:nests", version.ref = "nests" }
+feather = { module = "net.ornithemc:feather", version.ref = "feather" }
+
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
-# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
 [bundles]
 
 [plugins]
-ploceus = { id = "ploceus", version = "1.3.6" }
-quilt_loom = { id = "org.quiltmc.loom", version = "1.3.1" }
+ploceus = { id = "ploceus", version = "1.4.2" }
+quilt_loom = { id = "org.quiltmc.loom", version = "1.4.1" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }