diff --git a/BauSystem/BauSystem_Main/build.gradle.kts b/BauSystem/BauSystem_Main/build.gradle.kts index a452eba4..f51b33cd 100644 --- a/BauSystem/BauSystem_Main/build.gradle.kts +++ b/BauSystem/BauSystem_Main/build.gradle.kts @@ -38,10 +38,10 @@ dependencies { compileOnly(libs.axiom) compileOnly(libs.authlib) - compileOnly(libs.paperapi21) - compileOnly(libs.nms21) + compileOnly(libs.paperapi) + compileOnly(libs.nms) - compileOnly(libs.fawe21) + compileOnly(libs.fawe) compileOnly(libs.netty) implementation(libs.luaj) diff --git a/BauSystem/BauSystem_RegionFixed/build.gradle.kts b/BauSystem/BauSystem_RegionFixed/build.gradle.kts index ccff9662..660bf2d2 100644 --- a/BauSystem/BauSystem_RegionFixed/build.gradle.kts +++ b/BauSystem/BauSystem_RegionFixed/build.gradle.kts @@ -34,13 +34,13 @@ dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) compileOnly(libs.axiom) compileOnly(libs.authlib) compileOnly(libs.viaapi) - compileOnly(libs.nms20) - compileOnly(libs.fawe18) + compileOnly(libs.nms) + compileOnly(libs.fawe) implementation(libs.luaj) implementation(files("$projectDir/../libs/YAPION-SNAPSHOT.jar")) diff --git a/CLI/build.gradle.kts b/CLI/build.gradle.kts index a7ace56c..f27d16b8 100644 --- a/CLI/build.gradle.kts +++ b/CLI/build.gradle.kts @@ -7,11 +7,6 @@ kotlin { jvmToolchain(21) } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - application { mainClass.set("de.steamwar.MainKt") applicationName = "sw" diff --git a/FightSystem/FightSystem_Core/build.gradle.kts b/FightSystem/FightSystem_Core/build.gradle.kts index 90276c67..b346e97c 100644 --- a/FightSystem/FightSystem_Core/build.gradle.kts +++ b/FightSystem/FightSystem_Core/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { compileOnly(project(":SpigotCore", "default")) compileOnly(libs.netty) - compileOnly(libs.paperapi21) + compileOnly(libs.paperapi) compileOnly(libs.fastutil) compileOnly(libs.authlib) - compileOnly(libs.nms21) - compileOnly(libs.fawe21) + compileOnly(libs.nms) + compileOnly(libs.fawe) } diff --git a/KotlinCore/build.gradle.kts b/KotlinCore/build.gradle.kts index c68c5fb5..6c56593d 100644 --- a/KotlinCore/build.gradle.kts +++ b/KotlinCore/build.gradle.kts @@ -31,7 +31,7 @@ tasks.shadowJar { } dependencies { - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) compileOnly(project(":SpigotCore")) implementation(libs.exposedCore) diff --git a/LobbySystem/build.gradle.kts b/LobbySystem/build.gradle.kts index 724fb1ca..a97d8394 100644 --- a/LobbySystem/build.gradle.kts +++ b/LobbySystem/build.gradle.kts @@ -21,20 +21,15 @@ plugins { steamwar.java } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) - compileOnly(libs.nms20) - compileOnly(libs.worldedit15) + compileOnly(libs.nms) + compileOnly(libs.fawe) } tasks.register("DevLobby20") { diff --git a/MissileWars/build.gradle.kts b/MissileWars/build.gradle.kts index 16dc6622..b85213d3 100644 --- a/MissileWars/build.gradle.kts +++ b/MissileWars/build.gradle.kts @@ -21,18 +21,13 @@ plugins { steamwar.java } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) - compileOnly(libs.nms20) - compileOnly(libs.fawe21) + compileOnly(libs.nms) + compileOnly(libs.worldedit) } diff --git a/Realtime/build.gradle.kts b/Realtime/build.gradle.kts index df761ff0..98ae77c9 100644 --- a/Realtime/build.gradle.kts +++ b/Realtime/build.gradle.kts @@ -22,5 +22,5 @@ plugins { } dependencies { - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) } diff --git a/SchematicSystem/build.gradle.kts b/SchematicSystem/build.gradle.kts index 35917af0..b48fc815 100644 --- a/SchematicSystem/build.gradle.kts +++ b/SchematicSystem/build.gradle.kts @@ -27,16 +27,11 @@ tasks.build { finalizedBy(tasks.shadowJar) } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.paperapi21) - compileOnly(libs.worldedit15) + compileOnly(libs.paperapi) + compileOnly(libs.fawe) } diff --git a/SpigotCore/SpigotCore_Main/build.gradle.kts b/SpigotCore/SpigotCore_Main/build.gradle.kts index bbb389c2..4ab7771e 100644 --- a/SpigotCore/SpigotCore_Main/build.gradle.kts +++ b/SpigotCore/SpigotCore_Main/build.gradle.kts @@ -47,14 +47,13 @@ dependencies { compileOnly(project(":CommandFramework", "default")) compileOnly(project(":SpigotCore:CRIUDummy", "default")) - compileOnly(libs.fawe21) + compileOnly(libs.fawe) - compileOnly(libs.paperapi21) - compileOnly(libs.nms21) - compileOnly(libs.authlib2) + compileOnly(libs.paperapi) + compileOnly(libs.nms) + compileOnly(libs.authlib) compileOnly(libs.datafixer) compileOnly(libs.netty) - compileOnly(libs.authlib) compileOnly(libs.brigadier) compileOnly(libs.fastutil) diff --git a/TNTLeague/build.gradle.kts b/TNTLeague/build.gradle.kts index 79a08492..f3b78d69 100644 --- a/TNTLeague/build.gradle.kts +++ b/TNTLeague/build.gradle.kts @@ -25,13 +25,8 @@ kotlin { jvmToolchain(21) } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { - compileOnly(libs.paperapi21) + compileOnly(libs.paperapi) compileOnly(project(":SpigotCore", "default")) compileOnly(project(":KotlinCore", "default")) } \ No newline at end of file diff --git a/Teamserver/build.gradle.kts b/Teamserver/build.gradle.kts index 927bec04..2f563c7e 100644 --- a/Teamserver/build.gradle.kts +++ b/Teamserver/build.gradle.kts @@ -21,18 +21,13 @@ plugins { steamwar.java } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) - compileOnly(libs.worldedit15) + compileOnly(libs.fawe) compileOnly(libs.axiom) } diff --git a/TowerRun/build.gradle.kts b/TowerRun/build.gradle.kts index c080ff63..f94b027c 100644 --- a/TowerRun/build.gradle.kts +++ b/TowerRun/build.gradle.kts @@ -21,11 +21,6 @@ plugins { steamwar.java } -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - dependencies { annotationProcessor(libs.spigotannotations) compileOnly(libs.spigotannotations) @@ -34,8 +29,8 @@ dependencies { compileOnly(project(":SpigotCore", "default")) - compileOnly(libs.nms19) - compileOnly(libs.worldedit15) + compileOnly(libs.nms) + compileOnly(libs.fawe) - compileOnly(libs.spigotapi) + compileOnly(libs.paperapi) } diff --git a/VelocityCore/build.gradle.kts b/VelocityCore/build.gradle.kts index 718b53f0..aa25af17 100644 --- a/VelocityCore/build.gradle.kts +++ b/VelocityCore/build.gradle.kts @@ -26,11 +26,6 @@ tasks.build { finalizedBy(tasks.shadowJar) } -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) diff --git a/buildSrc/src/steamwar.java.gradle b/buildSrc/src/steamwar.java.gradle index 338a496c..c6bb0a35 100644 --- a/buildSrc/src/steamwar.java.gradle +++ b/buildSrc/src/steamwar.java.gradle @@ -22,8 +22,8 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } tasks.compileJava { diff --git a/buildSrc/src/steamwar.kotlin.gradle b/buildSrc/src/steamwar.kotlin.gradle index 791ae677..d75369b0 100644 --- a/buildSrc/src/steamwar.kotlin.gradle +++ b/buildSrc/src/steamwar.kotlin.gradle @@ -27,8 +27,8 @@ kotlin { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } tasks.compileJava { diff --git a/settings.gradle.kts b/settings.gradle.kts index 449dc7fe..c3bdb8b7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -34,6 +34,14 @@ dependencyResolutionManagement { } } + maven { + url = URI("https://maven.enginehub.org/repo") + content { + includeGroup("com.sk89q.worldedit") + includeGroup("com.sk89q.worldedit.worldedit-libs") + } + } + maven { if (isInCi) { url = URI("file:///var/www/maven/") @@ -101,33 +109,18 @@ dependencyResolutionManagement { library("hamcrest", "org.hamcrest:hamcrest:2.2") library("classindex", "org.atteo.classindex:classindex:3.13") - - library("spigotapi", "org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") + library("paperapi", "io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") library("spigotannotations", "org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT") - library("paperapi", "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT") - library("paperapi21", "io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") - library("authlib", "com.mojang:authlib:1.5.25") - library("authlib2", "com.mojang:authlib:6.0.58") + library("authlib", "com.mojang:authlib:6.0.58") library("datafixer", "com.mojang:datafixerupper:4.0.26") library("brigadier", "com.mojang:brigadier:1.0.18") library("anvilgui", "net.wesjd:anvilgui:1.10.6-SNAPSHOT") - library("nms8", "de.steamwar:spigot:1.8") - library("nms9", "de.steamwar:spigot:1.9") - library("nms10", "de.steamwar:spigot:1.10") - library("nms12", "de.steamwar:spigot:1.12") - library("nms14", "de.steamwar:spigot:1.14") - library("nms15", "de.steamwar:spigot:1.15") - library("nms18", "de.steamwar:spigot:1.18") - library("nms19", "de.steamwar:spigot:1.19") - library("nms20", "de.steamwar:spigot:1.20") - library("nms21", "de.steamwar:spigot:1.21.6") + library("nms", "de.steamwar:spigot:1.21.6") library("axiom", "de.steamwar:axiompaper:RELEASE") - library("worldedit12", "de.steamwar:worldedit:1.12") - library("worldedit15", "de.steamwar:worldedit:1.15") - library("fawe18", "de.steamwar:fastasyncworldedit:1.18") - library("fawe21", "de.steamwar:fastasyncworldedit:1.21") + library("worldedit", "com.sk89q.worldedit:worldedit-bukkit:7.3.16") + library("fawe", "de.steamwar:fastasyncworldedit:1.21") library("velocity", "de.steamwar:velocity:RELEASE") library("velocityapi", "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") @@ -161,7 +154,7 @@ dependencyResolutionManagement { library("nbt", "dev.dewy:nbt:1.5.1") - val exposedVersion = "1.0.0-rc-2" + val exposedVersion = "1.3.0" library("exposedCore", "org.jetbrains.exposed:exposed-core:$exposedVersion") library("exposedDao", "org.jetbrains.exposed:exposed-dao:$exposedVersion") library("exposedJdbc", "org.jetbrains.exposed:exposed-jdbc:$exposedVersion")