Move versions to version catalog

build.gradle.kts

@@ -1,9 +1,9 @@
 import com.gradle.enterprise.gradleplugin.GradleEnterpriseExtension
 
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.7.2" apply false
+    alias(libs.plugins.paper.userdev) apply false
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    alias(libs.plugins.shadow) apply false
-    id("xyz.jpenilla.run-paper") version "2.2.2" apply false
+    alias(libs.plugins.runpaper) apply false
 }
 
 project.extensions.configure<GradleEnterpriseExtension> {

gradle/libs.versions.toml

@@ -1,5 +1,49 @@
 [versions]
 paper = "1.21.3-R0.1-SNAPSHOT"
+junit = "5.8.2"
+nuotifier = "2.7.2"
+
+[plugins]
+paper-userdev = { id = "io.papermc.paperweight.userdev", version = "1.7.2" }
+shadow = {  id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+runpaper = { id = "xyz.jpenilla.run-paper", version = "2.2.2" }
 
 [libraries]
 paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
+
+aikar-acf = { group = "co.aikar", name = "acf-bukkit", version = "0.5.1-SNAPSHOT" }
+aikar-taskchain = { group = "co.aikar", name = "taskchain-bukkit", version = "3.7.2" }
+
+commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version = "3.12.0" }
+commons-collections4 = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" }
+commons-math3 = { group = "org.apache.commons", name = "commons-math3", version = "3.6.1" }
+
+rabbitmq-client = { group = "com.rabbitmq", name = "amqp-client", version = "5.17.1" }
+
+nuvotifier-api = { group = "com.github.NuVotifier.NuVotifier", name = "nuvotifier-api", version.ref = "nuotifier" }
+nuvotifier-bukkit = { group = "com.github.NuVotifier.NuVotifier", name = "nuvotifier-bukkit", version.ref = "nuotifier" }
+
+vault-api = { group = "com.github.MilkBowl", name = "VaultAPI", version = "1.7" }
+luckperms-api = { group = "net.luckperms", name = "api", version = "5.0" }
+
+aswm-api = { group = "com.infernalsuite.aswm", name = "api", version = "3.0.0-SNAPSHOT"}
+
+# TODO
+brewery = { group = "com.github.DieReicheErethons", name = "Brewery", version = "3.1" }
+breweryx = { group = "com.github.Jsinco", name = "BreweryX", version = "3.3.2" }
+
+worldedit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version = "7.2.8" }
+datafixerupper = { group = "com.mojang", name = "datafixerupper", version = "1.0.20" }
+hikaricp = { group = "com.zaxxer", name = "HikariCP", version = "5.0.1" }
+fastutil = { group = "it.unimi.dsi", name = "fastutil", version = "8.5.8" }
+protocollib = { group = "com.comphenix.protocol", name = "ProtocolLib", version = "5.2.0-SNAPSHOT" }
+barapi = { group = "me.confuser", name = "BarAPI", version = "3.5" }
+ipaddress = { group = "com.github.seancfoley", name = "ipaddress", version = "2.0.2" }
+jsoup = { group = "org.jsoup", name = "jsoup", version = "1.18.3" }
+
+junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
+junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
+
+[bundles]
+junit = ["junit-api", "junit-engine"]
+nuvotifier = ["nuvotifier-api", "nuvotifier-bukkit"]

plugins/banstick-paper/build.gradle.kts

@@ -13,6 +13,6 @@ dependencies {
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:namelayer-paper"))
 
-    implementation("com.github.seancfoley:ipaddress:2.0.2")
+    implementation(libs.ipaddress)
-    implementation("org.jsoup:jsoup:1.13.1")
+    implementation(libs.jsoup)
 }

plugins/citadel-paper/build.gradle.kts

@@ -12,5 +12,5 @@ dependencies {
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:namelayer-paper"))
 
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
+    compileOnly(libs.protocollib)
 }

plugins/civduties-paper/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
     }
 
     compileOnly(project(":plugins:civmodcore-paper"))
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7")
     compileOnly(project(":plugins:combattagplus-paper"))
+
+    compileOnly(libs.vault.api)
 }

plugins/civmodcore-paper/build.gradle.kts

@@ -11,15 +11,14 @@ dependencies {
         paperDevBundle(libs.versions.paper)
     }
 
