diff --git a/.gitignore b/.gitignore index 377ce8c..36e1257 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,15 @@ +# Package Files +*.jar + +# Gradle +.gradle +**/build/ +!gradle/wrapper/gradle-wrapper.jar +steamwar.properties + +# IntelliJ IDEA .idea -target -lib -dependency-reduced-pom.xml -*.iml \ No newline at end of file +*.iml + +# Other +lib \ No newline at end of file diff --git a/FightSystem_10/build.gradle b/FightSystem_10/build.gradle new file mode 100644 index 0000000..5cfebcc --- /dev/null +++ b/FightSystem_10/build.gradle @@ -0,0 +1,50 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + + compileOnly files("${projectDir}/../lib/Spigot-1.10.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_10/pom.xml b/FightSystem_10/pom.xml deleted file mode 100644 index 3e87409..0000000 --- a/FightSystem_10/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_10 - 1.0 - - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.12.jar - - - steamwar - Spigot - 1.10 - system - ${main.basedir}/lib/Spigot-1.10.jar - - - \ No newline at end of file diff --git a/FightSystem_12/build.gradle b/FightSystem_12/build.gradle new file mode 100644 index 0000000..bbe1745 --- /dev/null +++ b/FightSystem_12/build.gradle @@ -0,0 +1,51 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + implementation project(":FightSystem_8") + + compileOnly files("${projectDir}/../lib/Spigot-1.12.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_12/pom.xml b/FightSystem_12/pom.xml deleted file mode 100644 index e5c8537..0000000 --- a/FightSystem_12/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_12 - 1.0 - - - - steamwar - FightSystem_8 - 1.0 - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.12.jar - - - steamwar - Spigot - 1.12 - system - ${main.basedir}/lib/Spigot-1.12.jar - - - \ No newline at end of file diff --git a/FightSystem_14/build.gradle b/FightSystem_14/build.gradle new file mode 100644 index 0000000..5312c3a --- /dev/null +++ b/FightSystem_14/build.gradle @@ -0,0 +1,52 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + implementation project(":FightSystem_9") + implementation project(":FightSystem_8") + + compileOnly files("${projectDir}/../lib/Spigot-1.14.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_14/pom.xml b/FightSystem_14/pom.xml deleted file mode 100644 index 7b82230..0000000 --- a/FightSystem_14/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_14 - 1.0 - - - - steamwar - Spigot - 1.14 - system - ${main.basedir}/lib/Spigot-1.14.jar - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.15.jar - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - FightSystem_9 - 1.0 - - - \ No newline at end of file diff --git a/FightSystem_15/build.gradle b/FightSystem_15/build.gradle new file mode 100644 index 0000000..dacb6a5 --- /dev/null +++ b/FightSystem_15/build.gradle @@ -0,0 +1,50 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + + compileOnly files("${projectDir}/../lib/Spigot-1.15.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_15/pom.xml b/FightSystem_15/pom.xml deleted file mode 100644 index 7aa938d..0000000 --- a/FightSystem_15/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_15 - 1.0 - - - - steamwar - Spigot - 1.15 - system - ${main.basedir}/lib/Spigot-1.15.jar - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.15.jar - - - steamwar - FightSystem_Core - 1.0 - - - \ No newline at end of file diff --git a/FightSystem_18/build.gradle b/FightSystem_18/build.gradle new file mode 100644 index 0000000..845a8fb --- /dev/null +++ b/FightSystem_18/build.gradle @@ -0,0 +1,55 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + + 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("${projectDir}/../lib/Spigot-1.18.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_18/pom.xml b/FightSystem_18/pom.xml deleted file mode 100644 index c3c4daa..0000000 --- a/FightSystem_18/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_18 - 1.0 - - - - org.spigotmc - spigot-api - 1.18-R0.1-SNAPSHOT - provided - - - com.mojang - datafixerupper - 4.0.26 - provided - - - io.netty - netty-all - 4.1.68.Final - provided - - - com.mojang - authlib - 1.5.25 - provided - - - steamwar - Spigot - 1.18 - system - ${main.basedir}/lib/Spigot-1.18.jar - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.15.jar - - - steamwar - FightSystem_Core - 1.0 - - - \ No newline at end of file diff --git a/FightSystem_19/build.gradle b/FightSystem_19/build.gradle new file mode 100644 index 0000000..3a4d5c8 --- /dev/null +++ b/FightSystem_19/build.gradle @@ -0,0 +1,56 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + implementation project(":FightSystem_18") + + compileOnly 'org.spigotmc:spigot-api:1.19-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("${projectDir}/../lib/Spigot-1.19.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_19/pom.xml b/FightSystem_19/pom.xml deleted file mode 100644 index 5eac264..0000000 --- a/FightSystem_19/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_19 - 1.0 - - - - org.spigotmc - spigot-api - 1.19-R0.1-SNAPSHOT - provided - - - com.mojang - datafixerupper - 4.0.26 - provided - - - io.netty - netty-all - 4.1.68.Final - provided - - - com.mojang - authlib - 1.5.25 - provided - - - steamwar - Spigot - 1.19 - system - ${main.basedir}/lib/Spigot-1.19.jar - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.15.jar - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - FightSystem_18 - 1.0 - - - \ No newline at end of file diff --git a/FightSystem_8/build.gradle b/FightSystem_8/build.gradle new file mode 100644 index 0000000..0b9c426 --- /dev/null +++ b/FightSystem_8/build.gradle @@ -0,0 +1,50 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + + compileOnly files("${projectDir}/../lib/Spigot-1.8.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_8/pom.xml b/FightSystem_8/pom.xml deleted file mode 100644 index 3ec6b70..0000000 --- a/FightSystem_8/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_8 - 1.0 - - - - steamwar - Spigot - 1.8 - system - ${main.basedir}/lib/Spigot-1.8.jar - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.12.jar - - - \ No newline at end of file diff --git a/FightSystem_9/build.gradle b/FightSystem_9/build.gradle new file mode 100644 index 0000000..d9054a5 --- /dev/null +++ b/FightSystem_9/build.gradle @@ -0,0 +1,51 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + implementation project(":FightSystem_Core") + implementation project(":FightSystem_8") + + compileOnly files("${projectDir}/../lib/Spigot-1.9.jar") + compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_9/pom.xml b/FightSystem_9/pom.xml deleted file mode 100644 index 1dd055b..0000000 --- a/FightSystem_9/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_9 - 1.0 - - - - steamwar - FightSystem_Core - 1.0 - - - steamwar - FightSystem_8 - 1.0 - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.12.jar - - - steamwar - Spigot - 1.9 - system - ${main.basedir}/lib/Spigot-1.9.jar - - - \ No newline at end of file diff --git a/FightSystem_Core/build.gradle b/FightSystem_Core/build.gradle new file mode 100644 index 0000000..41d367d --- /dev/null +++ b/FightSystem_Core/build.gradle @@ -0,0 +1,52 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' +} + +group 'steamwar' +version '1.0' + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = ['src/'] + } + resources { + srcDirs = ['src/'] + exclude '**/*.java', '**/*.kt' + } + } +} + +dependencies { + compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' + compileOnly 'it.unimi.dsi:fastutil:8.5.6' + compileOnly 'io.netty:netty-all:4.1.68.Final' + compileOnly 'com.mojang:authlib:1.5.25' + + compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") + compileOnly files("${projectDir}/../lib/SpigotCore.jar") +} diff --git a/FightSystem_Core/pom.xml b/FightSystem_Core/pom.xml deleted file mode 100644 index 7e022e6..0000000 --- a/FightSystem_Core/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_Core - 1.0 - - - - org.spigotmc - spigot-api - 1.19-R0.1-SNAPSHOT - provided - - - it.unimi.dsi - fastutil - 8.5.6 - provided - - - io.netty - netty-all - 4.1.68.Final - provided - - - com.mojang - authlib - 1.5.25 - provided - - - steamwar - WorldEdit - 1.0 - system - ${main.basedir}/lib/WorldEdit-1.12.jar - - - \ No newline at end of file diff --git a/FightSystem_Main/pom.xml b/FightSystem_Main/pom.xml deleted file mode 100644 index 04f6fca..0000000 --- a/FightSystem_Main/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_Main - 1.0 - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - - fightsystem - - - - - steamwar - FightSystem_8 - 1.0 - compile - - - steamwar - FightSystem_9 - 1.0 - compile - - - steamwar - FightSystem_10 - 1.0 - compile - - - steamwar - FightSystem_12 - 1.0 - compile - - - steamwar - FightSystem_14 - 1.0 - compile - - - steamwar - FightSystem_15 - 1.0 - compile - - - steamwar - FightSystem_18 - 1.0 - compile - - - steamwar - FightSystem_19 - 1.0 - compile - - - steamwar - FightSystem_Core - 1.0 - compile - - - \ No newline at end of file diff --git a/FightSystem_Standalone/build.gradle b/FightSystem_Standalone/build.gradle new file mode 100644 index 0000000..02c6487 --- /dev/null +++ b/FightSystem_Standalone/build.gradle @@ -0,0 +1,81 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2021 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 . + */ + +plugins { + id 'java' + + id 'com.github.johnrengelman.shadow' +} + +group 'steamwar' +version '' + +ext { + buildName = 'FightSystem_Standalone' + artifactName = 'FightSystem_Standalone' + + uberJarName = "${buildName}-all.jar" + jarName = "${artifactName}.jar" + libs = "${buildDir}/libs" +} + +compileJava.options.encoding = 'UTF-8' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +sourceSets { + main { + java { + srcDirs = [] + } + resources { + srcDirs = [] + } + } +} + +dependencies { + file('../.').listFiles().each { + if (!it.isDirectory()) { + return + } + if (it.name.startsWith("FightSystem") && it.name != 'FightSystem_Standalone') { + implementation project(":" + it.name) + } + } + + implementation files("${projectDir}/../lib/SpigotCore.jar") +} + +task finalizeProject { + description 'Finalize this project' + group "Steamwar" + + doLast { + if ("${buildDir}" == null) { + return + } + delete fileTree("${libs}").matching { + exclude("${uberJarName}") + } + file(libs + "/" + uberJarName).renameTo(file(libs + "/" + jarName)) + } +} +shadowJar.finalizedBy(finalizeProject) diff --git a/FightSystem_Standalone/pom.xml b/FightSystem_Standalone/pom.xml deleted file mode 100644 index e3b4ee8..0000000 --- a/FightSystem_Standalone/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - 4.0.0 - - - steamwar - FightSystem - 1.0 - - - - ${project.basedir}/.. - - - FightSystem_Standalone - 1.0 - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - - - steamwar:FightSystem_Main - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-sources - - unpack-dependencies - - - SpigotCore - plugin.yml,META-INF/** - ${project.build.outputDirectory} - - - - - - FightSystem_Standalone - - - - - steamwar - FightSystem_Main - 1.0 - compile - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..be1e8d7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,245 @@ +/* + * 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 . + */ + + + +import org.apache.tools.ant.taskdefs.condition.Os + +plugins { + // Adding the base plugin fixes the following gradle warnings in IntelliJ: + // + // Warning: root project 'module-work-multi': Unable to resolve all content root directories + // Details: java.lang.IllegalStateException: No value has been specified for this provider. + // + // Warning: root project 'module-work-multi': Unable to resolve additional project configuration. + // Details: java.lang.IllegalStateException: No value has been specified for this provider. + id 'base' + id 'application' + + id 'com.github.johnrengelman.shadow' version '5.0.0' +} + +group 'de.steamwar' +version '' + +Properties steamwarProperties = new Properties() +if (file("steamwar.properties").exists()) { + steamwarProperties.load(file("steamwar.properties").newDataInputStream()) +} + +ext { + buildName = 'FightSystem' + artifactName = 'fightsystem' + + uberJarName = "${buildName}-all.jar" + jarName = "${artifactName}.jar" + libs = "${buildDir}/libs" + + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + operatingSystem = "windows" + } else { + operatingSystem = "unix" + } +} + +compileJava.options.encoding = 'UTF-8' +compileJava.options.compilerArgs << '-parameter' + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +mainClassName = '' + +allprojects { + repositories { + mavenCentral() + jcenter() + + maven { + url = uri("https://repo.codemc.io/repository/maven-snapshots/") + } + + maven { + url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/') + } + + maven { + url = uri('https://libraries.minecraft.net') + } + } +} + +dependencies { + file('.').listFiles().each { + if (!it.isDirectory()) { + return + } + if (it.name.startsWith("FightSystem") && it.name != "FightSystem_Standalone") { + implementation project(":" + it.name) + } + } +} + +task buildProject { + description 'Build this project' + group "Steamwar" + + dependsOn build, tasks.getByPath(':FightSystem_Standalone:shadowJar') +} + +task finalizeProject { + description 'Finalize this project' + group "Steamwar" + + doLast { + if ("${buildDir}" == null) { + return + } + delete fileTree("${libs}").matching { + exclude("${uberJarName}") + } + file(libs + "/" + uberJarName).renameTo(file(libs + "/" + jarName)) + } +} +build.finalizedBy(finalizeProject) + +if (steamwarProperties.containsKey("hostname")) { + String hostname = steamwarProperties.get("hostname") + String uploadPath = steamwarProperties.getOrDefault("uploadPath", "~") + + String server = steamwarProperties.getOrDefault("server", "Dev1.15") + String serverStartFlags = steamwarProperties.getOrDefault("serverStartFlags", "") + + task uploadProject { + description 'Upload this project' + group "Steamwar" + + doLast { + await(shell("scp ${libs}/${jarName} ${hostname}:${uploadPath}/${server}/plugins")) + if (steamwarProperties.getOrDefault("directStart", "false") == "false" && !answer("Start ${server} server?")) { + return + } + serverStart(server, serverStartFlags, hostname) + } + } + uploadProject.dependsOn(buildProject) + + task startDevServer { + description 'Start the DevServer' + group "Steamwar" + + doLast { + serverStart(server, serverStartFlags, hostname) + } + } +} + +private def await(Process proc) { + def out = new StringBuilder() + def err = new StringBuilder() + proc.waitForProcessOutput(out, err) + return [out, err, proc.exitValue()] +} + +private def shell(String command) { + if (operatingSystem == "unix") { + return ['bash', '-c', command].execute() + } else { + return ["cmd", "/c", command].execute() + } +} + +private def serverStart(String serverName, String serverFlags, String hostname) { + def proc = shell("ssh -t ${hostname} \"./mc ${serverFlags} ${serverName}\"") + + Set strings = new HashSet<>() + File file = new File("${projectDir}/ignoredlog"); + if (file.exists()) { + new BufferedReader(new InputStreamReader(new FileInputStream(file))).readLines().forEach({ s -> + strings.add(s) + }) + } + + Thread outputThread = new Thread({ + Reader reader = proc.getInputStream().newReader(); + Writer writer = System.out.newWriter(); + try { + while (proc.alive) { + String s = reader.readLine() + if (s == null) { + return + } + if (strings.stream().anyMatch({check -> s.contains(check)})) { + continue + } + writer.write(s + "\n") + writer.flush() + } + } catch (IOException e) { + // Ignored + } + }) + outputThread.setName("${serverName} - OutputThread") + outputThread.start() + + Writer writer + Thread inputThread = new Thread({ + Reader reader = System.in.newReader() + writer = proc.getOutputStream().newWriter() + try { + while (proc.alive) { + String s = reader.readLine() + writer.write(s + "\n") + writer.flush() + } + } catch (IOException e) { + // Ignored + } + }) + inputThread.setName("${serverName} - InputThread") + inputThread.start() + + gradle.buildFinished { buildResult -> + if (!proc.alive) { + return + } + writer = proc.getOutputStream().newWriter() + writer.write("stop\n") + writer.flush() + awaitClose(proc, outputThread, inputThread) + } + awaitClose(proc, outputThread, inputThread) +}; + +private static def awaitClose(Process proc, Thread outputThread, Thread inputThread) { + while (proc.alive) { + Thread.sleep(10) + } + proc.closeStreams() + outputThread.interrupt() + inputThread.interrupt() +} + +private def answer(String question) { + while (System.in.available() > 0) System.in.read() + println(question) + boolean valid = "Yy".contains(((char) System.in.read()).toString()) + while (System.in.available() > 0) System.in.read() + return valid +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..dc56501 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,22 @@ +# +# 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 . +# + +org.gradle.daemon = true +org.gradle.parallel = true +org.gradle.workers.max = 4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3cd8500 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 055ee93..0000000 --- a/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - 4.0.0 - - steamwar - FightSystem - 1.0 - https://maven.apache.org - pom - - - UTF-8 - ${project.basedir} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - -Xlint - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - false - - - - - src - - - src - - **/*.java - **/*.kt - - - - - - - FightSystem_8 - FightSystem_9 - FightSystem_10 - FightSystem_12 - FightSystem_14 - FightSystem_15 - FightSystem_18 - FightSystem_19 - FightSystem_Core - FightSystem_Main - FightSystem_Standalone - - - - - minecraft-libraries - Minecraft Libraries - https://libraries.minecraft.net - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - steamwar - SpigotCore - 1.0 - system - ${main.basedir}/lib/SpigotCore.jar - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d28b327 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,29 @@ +/* + * 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 = 'FightSystem' + +file('.').listFiles().each { + if (!it.isDirectory()) { + return + } + if (it.name.startsWith("FightSystem")) { + include(it.name) + } +} diff --git a/steamwarci.yml b/steamwarci.yml index 7ad548f..e3c22f5 100644 --- a/steamwarci.yml +++ b/steamwarci.yml @@ -1,7 +1,8 @@ build: - "ln -s /home/gitea/lib" - - "mvn package -B" + - "cp ~/gradle.properties ." + - "./gradlew buildProject" artifacts: - "/binarys/fightsystem.jar": "FightSystem_Main/target/fightsystem.jar" - "/binarys/FightSystem_Standalone.jar": "FightSystem_Standalone/target/FightSystem_Standalone.jar" + "/binarys/fightsystem.jar": "build/libs/fightsystem.jar" + "/binarys/FightSystem_Standalone.jar": "FightSystem_Standalone/build/libs/FightSystem_Standalone.jar"