pre kotlin fixies :3 (build & versioning cleanup)

.gitignore

@@ -1,21 +1,50 @@
-# MacOS DS_Store files
-.DS_Store
-
-# Gradle cache folder
+### Gradle ###
 .gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+.intellijPlatform/
 
-# Gradle build folder
-build
-
-# IntelliJ
-out/
-.idea
+### IntelliJ IDEA ###
+*.iws
 *.iml
-# mpeltonen/sbt-idea plugin
-.idea_modules/
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Kotlin ###
+.kotlin/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans (A.K.A. Prism Launcher) ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+### Local Data ###
+.env
 
-# Common working directory
-run
+### run ###
+run/
+run-*/

base/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("java-library")
+    `java-library`
     alias(libs.plugins.lombok)
 }
 
@@ -19,4 +19,4 @@ dependencies {
 
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(25)
-}
+}

build.gradle.kts

@@ -0,0 +1,7 @@
+subprojects {
+    repositories {
+        mavenCentral()
+        maven("https://repo.codemc.io/repository/maven-releases/")
+        maven("https://libraries.minecraft.net")
+    }
+}

gradle/libs.versions.toml

@@ -1,15 +1,34 @@
+[versions]
+adventure = "5.2.0"
+lombok = "9.7.0"
+mojang-brigadier = "1.3.10"
+packetevents = "2.14.0"
+paper-api = "26.1.2.build.+"
+resource-factory = "1.3.1"
+run-task = "3.1.0"
+shadow = "9.6.1"
+slf4j = "2.0.18"
+snakeyaml = "2.7"
+velocity-api = "3.5.0-SNAPSHOT"
+
 [libraries]
-adventure-api = { group = "net.kyori", name = "adventure-api", version = "5.2.0" }
-adventure-slf4j = { group = "net.kyori", name = "adventure-text-logger-slf4j", version = "5.2.0" }
-adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version = "5.2.0" }
-adventure-gson = { group = "net.kyori", name = "adventure-text-serializer-gson", version = "5.2.0" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version = "2.0.18" }
-mojang-brigadier = { group = "com.mojang", name = "brigadier", version = "1.3.10" }
-packetevents-api = { group = "com.github.retrooper", name = "packetevents-api", version = "2.13.0" }
-snakeyaml = { group = "org.yaml", name = "snakeyaml", version = "2.2" }
-packetevents-paper = { group = "com.github.retrooper", name = "packetevents-spigot", version = "2.13.0" }
-packetevents-velocity = { group = "com.github.retrooper", name = "packetevents-velocity", version = "2.13.0" }
+adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
+adventure-slf4j = { module = "net.kyori:adventure-text-logger-slf4j", version.ref = "adventure" }
+adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
+adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+mojang-brigadier = { module = "com.mojang:brigadier", version.ref = "mojang-brigadier" }
+packetevents-api = { module = "com.github.retrooper:packetevents-api", version.ref = "packetevents" }
+snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
+packetevents-paper = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetevents" }
+packetevents-velocity = { module = "com.github.retrooper:packetevents-velocity", version.ref = "packetevents" }
+paper-api = { module = "io.papermc.paper:paper-api", version.ref = "paper-api" }
+velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity-api" }
 
 [plugins]
-lombok = { id = "io.freefair.lombok", version = "9.5.0"}
-shadow = { id = "com.gradleup.shadow", version = "9.6.1"}
+lombok = { id = "io.freefair.lombok", version.ref = "lombok" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-task" }
+run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-task" }
+resource-factory-paper-convention = { id = "xyz.jpenilla.resource-factory-paper-convention", version.ref = "resource-factory" }
+resource-factory-velocity-convention = { id = "xyz.jpenilla.resource-factory-velocity-convention", version.ref = "resource-factory" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

paper/build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
-    id("java")
+    java
     alias(libs.plugins.lombok)
     alias(libs.plugins.shadow)
-    id("xyz.jpenilla.run-paper") version "3.0.2"
-    id("xyz.jpenilla.resource-factory-paper-convention") version "1.3.1"
+    alias(libs.plugins.run.paper)
+    alias(libs.plugins.resource.factory.paper.convention)
 }
 
 repositories {
@@ -15,7 +15,7 @@ dependencies {
     implementation(project(":base"))
     implementation(project(":platformapi"))
     compileOnly(libs.packetevents.paper)
-    compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
+    compileOnly(libs.paper.api)
 }
 
 paperPluginYaml {
@@ -35,9 +35,6 @@ java {
 
 tasks {
     runServer {
-        // Configure the Minecraft version for our task.
-        // This is the only required configuration besides applying the plugin.
-        // Your plugin's jar (or shadowJar if present) will be used automatically.
         minecraftVersion(project.property("minecraft_version").toString())
         jvmArgs("-Xms1G", "-Xmx1G")
     }

platformapi/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("java-library")
+    `java-library`
     alias(libs.plugins.lombok)
 }
 
@@ -12,4 +12,4 @@ dependencies {
 
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(25)
-}
+}

velocity/build.gradle.kts

@@ -4,20 +4,21 @@ plugins {
     id("java")
     alias(libs.plugins.lombok)
     alias(libs.plugins.shadow)
-    id("xyz.jpenilla.run-velocity") version "3.0.2"
-    id("xyz.jpenilla.resource-factory-velocity-convention") version "1.3.1"
+    alias(libs.plugins.run.velocity)
+    alias(libs.plugins.resource.factory.velocity.convention)
 }
 
 repositories {
     mavenCentral()
     maven("https://repo.papermc.io/repository/maven-public/")
 }
 
+@Suppress("VulnerableLibrariesLocal")
 dependencies {
     implementation(project(":base"))
     implementation(project(":platformapi"))
     compileOnly(libs.packetevents.velocity)
-    compileOnly("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
+    compileOnly(libs.velocity.api)
 }
 
 velocityPluginJson {
@@ -36,9 +37,6 @@ java {
 
 tasks {
     runVelocity {
-        // Configure the Velocity version for our task.
-        // This is the only required configuration besides applying the plugin.
-        // Your plugin's jar (or shadowJar if present) will be used automatically.
-        velocityVersion("3.5.0-SNAPSHOT")
+        velocityVersion(libs.versions.velocity.api.get())
     }
 }