From af77dce7ee772872da3e22f44187ad47c208067e Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Sun, 30 Nov 2025 15:48:01 +0100 Subject: [PATCH] Revert "Fix dependency resolution" This reverts commit 6e79c9c9ca7579c15d1855ff5ababb6649b7a6a6. --- BauSystem/BauSystem_15/build.gradle.kts | 2 +- BauSystem/BauSystem_18/build.gradle.kts | 2 +- BauSystem/BauSystem_19/build.gradle.kts | 2 +- BauSystem/BauSystem_20/build.gradle.kts | 2 +- BauSystem/BauSystem_21/build.gradle.kts | 2 +- BauSystem/BauSystem_Main/build.gradle.kts | 2 +- BauSystem/BauSystem_RegionFixed/build.gradle.kts | 2 +- FightSystem/FightSystem_10/build.gradle.kts | 2 +- FightSystem/FightSystem_12/build.gradle.kts | 2 +- FightSystem/FightSystem_14/build.gradle.kts | 2 +- FightSystem/FightSystem_15/build.gradle.kts | 2 +- FightSystem/FightSystem_18/build.gradle.kts | 2 +- FightSystem/FightSystem_21/build.gradle.kts | 2 +- FightSystem/FightSystem_8/build.gradle.kts | 2 +- FightSystem/FightSystem_9/build.gradle.kts | 2 +- FightSystem/FightSystem_Core/build.gradle.kts | 2 +- LegacyBauSystem/build.gradle.kts | 2 +- LobbySystem/build.gradle.kts | 2 +- MissileWars/build.gradle.kts | 2 +- SchematicSystem/SchematicSystem_15/build.gradle.kts | 2 +- SchematicSystem/SchematicSystem_19/build.gradle.kts | 2 +- SchematicSystem/SchematicSystem_20/build.gradle.kts | 2 +- SchematicSystem/SchematicSystem_8/build.gradle.kts | 2 +- SchematicSystem/SchematicSystem_Core/build.gradle.kts | 2 +- SpigotCore/SpigotCore_20/build.gradle.kts | 5 ----- TNTLeague/build.gradle.kts | 2 +- Teamserver/build.gradle.kts | 2 +- TowerRun/build.gradle.kts | 2 +- 28 files changed, 27 insertions(+), 32 deletions(-) diff --git a/BauSystem/BauSystem_15/build.gradle.kts b/BauSystem/BauSystem_15/build.gradle.kts index 76bd4b1e..054e4ab9 100644 --- a/BauSystem/BauSystem_15/build.gradle.kts +++ b/BauSystem/BauSystem_15/build.gradle.kts @@ -28,7 +28,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.nms15) compileOnly(libs.worldedit15) diff --git a/BauSystem/BauSystem_18/build.gradle.kts b/BauSystem/BauSystem_18/build.gradle.kts index 2a06b687..8dcf6852 100644 --- a/BauSystem/BauSystem_18/build.gradle.kts +++ b/BauSystem/BauSystem_18/build.gradle.kts @@ -28,7 +28,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) compileOnly(libs.nms18) diff --git a/BauSystem/BauSystem_19/build.gradle.kts b/BauSystem/BauSystem_19/build.gradle.kts index fc51fb71..e6dcaf4f 100644 --- a/BauSystem/BauSystem_19/build.gradle.kts +++ b/BauSystem/BauSystem_19/build.gradle.kts @@ -28,7 +28,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) compileOnly(libs.paperapi) diff --git a/BauSystem/BauSystem_20/build.gradle.kts b/BauSystem/BauSystem_20/build.gradle.kts index e626d1ce..3032f6ba 100644 --- a/BauSystem/BauSystem_20/build.gradle.kts +++ b/BauSystem/BauSystem_20/build.gradle.kts @@ -28,7 +28,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) diff --git a/BauSystem/BauSystem_21/build.gradle.kts b/BauSystem/BauSystem_21/build.gradle.kts index d356afcf..8b40ae2d 100644 --- a/BauSystem/BauSystem_21/build.gradle.kts +++ b/BauSystem/BauSystem_21/build.gradle.kts @@ -28,7 +28,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.paperapi21) diff --git a/BauSystem/BauSystem_Main/build.gradle.kts b/BauSystem/BauSystem_Main/build.gradle.kts index b38cf757..45aff756 100644 --- a/BauSystem/BauSystem_Main/build.gradle.kts +++ b/BauSystem/BauSystem_Main/build.gradle.kts @@ -33,7 +33,7 @@ java { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) compileOnly(libs.axiom) diff --git a/BauSystem/BauSystem_RegionFixed/build.gradle.kts b/BauSystem/BauSystem_RegionFixed/build.gradle.kts index 3294e935..beb90143 100644 --- a/BauSystem/BauSystem_RegionFixed/build.gradle.kts +++ b/BauSystem/BauSystem_RegionFixed/build.gradle.kts @@ -32,7 +32,7 @@ java { dependencies { compileOnly(project(":BauSystem:BauSystem_Main", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) compileOnly(libs.axiom) diff --git a/FightSystem/FightSystem_10/build.gradle.kts b/FightSystem/FightSystem_10/build.gradle.kts index 7768d19a..2ab25eda 100644 --- a/FightSystem/FightSystem_10/build.gradle.kts +++ b/FightSystem/FightSystem_10/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(libs.nms10) diff --git a/FightSystem/FightSystem_12/build.gradle.kts b/FightSystem/FightSystem_12/build.gradle.kts index e85e60c2..0654681f 100644 --- a/FightSystem/FightSystem_12/build.gradle.kts +++ b/FightSystem/FightSystem_12/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(project(":FightSystem:FightSystem_8", "default")) diff --git a/FightSystem/FightSystem_14/build.gradle.kts b/FightSystem/FightSystem_14/build.gradle.kts index 611a3c81..dfa4eb5f 100644 --- a/FightSystem/FightSystem_14/build.gradle.kts +++ b/FightSystem/FightSystem_14/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(project(":FightSystem:FightSystem_8", "default")) compileOnly(project(":FightSystem:FightSystem_9", "default")) diff --git a/FightSystem/FightSystem_15/build.gradle.kts b/FightSystem/FightSystem_15/build.gradle.kts index cad0fc1f..a90121b6 100644 --- a/FightSystem/FightSystem_15/build.gradle.kts +++ b/FightSystem/FightSystem_15/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(libs.nms15) diff --git a/FightSystem/FightSystem_18/build.gradle.kts b/FightSystem/FightSystem_18/build.gradle.kts index 362cc349..363d7a4e 100644 --- a/FightSystem/FightSystem_18/build.gradle.kts +++ b/FightSystem/FightSystem_18/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(project(":FightSystem:FightSystem_14", "default")) diff --git a/FightSystem/FightSystem_21/build.gradle.kts b/FightSystem/FightSystem_21/build.gradle.kts index e8d31c2e..a8c67f6f 100644 --- a/FightSystem/FightSystem_21/build.gradle.kts +++ b/FightSystem/FightSystem_21/build.gradle.kts @@ -24,7 +24,7 @@ plugins { dependencies { compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(project(":FightSystem:FightSystem_18", "default")) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.paperapi21) { attributes { diff --git a/FightSystem/FightSystem_8/build.gradle.kts b/FightSystem/FightSystem_8/build.gradle.kts index f8ad1a67..ff60010d 100644 --- a/FightSystem/FightSystem_8/build.gradle.kts +++ b/FightSystem/FightSystem_8/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(libs.nms8) diff --git a/FightSystem/FightSystem_9/build.gradle.kts b/FightSystem/FightSystem_9/build.gradle.kts index 30930926..ec63f4ae 100644 --- a/FightSystem/FightSystem_9/build.gradle.kts +++ b/FightSystem/FightSystem_9/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":FightSystem:FightSystem_Core", "default")) compileOnly(project(":FightSystem:FightSystem_8", "default")) diff --git a/FightSystem/FightSystem_Core/build.gradle.kts b/FightSystem/FightSystem_Core/build.gradle.kts index 9c998e9d..caa83e0d 100644 --- a/FightSystem/FightSystem_Core/build.gradle.kts +++ b/FightSystem/FightSystem_Core/build.gradle.kts @@ -24,7 +24,7 @@ plugins { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) diff --git a/LegacyBauSystem/build.gradle.kts b/LegacyBauSystem/build.gradle.kts index 8f73906a..139fec4d 100644 --- a/LegacyBauSystem/build.gradle.kts +++ b/LegacyBauSystem/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.nms12) compileOnly(libs.worldedit12) diff --git a/LobbySystem/build.gradle.kts b/LobbySystem/build.gradle.kts index 8dcadd92..f658af8f 100644 --- a/LobbySystem/build.gradle.kts +++ b/LobbySystem/build.gradle.kts @@ -29,7 +29,7 @@ java { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) diff --git a/MissileWars/build.gradle.kts b/MissileWars/build.gradle.kts index d8e0b45a..d5dffa66 100644 --- a/MissileWars/build.gradle.kts +++ b/MissileWars/build.gradle.kts @@ -29,7 +29,7 @@ java { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) diff --git a/SchematicSystem/SchematicSystem_15/build.gradle.kts b/SchematicSystem/SchematicSystem_15/build.gradle.kts index b8279ede..281e62fc 100644 --- a/SchematicSystem/SchematicSystem_15/build.gradle.kts +++ b/SchematicSystem/SchematicSystem_15/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default")) compileOnly(libs.nms15) diff --git a/SchematicSystem/SchematicSystem_19/build.gradle.kts b/SchematicSystem/SchematicSystem_19/build.gradle.kts index db58417c..0536403a 100644 --- a/SchematicSystem/SchematicSystem_19/build.gradle.kts +++ b/SchematicSystem/SchematicSystem_19/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_15", "default")) diff --git a/SchematicSystem/SchematicSystem_20/build.gradle.kts b/SchematicSystem/SchematicSystem_20/build.gradle.kts index 44cafcc9..048f1a64 100644 --- a/SchematicSystem/SchematicSystem_20/build.gradle.kts +++ b/SchematicSystem/SchematicSystem_20/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_19", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_15", "default")) diff --git a/SchematicSystem/SchematicSystem_8/build.gradle.kts b/SchematicSystem/SchematicSystem_8/build.gradle.kts index 3ce0e5ee..77bba6f4 100644 --- a/SchematicSystem/SchematicSystem_8/build.gradle.kts +++ b/SchematicSystem/SchematicSystem_8/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(project(":SchematicSystem:SchematicSystem_Core", "default")) compileOnly(libs.nms8) diff --git a/SchematicSystem/SchematicSystem_Core/build.gradle.kts b/SchematicSystem/SchematicSystem_Core/build.gradle.kts index 49b3ba86..c18b3964 100644 --- a/SchematicSystem/SchematicSystem_Core/build.gradle.kts +++ b/SchematicSystem/SchematicSystem_Core/build.gradle.kts @@ -24,7 +24,7 @@ plugins { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) compileOnly(libs.worldedit15) diff --git a/SpigotCore/SpigotCore_20/build.gradle.kts b/SpigotCore/SpigotCore_20/build.gradle.kts index c647e8b0..357feb75 100644 --- a/SpigotCore/SpigotCore_20/build.gradle.kts +++ b/SpigotCore/SpigotCore_20/build.gradle.kts @@ -21,11 +21,6 @@ plugins { steamwar.java } -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - dependencies { compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) diff --git a/TNTLeague/build.gradle.kts b/TNTLeague/build.gradle.kts index f8fb77f6..79a08492 100644 --- a/TNTLeague/build.gradle.kts +++ b/TNTLeague/build.gradle.kts @@ -32,6 +32,6 @@ java { dependencies { compileOnly(libs.paperapi21) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + 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 a3b597c6..d4b47bbe 100644 --- a/Teamserver/build.gradle.kts +++ b/Teamserver/build.gradle.kts @@ -24,7 +24,7 @@ plugins { dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.spigotapi) diff --git a/TowerRun/build.gradle.kts b/TowerRun/build.gradle.kts index 05f83533..b8828ede 100644 --- a/TowerRun/build.gradle.kts +++ b/TowerRun/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { compileOnly(libs.classindex) annotationProcessor(libs.classindex) - compileOnly(project(":SpigotCore:SpigotCore_Main", "default")) + compileOnly(project(":SpigotCore", "default")) compileOnly(libs.nms19) compileOnly(libs.worldedit15)