-    api("co.aikar:acf-bukkit:0.5.1-SNAPSHOT")
+    api(libs.aikar.acf)
-    api("com.mojang:datafixerupper:1.0.20")
+    api(libs.aikar.taskchain)
-    api("com.zaxxer:HikariCP:5.0.1")
+    api(libs.datafixerupper)
-    api("co.aikar:taskchain-bukkit:3.7.2")
+    api(libs.hikaricp)
-    api("org.apache.commons:commons-lang3:3.12.0")
+    api(libs.commons.lang3)
-    api("org.apache.commons:commons-collections4:4.4")
+    api(libs.commons.collections4)
 
-    compileOnly("it.unimi.dsi:fastutil:8.5.8")
+    compileOnly(libs.fastutil)
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
+    testImplementation(libs.bundles.junit)
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
 }

plugins/combattagplus-paper/build.gradle.kts

@@ -10,5 +10,5 @@ dependencies {
         paperDevBundle(libs.versions.paper)
     }
 
-    compileOnly("me.confuser:BarAPI:3.5")
+    compileOnly(libs.barapi)
 }

plugins/essenceglue-paper/build.gradle.kts

@@ -10,8 +10,8 @@ dependencies {
     }
 
     compileOnly(project(":plugins:civmodcore-paper"))
-    compileOnly("com.github.NuVotifier.NuVotifier:nuvotifier-bukkit:2.7.2")
-    compileOnly("com.github.NuVotifier.NuVotifier:nuvotifier-api:2.7.2")
     compileOnly(project(":plugins:banstick-paper"))
     compileOnly(project(":plugins:exilepearl-paper"))
+
+    compileOnly(libs.bundles.nuvotifier)
 }

plugins/exilepearl-paper/build.gradle.kts

@@ -18,5 +18,5 @@ dependencies {
     compileOnly(project(":plugins:banstick-paper"))
     compileOnly(project(":plugins:randomspawn-paper"))
 
-    compileOnly("com.github.DieReicheErethons:Brewery:3.1")
+    compileOnly(libs.brewery)
 }

plugins/finale-paper/build.gradle.kts

@@ -18,5 +18,6 @@ dependencies {
     compileOnly(project(":plugins:namelayer-paper"))
     compileOnly(project(":plugins:citadel-paper"))
     compileOnly(project(":plugins:combattagplus-paper"))
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-20231209.220838-1")
+
+    compileOnly(libs.protocollib)
 }

plugins/kirabukkitgateway-paper/build.gradle.kts

@@ -10,10 +10,11 @@ dependencies {
         paperDevBundle(libs.versions.paper)
     }
 
-    api("com.rabbitmq:amqp-client:5.17.1")
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:namelayer-paper"))
     compileOnly(project(":plugins:civchat2-paper"))
     compileOnly(project(":plugins:jukealert-paper"))
-    compileOnly("net.luckperms:api:5.0")
+
+    api(libs.rabbitmq.client)
+    compileOnly(libs.luckperms.api)
 }

plugins/kitpvp-paper/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
 
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:finale-paper"))
-    compileOnly("com.github.Jsinco:BreweryX:3.3.2")
+
-    compileOnly("com.infernalsuite.aswm:api:3.0.0-SNAPSHOT")
+    compileOnly(libs.breweryx)
+    compileOnly(libs.aswm.api)
 }

plugins/namecolors-paper/build.gradle.kts

@@ -12,5 +12,6 @@ dependencies {
     compileOnly(project(":plugins:civmodcore-paper"))
     compileOnly(project(":plugins:namelayer-paper"))
     compileOnly(project(":plugins:civchat2-paper"))
-    compileOnly(files("../../ansible/src/paper-plugins/TAB v5.0.1.jar"))
+
+    compileOnly(files("../../ansible/src/paper-plugins/TAB v5.0.3.jar"))
 }

plugins/realisticbiomes-paper/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
     }
 
     compileOnly(project(":plugins:civmodcore-paper"))
-    compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.2.8")
+
-    implementation("org.apache.commons:commons-math3:3.6.1")
+    compileOnly(libs.worldedit)
+    implementation(libs.commons.math3)
 }

plugins/simpleadminhacks-paper/build.gradle.kts

@@ -17,5 +17,5 @@ dependencies {
     compileOnly(project(":plugins:bastion-paper"))
     compileOnly(project(":plugins:exilepearl-paper"))
 
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
+    compileOnly(libs.protocollib)
 }