Merge pull request 'Update SpigotCore' (#201) from EasyDev into master

Reviewed-on: #201
Reviewed-by: Lixfel <lixfel@steamwar.de>

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")
 }

SpigotCore_10/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_10'

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")
 }

SpigotCore_12/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_12'

SpigotCore_14/build.gradle

@@ -47,6 +47,6 @@ dependencies {
     compileOnly project(":SpigotCore_8")
     compileOnly project(":SpigotCore_9")
 
-    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")
 }

SpigotCore_14/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_14'

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")
 }

SpigotCore_15/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_15'

SpigotCore_18/build.gradle

@@ -46,11 +46,11 @@ 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 'com.mojang:datafixerupper:4.0.26'
     compileOnly 'io.netty:netty-all:4.1.68.Final'
     compileOnly 'com.mojang:authlib:1.5.25'
-    compileOnly files("${project.rootDir}/lib/Spigot-1.18.jar")
+    compileOnly swdep("Spigot-1.18")
 }

SpigotCore_18/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_18'

SpigotCore_19/build.gradle

@@ -47,10 +47,10 @@ dependencies {
     implementation project(":SpigotCore_14")
     compileOnly project(":SpigotCore_18")
 
-    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 'com.mojang:datafixerupper:4.0.26'
-    compileOnly files("${project.rootDir}/lib/Spigot-1.19.jar")
+    compileOnly swdep("Spigot-1.19")
 }

SpigotCore_19/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_19'

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")
 }

SpigotCore_8/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_8'

SpigotCore_9/build.gradle

@@ -46,5 +46,5 @@ dependencies {
     implementation project(":SpigotCore_Main")
     compileOnly project(":SpigotCore_8")
 
-    compileOnly files("${project.rootDir}/lib/Spigot-1.9.jar")
+    compileOnly swdep("Spigot-1.9")
 }

SpigotCore_9/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_9'

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")
 

SpigotCore_Main/settings.gradle

@@ -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 <https://www.gnu.org/licenses/>.
- */
-
-rootProject.name = 'SpigotCore_Main'

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")
+            }
+        }
     }
 }