Use Gradle Version Catalog for deps

Author: Merennor

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-	id("fabric-loom") version "1.14-SNAPSHOT"
+	alias(libs.plugins.fabric.loom)
 	id("maven-publish")
 }
 
 base {
     archivesName = properties["archives_name"] as String
-    version = properties["mod_version"] as String
+    version = libs.versions.mod.version.get()
     group = properties["maven_group"] as String
 }
 
@@ -45,8 +45,8 @@ repositories {
 	// Where Is It, JackFredLib
 	maven {
 		url = uri("https://maven.jackf.red/releases/")
-	// Meteor Client
 	}
+	// Meteor Client
 	maven {
         name = "meteor-maven"
         url = uri("https://maven.meteordev.org/releases")
@@ -61,28 +61,28 @@ repositories {
 
 dependencies {
 	// Fabric
-	minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
-	mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
-	modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
+	minecraft(libs.minecraft)
+	mappings(variantOf(libs.yarn) { classifier("v2") })
+	modImplementation(libs.fabric.loader)
 
 	// Fabric API
-	modImplementation("net.fabricmc.fabric-api:fabric-api:${properties["fabric_version"] as String}")
+	modImplementation(libs.fabric.api)
 
 	// Mixin extras
 	annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.0")
 
 	// Meteor Client
 	modImplementation(files("libs\\baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar"))
-	modImplementation("meteordevelopment:meteor-client:${properties["minecraft_version"] as String}-SNAPSHOT")
-	implementation("org.meteordev:starscript:0.2.5")
-	implementation("meteordevelopment:orbit:0.2.4")
+	modImplementation(libs.meteor.client)
+	implementation(libs.starscript)
+	implementation(libs.orbit)
 
 	// Xaero's Mods
-	modCompileOnly("maven.modrinth:xaeros-world-map:${properties["xwm_fabric_version"] as String}") // Xaero's World Map
-	modCompileOnly("maven.modrinth:xaeros-minimap:${properties["xmm_fabric_version"] as String}") // Xaero's Minimap
+	modCompileOnly(libs.xwm) // Xaero's World Map
+	modCompileOnly(libs.xmm) // Xaero's Minimap
 
 	// Chest Tracker
-	modImplementation("red.jackf:whereisit:${properties["where_is_it_version"] as String}")
+	modImplementation(libs.whereisit)
 }
 
 loom {
@@ -93,7 +93,7 @@ tasks {
     processResources {
         val propertyMap = mapOf(
             "version" to project.version,
-            "mc_version" to project.property("minecraft_version"),
+            "mc_version" to libs.versions.minecraft.get(),
             "gh_hash" to (System.getenv("GITHUB_SHA") ?: ""),
         )
 

gradle.properties

@@ -1,31 +1,5 @@
 org.gradle.jvmargs=-Xmx4G
 
-# Fabric (https://fabricmc.net/versions.html)
-minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.3
-loader_version=0.18.2
-
-# Fabric API
-fabric_version=0.139.5+1.21.11
-
 # Mod Properties
-mod_version=1.21.11_1.0.9.5
 maven_group=nekiplay.meteorplus
-archives_name=meteor-plus
-
-# Dependency Versions
-
-# Xaero's Mods
-# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
-xwm_fabric_version=1.39.17_Fabric_1.21.9
-# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
-xmm_fabric_version=25.2.15_Fabric_1.21.9
-
-# Where Is It (https://modrinth.com/mod/where-is-it/versions)
-where_is_it_version=2.6.4+1.21.2
-# YetAnotherConfigLib (https://github.com/JackFred2/WhereIsIt/blob/1.20.6/gradle.properties)
-yacl_version=3.3.2+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT
-
-# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib/files/all?page=1&pageSize=20)
-malilib_fileid=7130809
-malilib_projectid=303119
+archives_name=meteor-plus

gradle/libs.versions.toml

@@ -0,0 +1,62 @@
+[versions]
+mod-version = "1.21.11_1.0.9.5"
+
+# Fabric (https://fabricmc.net/develop)
+minecraft = "1.21.11"
+yarn-mappings = "1.21.11+build.3"
+fabric-loader = "0.18.2"
+fabric-api = "0.139.5+1.21.11"
+
+# Plugins
+# Loom (https://github.com/FabricMC/fabric-loom)
+loom = "1.14-SNAPSHOT"
+
+# Meteor (https://github.com/MeteorDevelopment/meteor-client)
+meteor = "1.21.11-SNAPSHOT"
+# Starscript (https://github.com/MeteorDevelopment/starscript)
+starscript = "0.2.5"
+# Orbit (https://github.com/MeteorDevelopment/orbit)
+orbit = "0.2.4"
+
+# Xaero's Mods
+# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
+xwm = "1.39.17_Fabric_1.21.9"
+# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
+xmm = "25.2.15_Fabric_1.21.9"
+
+# Where Is It (https://modrinth.com/mod/where-is-it/versions)
+whereisit = "2.6.4+1.21.2"
+# YetAnotherConfigLib (https://github.com/JackFred2/WhereIsIt/blob/1.20.6/gradle.properties)
+yacl = "3.3.2+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT"
+
+# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib)
+malilib = "7130809"
+
+[libraries]
+# Fabric base
+minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
+yarn = { module = "net.fabricmc:yarn", version.ref = "yarn-mappings" }
+fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
+
+# Fabric API
+fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
+
+# Meteor Client
+meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "meteor" }
+starscript = { module = "org.meteordev:starscript", version.ref = "starscript" }
+orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" }
+
+# Xaero's Mods
+xwm = { module = "maven.modrinth:xaeros-world-map", version.ref = "xwm" }
+xmm = { module = "maven.modrinth:xaeros-minimap", version.ref = "xmm" }
+
+# Where Is It
+whereisit = { module = "red.jackf:whereisit", version.ref = "whereisit" }
+# YetAnotherConfigLib
+yacl = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yacl" }
+
+# MaLiLib
+malilib = { module = "curse.maven:303119", version.ref = "malilib" }
+
+[plugins]
+fabric-loom = { id = "fabric-loom", version.ref = "loom" }

settings.gradle

@@ -0,0 +1,12 @@
+pluginManagement {
+	repositories {
+		maven {
+			name = "Fabric"
+			url = uri("https://maven.fabricmc.net/")
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}
+
+rootProject.name = "meteor-plus"