diff --git a/.gitignore b/.gitignore index 36e1257..a82b435 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,9 @@ # Package Files *.jar -# Gradle -.gradle -**/build/ -!gradle/wrapper/gradle-wrapper.jar -steamwar.properties +# Maven +target +dependency-reduced-pom.xml # IntelliJ IDEA .idea diff --git a/BauSystem_12/build.gradle b/BauSystem_12/build.gradle deleted file mode 100644 index 6ba44ff..0000000 --- a/BauSystem_12/build.gradle +++ /dev/null @@ -1,56 +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 . - */ - -plugins { - id 'base' - 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.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' - - implementation project(":BauSystem_Main") - - compileOnly files("${project.rootDir}/lib/Spigot-1.12.jar") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.12.jar") - compileOnly files("${project.rootDir}/lib/ProtocolLib.jar") -} \ No newline at end of file diff --git a/BauSystem_12/pom.xml b/BauSystem_12/pom.xml new file mode 100644 index 0000000..8e43321 --- /dev/null +++ b/BauSystem_12/pom.xml @@ -0,0 +1,60 @@ + + + + + 4.0.0 + + + steamwar + BauSystem + 1.0 + + + + ${project.basedir}/.. + + + BauSystem_12 + 1.0 + + + + steamwar + BauSystem_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/BauSystem_12/settings.gradle b/BauSystem_12/settings.gradle deleted file mode 100644 index c91a2fc..0000000 --- a/BauSystem_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 = 'BauSystem_12' \ No newline at end of file diff --git a/BauSystem_15/build.gradle b/BauSystem_15/build.gradle deleted file mode 100644 index ac0fb9c..0000000 --- a/BauSystem_15/build.gradle +++ /dev/null @@ -1,56 +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 . - */ - -plugins { - id 'base' - 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.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' - - implementation project(":BauSystem_Main") - - compileOnly files("${project.rootDir}/lib/Spigot-1.15.jar") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar") - compileOnly files("${project.rootDir}/lib/ProtocolLib.jar") -} \ No newline at end of file diff --git a/BauSystem_15/pom.xml b/BauSystem_15/pom.xml new file mode 100644 index 0000000..08be638 --- /dev/null +++ b/BauSystem_15/pom.xml @@ -0,0 +1,60 @@ + + + + + 4.0.0 + + + steamwar + BauSystem + 1.0 + + + + ${project.basedir}/.. + + + BauSystem_15 + 1.0 + + + + steamwar + BauSystem_Core + 1.0 + + + steamwar + WorldEdit + 1.0 + system + ${main.basedir}/lib/WorldEdit-1.15.jar + + + steamwar + Spigot + 1.15 + system + ${main.basedir}/lib/Spigot-1.15.jar + + + \ No newline at end of file diff --git a/BauSystem_15/settings.gradle b/BauSystem_15/settings.gradle deleted file mode 100644 index 1d00dc5..0000000 --- a/BauSystem_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 = 'BauSystem_15' \ No newline at end of file diff --git a/BauSystem_Core/pom.xml b/BauSystem_Core/pom.xml new file mode 100644 index 0000000..1815185 --- /dev/null +++ b/BauSystem_Core/pom.xml @@ -0,0 +1,61 @@ + + + + + 4.0.0 + + + steamwar + BauSystem + 1.0 + + + + ${project.basedir}/.. + + + BauSystem_Core + 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 + + + org.projectlombok + lombok + 1.18.20 + provided + + + \ No newline at end of file diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Core/src/de/steamwar/bausystem/BauSystem.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java rename to BauSystem_Core/src/de/steamwar/bausystem/BauSystem.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/CraftbukkitWrapper.java b/BauSystem_Core/src/de/steamwar/bausystem/CraftbukkitWrapper.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/CraftbukkitWrapper.java rename to BauSystem_Core/src/de/steamwar/bausystem/CraftbukkitWrapper.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/FlatteningWrapper.java b/BauSystem_Core/src/de/steamwar/bausystem/FlatteningWrapper.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/FlatteningWrapper.java rename to BauSystem_Core/src/de/steamwar/bausystem/FlatteningWrapper.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/Mapper.java b/BauSystem_Core/src/de/steamwar/bausystem/Mapper.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/Mapper.java rename to BauSystem_Core/src/de/steamwar/bausystem/Mapper.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/Permission.java b/BauSystem_Core/src/de/steamwar/bausystem/Permission.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/Permission.java rename to BauSystem_Core/src/de/steamwar/bausystem/Permission.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/RamUsage.java b/BauSystem_Core/src/de/steamwar/bausystem/RamUsage.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/RamUsage.java rename to BauSystem_Core/src/de/steamwar/bausystem/RamUsage.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java b/BauSystem_Core/src/de/steamwar/bausystem/SWUtils.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/SWUtils.java rename to BauSystem_Core/src/de/steamwar/bausystem/SWUtils.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/WorldeditWrapper.java b/BauSystem_Core/src/de/steamwar/bausystem/WorldeditWrapper.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/WorldeditWrapper.java rename to BauSystem_Core/src/de/steamwar/bausystem/WorldeditWrapper.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandClear.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandClear.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandClear.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandColor.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandColor.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandColor.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandColor.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandDebugStick.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDebugStick.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandDebugStick.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonator.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandDetonator.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandDetonator.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandDetonator.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFire.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandFire.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFire.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandFire.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandFreeze.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandFreeze.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGUI.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGUI.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGUI.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGamemode.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGamemode.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGamemode.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGills.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandGills.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandGills.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandInfo.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandInfo.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandInfo.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandKillAll.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandKillAll.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandKillAll.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandKillAll.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandLoader.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandLoader.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandLoader.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandLoader.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandLockschem.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandLockschem.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandLockschem.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandLockschem.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandNV.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandNV.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandNV.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandProtect.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandProtect.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandProtect.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandRedstoneTester.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRegion.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandRegion.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandRegion.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandRegion.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandReset.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandReset.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandReset.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandScript.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScript.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandScript.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandScriptVars.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandScriptVars.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandScriptVars.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSelect.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSelect.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSelect.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSelect.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulator.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSimulator.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSimulator.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSimulator.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSkull.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSkull.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSkull.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSpeed.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandSpeed.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandSpeed.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTNT.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTNT.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTNT.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTPSLimiter.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTeleport.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTeleport.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTeleport.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTeleport.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTestblock.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTestblock.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTestblock.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTime.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTime.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTime.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTime.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTrace.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTrace.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandTrace.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandTrace.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/CommandWorldSpawn.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/commands/RegionUtils.java b/BauSystem_Core/src/de/steamwar/bausystem/commands/RegionUtils.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/commands/RegionUtils.java rename to BauSystem_Core/src/de/steamwar/bausystem/commands/RegionUtils.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java b/BauSystem_Core/src/de/steamwar/bausystem/gui/GuiTraceShow.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java rename to BauSystem_Core/src/de/steamwar/bausystem/gui/GuiTraceShow.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/AbstractTraceEntity.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/RoundedTNTPosition.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTPosition.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/TNTPosition.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/TNTPosition.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/TNTPosition.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/record/RecordStateMachine.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/record/RecordStatus.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/record/RecordStatus.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/record/RecordStatus.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/record/RecordStatus.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/record/Recorder.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/record/Recorder.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/record/Recorder.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/record/Recorder.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/record/TraceAutoHandler.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/Record.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/Record.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/Record.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/Record.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowMode.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowMode.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowMode.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowMode.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowModeParameter.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/ShowModeParameterType.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/StoredRecords.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/StoredRecords.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/StoredRecords.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/StoredRecords.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/TraceShowManager.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java b/BauSystem_Core/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java rename to BauSystem_Core/src/de/steamwar/bausystem/tracer/show/mode/EntityShowMode.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/AFKStopper.java b/BauSystem_Core/src/de/steamwar/bausystem/world/AFKStopper.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/AFKStopper.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/AFKStopper.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/AbstractAutoLoader.java b/BauSystem_Core/src/de/steamwar/bausystem/world/AbstractAutoLoader.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/AbstractAutoLoader.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/AbstractAutoLoader.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java b/BauSystem_Core/src/de/steamwar/bausystem/world/AutoLoader.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/AutoLoader.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/BauScoreboard.java b/BauSystem_Core/src/de/steamwar/bausystem/world/BauScoreboard.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/BauScoreboard.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/BauScoreboard.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ClipboardListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/ClipboardListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/ClipboardListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/ClipboardListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/Color.java b/BauSystem_Core/src/de/steamwar/bausystem/world/Color.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/Color.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/Color.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/Detoloader.java b/BauSystem_Core/src/de/steamwar/bausystem/world/Detoloader.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/Detoloader.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/Detoloader.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/Detonator.java b/BauSystem_Core/src/de/steamwar/bausystem/world/Detonator.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/Detonator.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/Detonator.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/DetonatorListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/DetonatorListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/DetonatorListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/DetonatorListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/ItemFrameListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/ItemFrameListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/PredefinedBook.java b/BauSystem_Core/src/de/steamwar/bausystem/world/PredefinedBook.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/PredefinedBook.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/PredefinedBook.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/RedstoneListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/RedstoneListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/RedstoneListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/RedstoneListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/RegionListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/RegionListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/RegionListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/ScriptListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/ScriptListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/ScriptListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/SizedStack.java b/BauSystem_Core/src/de/steamwar/bausystem/world/SizedStack.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/SizedStack.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/SizedStack.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java b/BauSystem_Core/src/de/steamwar/bausystem/world/TNTSimulator.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulator.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/TNTSimulator.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulatorListener.java b/BauSystem_Core/src/de/steamwar/bausystem/world/TNTSimulatorListener.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/TNTSimulatorListener.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/TNTSimulatorListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/TPSUtils.java b/BauSystem_Core/src/de/steamwar/bausystem/world/TPSUtils.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/TPSUtils.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/TPSUtils.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/Welt.java b/BauSystem_Core/src/de/steamwar/bausystem/world/Welt.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/Welt.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/Welt.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/GlobalRegion.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/GlobalRegion.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/GlobalRegion.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/GlobalRegion.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/PasteOptions.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/PasteOptions.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/PasteOptions.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/PasteOptions.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/Point.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/Point.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/Point.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/Point.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/Prototype.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/Prototype.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/Prototype.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/Prototype.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/Region.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/Region.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/Region.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/Region.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionExtensionType.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionSelectionType.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionType.java b/BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionType.java similarity index 100% rename from BauSystem_Main/src/de/steamwar/bausystem/world/regions/RegionType.java rename to BauSystem_Core/src/de/steamwar/bausystem/world/regions/RegionType.java diff --git a/BauSystem_Main/src/plugin.yml b/BauSystem_Core/src/plugin.yml similarity index 100% rename from BauSystem_Main/src/plugin.yml rename to BauSystem_Core/src/plugin.yml diff --git a/BauSystem_Main/build.gradle b/BauSystem_Main/build.gradle deleted file mode 100644 index 8b133d4..0000000 --- a/BauSystem_Main/build.gradle +++ /dev/null @@ -1,55 +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 . - */ - -plugins { - id 'base' - 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.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' - - compileOnly files("${project.rootDir}/lib/Spigot-1.15.jar") - compileOnly files("${project.rootDir}/lib/WorldEdit-1.15.jar") - compileOnly files("${project.rootDir}/lib/ProtocolLib.jar") - compileOnly files("${project.rootDir}/lib/SpigotCore.jar") -} diff --git a/BauSystem_Main/pom.xml b/BauSystem_Main/pom.xml new file mode 100644 index 0000000..13bd790 --- /dev/null +++ b/BauSystem_Main/pom.xml @@ -0,0 +1,78 @@ + + + + + 4.0.0 + + + steamwar + BauSystem + 1.0 + + + + ${project.basedir}/.. + + + BauSystem_Main + 1.0 + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + + + bausystem + + + + + steamwar + BauSystem_12 + 1.0 + compile + + + steamwar + BauSystem_15 + 1.0 + compile + + + steamwar + BauSystem_Core + 1.0 + compile + + + \ No newline at end of file diff --git a/BauSystem_Main/settings.gradle b/BauSystem_Main/settings.gradle deleted file mode 100644 index 13adc46..0000000 --- a/BauSystem_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 = 'BauSystem_Main' \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 8f89eef..0000000 --- a/build.gradle +++ /dev/null @@ -1,231 +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 . - */ - - -import org.apache.tools.ant.taskdefs.condition.Os - -import java.util.function.BiConsumer - -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 'steamwar' -version '' - -Properties steamwarProperties = new Properties() -if (file("steamwar.properties").exists()) { - steamwarProperties.load(file("steamwar.properties").newDataInputStream()) -} - -ext { - buildName = 'BauSystem' - artifactName = 'bausystem' - - 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' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -mainClassName = '' - -allprojects { - repositories { - mavenCentral() - jcenter() - } - - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:deprecation" - } - } -} - -dependencies { - implementation project(":BauSystem_Main") -} - -task buildProject { - description 'Build this project' - group "Steamwar" - - dependsOn build -} - -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 (!answer("Start ${server} server?")) { - return - } - serverStart(server, serverStartFlags, hostname) - } - } - - 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 deleted file mode 100644 index 7a24a33..0000000 --- a/gradle.properties +++ /dev/null @@ -1,23 +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 . -# - -org.gradle.daemon = true -org.gradle.parallel = true -org.gradle.configureondemand = 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 deleted file mode 100644 index f3d88b1..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 4aa4325..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Sat Apr 10 23:34:12 CEST 2021 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew deleted file mode 100755 index 2fe81a7..0000000 --- a/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or 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 UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$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 "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# 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 - ;; - 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 9618d8d..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@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 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 init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -: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 new file mode 100644 index 0000000..d139b8c --- /dev/null +++ b/pom.xml @@ -0,0 +1,96 @@ + + + + + 4.0.0 + + steamwar + BauSystem + 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 + + + + + + + BauSystem_12 + BauSystem_15 + BauSystem_Core + BauSystem_Main + + + + + steamwar + SpigotCore + 1.0 + system + ${main.basedir}/lib/SpigotCore.jar + + + steamwar + ProtocolLib + 1.0 + system + ${main.basedir}/lib/ProtocolLib.jar + + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 79098e0..0000000 --- a/settings.gradle +++ /dev/null @@ -1,24 +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 = 'BauSystem' - -include 'BauSystem_12' -include 'BauSystem_15' -include 'BauSystem_Main'