From f522d28326d603155f5a54cd9b5b95acc938974a Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 1 Jul 2022 21:48:03 +0200 Subject: [PATCH] Update SpigotCore --- SpigotCore_10/build.gradle | 2 +- SpigotCore_10/settings.gradle | 20 -------------------- SpigotCore_12/build.gradle | 2 +- SpigotCore_12/settings.gradle | 20 -------------------- SpigotCore_14/build.gradle | 4 ++-- SpigotCore_14/settings.gradle | 20 -------------------- SpigotCore_15/build.gradle | 2 +- SpigotCore_15/settings.gradle | 20 -------------------- SpigotCore_18/build.gradle | 4 ++-- SpigotCore_18/settings.gradle | 20 -------------------- SpigotCore_19/build.gradle | 4 ++-- SpigotCore_19/settings.gradle | 20 -------------------- SpigotCore_8/build.gradle | 4 ++-- SpigotCore_8/settings.gradle | 20 -------------------- SpigotCore_9/build.gradle | 2 +- SpigotCore_9/settings.gradle | 20 -------------------- SpigotCore_Main/build.gradle | 6 +++--- SpigotCore_Main/settings.gradle | 20 -------------------- build.gradle | 20 ++++++++++++++++++++ 19 files changed, 35 insertions(+), 195 deletions(-) delete mode 100644 SpigotCore_10/settings.gradle delete mode 100644 SpigotCore_12/settings.gradle delete mode 100644 SpigotCore_14/settings.gradle delete mode 100644 SpigotCore_15/settings.gradle delete mode 100644 SpigotCore_18/settings.gradle delete mode 100644 SpigotCore_19/settings.gradle delete mode 100644 SpigotCore_8/settings.gradle delete mode 100644 SpigotCore_9/settings.gradle delete mode 100644 SpigotCore_Main/settings.gradle diff --git a/SpigotCore_10/build.gradle b/SpigotCore_10/build.gradle index 34ef6f9..2157455 100644 --- a/SpigotCore_10/build.gradle +++ b/SpigotCore_10/build.gradle @@ -45,5 +45,5 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.10.jar") + compileOnly swdep("Spigot-1.10") } diff --git a/SpigotCore_10/settings.gradle b/SpigotCore_10/settings.gradle deleted file mode 100644 index 13f4f4a..0000000 --- a/SpigotCore_10/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_10' \ No newline at end of file diff --git a/SpigotCore_12/build.gradle b/SpigotCore_12/build.gradle index 5ee8ca9..6b6e5df 100644 --- a/SpigotCore_12/build.gradle +++ b/SpigotCore_12/build.gradle @@ -45,5 +45,5 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.12.jar") + compileOnly swdep("Spigot-1.12") } diff --git a/SpigotCore_12/settings.gradle b/SpigotCore_12/settings.gradle deleted file mode 100644 index 079bf5a..0000000 --- a/SpigotCore_12/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_12' \ No newline at end of file diff --git a/SpigotCore_14/build.gradle b/SpigotCore_14/build.gradle index 688968a..c75434c 100644 --- a/SpigotCore_14/build.gradle +++ b/SpigotCore_14/build.gradle @@ -45,6 +45,6 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.14.jar") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar") + compileOnly swdep("Spigot-1.14") + compileOnly swdep("WorldEdit-1.15") } diff --git a/SpigotCore_14/settings.gradle b/SpigotCore_14/settings.gradle deleted file mode 100644 index 4a8abac..0000000 --- a/SpigotCore_14/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_14' \ No newline at end of file diff --git a/SpigotCore_15/build.gradle b/SpigotCore_15/build.gradle index 76dc3ee..d5adbc4 100644 --- a/SpigotCore_15/build.gradle +++ b/SpigotCore_15/build.gradle @@ -45,5 +45,5 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.15.jar") + compileOnly swdep("Spigot-1.15") } diff --git a/SpigotCore_15/settings.gradle b/SpigotCore_15/settings.gradle deleted file mode 100644 index a861db0..0000000 --- a/SpigotCore_15/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_15' \ No newline at end of file diff --git a/SpigotCore_18/build.gradle b/SpigotCore_18/build.gradle index 5181c28..2a7091e 100644 --- a/SpigotCore_18/build.gradle +++ b/SpigotCore_18/build.gradle @@ -46,8 +46,8 @@ dependencies { implementation project(":SpigotCore_Main") implementation project(":SpigotCore_14") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar") + compileOnly swdep("WorldEdit-1.15") compileOnly 'org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT' - compileOnly files("${project.rootDir}/lib/Spigot-1.18.jar") + compileOnly swdep("Spigot-1.18") } diff --git a/SpigotCore_18/settings.gradle b/SpigotCore_18/settings.gradle deleted file mode 100644 index 8943e4f..0000000 --- a/SpigotCore_18/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_18' \ No newline at end of file diff --git a/SpigotCore_19/build.gradle b/SpigotCore_19/build.gradle index c7b9f98..7a8815a 100644 --- a/SpigotCore_19/build.gradle +++ b/SpigotCore_19/build.gradle @@ -46,9 +46,9 @@ dependencies { implementation project(":SpigotCore_Main") implementation project(":SpigotCore_14") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar") + compileOnly swdep("WorldEdit-1.15") compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' compileOnly 'com.mojang:brigadier:1.0.18' - compileOnly files("${project.rootDir}/lib/Spigot-1.19.jar") + compileOnly swdep("Spigot-1.19") } diff --git a/SpigotCore_19/settings.gradle b/SpigotCore_19/settings.gradle deleted file mode 100644 index d0fdb7f..0000000 --- a/SpigotCore_19/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_19' \ No newline at end of file diff --git a/SpigotCore_8/build.gradle b/SpigotCore_8/build.gradle index 8007cef..84f62cf 100644 --- a/SpigotCore_8/build.gradle +++ b/SpigotCore_8/build.gradle @@ -45,6 +45,6 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.8.jar") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.12.jar") + compileOnly swdep("Spigot-1.8") + compileOnly swdep("WorldEdit-1.12") } diff --git a/SpigotCore_8/settings.gradle b/SpigotCore_8/settings.gradle deleted file mode 100644 index e4a8e0a..0000000 --- a/SpigotCore_8/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_8' \ No newline at end of file diff --git a/SpigotCore_9/build.gradle b/SpigotCore_9/build.gradle index 064f759..be6ce3c 100644 --- a/SpigotCore_9/build.gradle +++ b/SpigotCore_9/build.gradle @@ -45,5 +45,5 @@ sourceSets { dependencies { implementation project(":SpigotCore_Main") - compileOnly files("${project.rootDir}/lib/Spigot-1.9.jar") + compileOnly swdep("Spigot-1.9") } diff --git a/SpigotCore_9/settings.gradle b/SpigotCore_9/settings.gradle deleted file mode 100644 index c55656e..0000000 --- a/SpigotCore_9/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_9' \ No newline at end of file diff --git a/SpigotCore_Main/build.gradle b/SpigotCore_Main/build.gradle index 4122646..6cd4051 100644 --- a/SpigotCore_Main/build.gradle +++ b/SpigotCore_Main/build.gradle @@ -48,7 +48,7 @@ dependencies { compileOnly 'com.mojang:authlib:1.5.25' compileOnly 'mysql:mysql-connector-java:5.1.49' compileOnly 'com.viaversion:viaversion-api:4.3.1' - compileOnly files("${project.rootDir}/lib/WorldEdit-1.12.jar") + compileOnly swdep("WorldEdit-1.12") implementation 'net.wesjd:anvilgui:1.5.3-SNAPSHOT' compileOnly 'org.projectlombok:lombok:1.18.22' @@ -56,8 +56,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.22' testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' - testImplementation files("${project.rootDir}/lib/Spigot-1.15.jar") - testImplementation files("${project.rootDir}/lib/WorldEdit-1.12.jar") + testImplementation swdep("Spigot-1.15") + testImplementation swdep("WorldEdit-1.12") compileOnly project(":CommonCore") diff --git a/SpigotCore_Main/settings.gradle b/SpigotCore_Main/settings.gradle deleted file mode 100644 index 2d1bf48..0000000 --- a/SpigotCore_Main/settings.gradle +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is a part of the SteamWar software. - * - * Copyright (C) 2020 SteamWar.de-Serverteam - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -rootProject.name = 'SpigotCore_Main' \ No newline at end of file diff --git a/build.gradle b/build.gradle index fba0534..15fdacf 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,18 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.0.0' } +ext.swdep = { s -> + if (file("${rootDir}/lib/${s}.jar").exists()) { + return files("${rootDir}/lib/${s}.jar") + } else { + if (s.contains("-")) { + return "de.steamwar:${s.toLowerCase().replace('-', ':')}" + } else { + return "de.steamwar:${s.toLowerCase()}:RELEASE" + } + } +} + group 'de.steamwar' version '' @@ -85,6 +97,14 @@ allprojects { maven { url = uri('https://repo.viaversion.com') } + + maven { + url = uri('https://steamwar.de/maven') + credentials { + username = steamwarProperties.getProperty("maven.username") + password = steamwarProperties.getProperty("maven.password") + } + } } }