From bafb178bc1987d3d68ffd103ea1181c7008030a8 Mon Sep 17 00:00:00 2001 From: "GuavaDealer (Idan Nehama)" Date: Sat, 26 Sep 2026 02:15:44 +0300 Subject: [PATCH 1/4] pre kotlin fixies :3 --- .gitignore | 61 +++++++++++++++----- .idea/.gitignore | 9 +++ .idea/.name | 1 + .idea/gradle.xml | 21 +++++++ .idea/inspectionProfiles/Project_Default.xml | 7 +++ .idea/misc.xml | 5 ++ .idea/modules.xml | 11 ++++ .idea/vcs.xml | 6 ++ base/build.gradle.kts | 6 +- build.gradle | 7 --- build.gradle.kts | 7 +++ gradle/libs.versions.toml | 43 ++++++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- paper/build.gradle.kts | 12 ++-- platformapi/build.gradle.kts | 4 +- velocity/build.gradle.kts | 12 ++-- 16 files changed, 158 insertions(+), 56 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 build.gradle create mode 100644 build.gradle.kts diff --git a/.gitignore b/.gitignore index 9e4b940..9384b50 100644 --- a/.gitignore +++ b/.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-*/ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..f9f1384 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,9 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +/AndroidProjectSystem.xml +/compiler.xml +/dbnavigator.xml +/discord.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..f36eb4e --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ServerChangelogs diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..84925fb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..284a8db --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e5c2c06 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..61d4257 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..dcb6b8c --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/base/build.gradle.kts b/base/build.gradle.kts index a13c2ae..f397b95 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -1,12 +1,10 @@ plugins { - id("java-library") + `java-library` alias(libs.plugins.lombok) } dependencies { implementation(project(":platformapi")) - // Since SnakeYAML is included in some platforms, it is included as compileOnly here - // The library can be declared as implementation and shadowed on platforms where it is not natively included compileOnly(libs.snakeyaml) compileOnly(libs.adventure.api) compileOnly(libs.adventure.slf4j) @@ -19,4 +17,4 @@ dependencies { java { toolchain.languageVersion = JavaLanguageVersion.of(25) -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 0855da7..0000000 --- a/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -subprojects { - repositories { - mavenCentral() - maven { url = "https://repo.codemc.io/repository/maven-releases/" } - maven { url = "https://libraries.minecraft.net" } - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..fbfc06b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,7 @@ +subprojects { + repositories { + mavenCentral() + maven("https://repo.codemc.io/repository/maven-releases/") + maven("https://libraries.minecraft.net") + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 964ed51..be0baf3 100644 --- a/gradle/libs.versions.toml +++ b/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.0.2" +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"} \ No newline at end of file +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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a351597..c42672d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index ecb3bb0..02e47a1 100644 --- a/paper/build.gradle.kts +++ b/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 { @@ -11,11 +11,12 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") } +@Suppress("VulnerableLibrariesLocal") 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 +36,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") } diff --git a/platformapi/build.gradle.kts b/platformapi/build.gradle.kts index 335558b..ae0c32a 100644 --- a/platformapi/build.gradle.kts +++ b/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) -} \ No newline at end of file +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 2658ca4..3a3be57 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -4,8 +4,8 @@ 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 { @@ -13,11 +13,12 @@ repositories { 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()) } } From d927a286fbd09fc9a31ce2731a1790ebfdf09433 Mon Sep 17 00:00:00 2001 From: codingcat2468 Date: Sun, 27 Sep 2026 22:51:04 +0200 Subject: [PATCH 2/4] Exclude idea config --- .idea/.gitignore | 9 --------- .idea/.name | 1 - .idea/gradle.xml | 21 --------------------- .idea/misc.xml | 5 ----- .idea/modules.xml | 11 ----------- .idea/vcs.xml | 6 ------ 6 files changed, 53 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index f9f1384..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -/AndroidProjectSystem.xml -/compiler.xml -/dbnavigator.xml -/discord.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index f36eb4e..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ServerChangelogs diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 84925fb..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e5c2c06..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 61d4257..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index dcb6b8c..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - From 5e86ba0e1caf74f69285e88e1e08e547614029ec Mon Sep 17 00:00:00 2001 From: codingcat2468 Date: Sun, 27 Sep 2026 22:54:37 +0200 Subject: [PATCH 3/4] Build file fixes --- base/build.gradle.kts | 2 ++ paper/build.gradle.kts | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base/build.gradle.kts b/base/build.gradle.kts index f397b95..b1c4203 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -5,6 +5,8 @@ plugins { dependencies { implementation(project(":platformapi")) + // Since SnakeYAML is included in some platforms, it is included as compileOnly here + // The library can be declared as implementation and shadowed on platforms where it is not natively included compileOnly(libs.snakeyaml) compileOnly(libs.adventure.api) compileOnly(libs.adventure.slf4j) diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 02e47a1..feea179 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -11,7 +11,6 @@ repositories { maven("https://repo.papermc.io/repository/maven-public/") } -@Suppress("VulnerableLibrariesLocal") dependencies { implementation(project(":base")) implementation(project(":platformapi")) From 78590ff67c9ca36ad6b4027f1f8449f043967a6b Mon Sep 17 00:00:00 2001 From: codingcat2468 Date: Sun, 27 Sep 2026 22:59:21 +0200 Subject: [PATCH 4/4] Update/fix run-task version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be0baf3..968f37d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ mojang-brigadier = "1.3.10" packetevents = "2.14.0" paper-api = "26.1.2.build.+" resource-factory = "1.3.1" -run-task = "3.0.2" +run-task = "3.1.0" shadow = "9.6.1" slf4j = "2.0.18" snakeyaml = "2.7"