From 84aa126f38433d685458ee9f02bac9f643b06b1d Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 31 May 2024 22:46:34 +0200 Subject: [PATCH] Add generating plugin.yml by reading build.gradle --- BauSystem_Autostart/build.gradle | 4 +- BauSystem_Backup/build.gradle | 4 +- BauSystem_BuilderUtilities/build.gradle | 4 +- BauSystem_BuilderUtilities/src/plugin.yml | 12 ---- BauSystem_Detonator/build.gradle | 4 +- BauSystem_GUI/build.gradle | 4 +- BauSystem_GUI/src/plugin.yml | 12 ---- BauSystem_ItemUtilities/build.gradle | 4 +- BauSystem_ItemUtilities/src/plugin.yml | 12 ---- BauSystem_Loader/build.gradle | 4 +- BauSystem_Main/src/plugin.yml | 11 --- BauSystem_Scoreboard/src/plugin.yml | 11 --- BauSystem_Script/build.gradle | 4 +- BauSystem_Script/src/plugin.yml | 11 --- BauSystem_Shieldprinting/build.gradle | 4 +- BauSystem_Shieldprinting/src/plugin.yml | 11 --- .../simulator/SimulatorBauGuiItem.java | 4 +- .../simulator/SimulatorCommand.java | 10 ++- .../bausystem}/simulator/SimulatorCursor.java | 30 ++++----- .../simulator/SimulatorStorage.java | 16 ++--- .../simulator/SimulatorWatcher.java | 12 ++-- .../bausystem}/simulator/data/Simulator.java | 7 +- .../data/SimulatorBlockAlignedElement.java | 4 +- .../simulator/data/SimulatorElement.java | 9 ++- .../simulator/data/SimulatorGroup.java | 6 +- .../simulator/data/SimulatorPhase.java | 8 +-- .../data/observer/ObserverElement.java | 18 ++--- .../data/observer/ObserverPhase.java | 8 +-- .../data/redstone/RedstoneElement.java | 14 ++-- .../data/redstone/RedstonePhase.java | 8 +-- .../simulator/data/tnt/TNTElement.java | 14 ++-- .../simulator/data/tnt/TNTPhase.java | 8 +-- .../simulator/execute/SimulatorAction.java | 4 +- .../simulator/execute/SimulatorExecutor.java | 10 +-- .../gui/SimulatorGroupChooserGui.java | 16 ++--- .../simulator/gui/SimulatorGroupGui.java | 16 ++--- .../gui/SimulatorGroupSettingsGui.java | 17 +++-- .../simulator/gui/SimulatorGui.java | 14 ++-- .../simulator/gui/SimulatorMaterialGui.java | 12 ++-- .../simulator/gui/SimulatorObserverGui.java | 18 ++--- .../SimulatorObserverPhaseSettingsGui.java | 18 ++--- .../gui/SimulatorObserverSettingsGui.java | 14 ++-- .../simulator/gui/SimulatorRedstoneGui.java | 18 ++--- .../SimulatorRedstonePhaseSettingsGui.java | 18 ++--- .../gui/SimulatorRedstoneSettingsGui.java | 14 ++-- .../simulator/gui/SimulatorSettingsGui.java | 10 +-- .../simulator/gui/SimulatorTNTGui.java | 18 ++--- .../gui/SimulatorTNTPhaseSettingsGui.java | 18 ++--- .../gui/SimulatorTNTSettingsGui.java | 15 ++--- .../simulator/gui/base/SimulatorAnvilGui.java | 4 +- .../simulator/gui/base/SimulatorBaseGui.java | 8 +-- .../simulator/gui/base/SimulatorPageGui.java | 6 +- .../gui/base/SimulatorScrollGui.java | 6 +- .../storage/SimFormatSimulatorLoader.java | 24 +++---- .../SimulatorFormatSimulatorLoader.java | 12 ++-- .../simulator/storage/SimulatorLoader.java | 6 +- .../simulator/storage/SimulatorSaver.java | 6 +- .../storage/YAPIONFormatSimulatorLoader.java | 12 ++-- BauSystem_Simulator/src/plugin.yml | 11 --- BauSystem_TPSLimit/build.gradle | 6 +- BauSystem_TPSLimit/src/plugin.yml | 11 --- BauSystem_Tracer/build.gradle | 2 + BauSystem_Tracer/src/plugin.yml | 11 --- BauSystem_Warp/build.gradle | 2 + BauSystem_Warp/src/plugin.yml | 11 --- build.gradle | 2 +- module.gradle | 67 +++++++++++++++++++ 67 files changed, 354 insertions(+), 395 deletions(-) delete mode 100644 BauSystem_BuilderUtilities/src/plugin.yml delete mode 100644 BauSystem_GUI/src/plugin.yml delete mode 100644 BauSystem_ItemUtilities/src/plugin.yml delete mode 100644 BauSystem_Main/src/plugin.yml delete mode 100644 BauSystem_Scoreboard/src/plugin.yml delete mode 100644 BauSystem_Script/src/plugin.yml delete mode 100644 BauSystem_Shieldprinting/src/plugin.yml rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/SimulatorBauGuiItem.java (95%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/SimulatorCommand.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/SimulatorCursor.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/SimulatorStorage.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/SimulatorWatcher.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/Simulator.java (90%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/SimulatorBlockAlignedElement.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/SimulatorElement.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/SimulatorGroup.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/SimulatorPhase.java (86%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/observer/ObserverElement.java (83%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/observer/ObserverPhase.java (91%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/redstone/RedstoneElement.java (78%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/redstone/RedstonePhase.java (90%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/tnt/TNTElement.java (88%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/data/tnt/TNTPhase.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/execute/SimulatorAction.java (90%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/execute/SimulatorExecutor.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorGroupChooserGui.java (85%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorGroupGui.java (88%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorGroupSettingsGui.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorGui.java (83%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorMaterialGui.java (87%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorObserverGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorObserverPhaseSettingsGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorObserverSettingsGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorRedstoneGui.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorRedstonePhaseSettingsGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorRedstoneSettingsGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorSettingsGui.java (92%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorTNTGui.java (91%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorTNTPhaseSettingsGui.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/SimulatorTNTSettingsGui.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/base/SimulatorAnvilGui.java (95%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/base/SimulatorBaseGui.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/base/SimulatorPageGui.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/gui/base/SimulatorScrollGui.java (94%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/storage/SimFormatSimulatorLoader.java (85%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/storage/SimulatorFormatSimulatorLoader.java (93%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/storage/SimulatorLoader.java (84%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/storage/SimulatorSaver.java (95%) rename {BauSystem_Main/src/de/steamwar/bausystem/features => BauSystem_Simulator/src/de/steamwar/bausystem}/simulator/storage/YAPIONFormatSimulatorLoader.java (90%) delete mode 100644 BauSystem_Simulator/src/plugin.yml delete mode 100644 BauSystem_TPSLimit/src/plugin.yml delete mode 100644 BauSystem_Tracer/src/plugin.yml delete mode 100644 BauSystem_Warp/src/plugin.yml create mode 100644 module.gradle diff --git a/BauSystem_Autostart/build.gradle b/BauSystem_Autostart/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Autostart/build.gradle +++ b/BauSystem_Autostart/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_Backup/build.gradle b/BauSystem_Backup/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Backup/build.gradle +++ b/BauSystem_Backup/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_BuilderUtilities/build.gradle b/BauSystem_BuilderUtilities/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_BuilderUtilities/build.gradle +++ b/BauSystem_BuilderUtilities/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_BuilderUtilities/src/plugin.yml b/BauSystem_BuilderUtilities/src/plugin.yml deleted file mode 100644 index 219c80ef..00000000 --- a/BauSystem_BuilderUtilities/src/plugin.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: BauSystem_GUI -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -softdepend: [ ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Detonator/build.gradle b/BauSystem_Detonator/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Detonator/build.gradle +++ b/BauSystem_Detonator/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_GUI/build.gradle b/BauSystem_GUI/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_GUI/build.gradle +++ b/BauSystem_GUI/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_GUI/src/plugin.yml b/BauSystem_GUI/src/plugin.yml deleted file mode 100644 index 219c80ef..00000000 --- a/BauSystem_GUI/src/plugin.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: BauSystem_GUI -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -softdepend: [ ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_ItemUtilities/build.gradle b/BauSystem_ItemUtilities/build.gradle index e61cbb87..8ee6ddca 100644 --- a/BauSystem_ItemUtilities/build.gradle +++ b/BauSystem_ItemUtilities/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -62,4 +64,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_ItemUtilities/src/plugin.yml b/BauSystem_ItemUtilities/src/plugin.yml deleted file mode 100644 index 20197b99..00000000 --- a/BauSystem_ItemUtilities/src/plugin.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: BauSystem_ItemUtilities -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -softdepend: [ BauSystem_GUI ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Loader/build.gradle b/BauSystem_Loader/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Loader/build.gradle +++ b/BauSystem_Loader/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_Main/src/plugin.yml b/BauSystem_Main/src/plugin.yml deleted file mode 100644 index 71b08d95..00000000 --- a/BauSystem_Main/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystem -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Scoreboard/src/plugin.yml b/BauSystem_Scoreboard/src/plugin.yml deleted file mode 100644 index cf7115ba..00000000 --- a/BauSystem_Scoreboard/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Script/build.gradle b/BauSystem_Script/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Script/build.gradle +++ b/BauSystem_Script/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_Script/src/plugin.yml b/BauSystem_Script/src/plugin.yml deleted file mode 100644 index cf7115ba..00000000 --- a/BauSystem_Script/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Shieldprinting/build.gradle b/BauSystem_Shieldprinting/build.gradle index dd0a66df..eaf2b679 100644 --- a/BauSystem_Shieldprinting/build.gradle +++ b/BauSystem_Shieldprinting/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -60,4 +62,4 @@ dependencies { // compileOnly swdep('AxiomPaper') // implementation 'org.luaj:luaj-jse:3.0.1' -} \ No newline at end of file +} diff --git a/BauSystem_Shieldprinting/src/plugin.yml b/BauSystem_Shieldprinting/src/plugin.yml deleted file mode 100644 index cf7115ba..00000000 --- a/BauSystem_Shieldprinting/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorBauGuiItem.java similarity index 95% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorBauGuiItem.java index d03dc55c..4cde82cd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorBauGuiItem.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorBauGuiItem.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator; +package de.steamwar.bausystem.simulator; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.Permission; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCommand.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCommand.java index 06af3e68..87e03e97 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCommand.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,17 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator; +package de.steamwar.bausystem.simulator; import de.steamwar.bausystem.BauSystem; -import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.SWUtils; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.execute.SimulatorExecutor; import de.steamwar.command.PreviousArguments; import de.steamwar.command.SWCommand; import de.steamwar.command.TypeMapper; -import de.steamwar.command.TypeValidator; import de.steamwar.linkage.Linked; import de.steamwar.linkage.LinkedInstance; import de.steamwar.linkage.MinVersion; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCursor.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCursor.java index a7664158..731fbe49 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorCursor.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,26 +17,26 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator; +package de.steamwar.bausystem.simulator; import com.comphenix.tinyprotocol.Reflection; import com.comphenix.tinyprotocol.TinyProtocol; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.SWUtils; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; -import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor; -import de.steamwar.bausystem.features.simulator.gui.SimulatorGroupGui; -import de.steamwar.bausystem.features.simulator.gui.SimulatorGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.observer.ObserverElement; +import de.steamwar.bausystem.simulator.data.observer.ObserverPhase; +import de.steamwar.bausystem.simulator.data.redstone.RedstoneElement; +import de.steamwar.bausystem.simulator.data.redstone.RedstonePhase; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.execute.SimulatorExecutor; +import de.steamwar.bausystem.simulator.gui.SimulatorGroupGui; +import de.steamwar.bausystem.simulator.gui.SimulatorGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.bausystem.utils.BauMemberUpdateEvent; import de.steamwar.bausystem.utils.ItemUtils; import de.steamwar.bausystem.utils.RayTraceUtils; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorStorage.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorStorage.java index b3fbcba8..1ed2e485 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorStorage.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,17 +17,17 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator; +package de.steamwar.bausystem.simulator; import com.google.common.io.Files; import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.SWUtils; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui; -import de.steamwar.bausystem.features.simulator.storage.SimFormatSimulatorLoader; -import de.steamwar.bausystem.features.simulator.storage.SimulatorFormatSimulatorLoader; -import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver; -import de.steamwar.bausystem.features.simulator.storage.YAPIONFormatSimulatorLoader; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.gui.base.SimulatorPageGui; +import de.steamwar.bausystem.simulator.storage.SimFormatSimulatorLoader; +import de.steamwar.bausystem.simulator.storage.SimulatorFormatSimulatorLoader; +import de.steamwar.bausystem.simulator.storage.SimulatorSaver; +import de.steamwar.bausystem.simulator.storage.YAPIONFormatSimulatorLoader; import de.steamwar.bausystem.utils.ItemUtils; import de.steamwar.inventory.SWAnvilInv; import de.steamwar.inventory.SWItem; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorWatcher.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorWatcher.java index d5f98986..f6593c03 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorWatcher.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/SimulatorWatcher.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator; +package de.steamwar.bausystem.simulator; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.storage.SimulatorSaver; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.storage.SimulatorSaver; import de.steamwar.bausystem.shared.Pair; import de.steamwar.entity.REntity; import de.steamwar.entity.REntityServer; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/Simulator.java similarity index 90% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/Simulator.java index 91b7a8e1..def8dceb 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/Simulator.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data; +package de.steamwar.bausystem.simulator.data; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; import lombok.Getter; @@ -30,7 +30,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.function.BiConsumer; @Getter diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorBlockAlignedElement.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorBlockAlignedElement.java index de0d2b69..80638b8d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorBlockAlignedElement.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorBlockAlignedElement.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data; +package de.steamwar.bausystem.simulator.data; import org.bukkit.Material; import org.bukkit.util.Vector; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorElement.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorElement.java index 119143db..a7d21dc8 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorElement.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorElement.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data; +package de.steamwar.bausystem.simulator.data; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; import lombok.Getter; @@ -33,7 +33,6 @@ import yapion.hierarchy.types.YAPIONObject; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Map; import java.util.function.BiConsumer; @Getter diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorGroup.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorGroup.java index 8031dd1c..13feee92 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorGroup.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorGroup.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data; +package de.steamwar.bausystem.simulator.data; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; import lombok.Getter; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorPhase.java similarity index 86% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorPhase.java index b226d124..6968793e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/SimulatorPhase.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/SimulatorPhase.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,16 +17,14 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data; +package de.steamwar.bausystem.simulator.data; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import lombok.Getter; import lombok.Setter; import org.bukkit.util.Vector; import yapion.hierarchy.types.YAPIONObject; -import java.util.List; -import java.util.Map; import java.util.function.BiConsumer; @Getter diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverElement.java similarity index 83% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverElement.java index 7fdff328..7232fa10 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverElement.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverElement.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.observer; +package de.steamwar.bausystem.simulator.data.observer; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorBlockAlignedElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; -import de.steamwar.bausystem.features.simulator.gui.SimulatorObserverGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorBlockAlignedElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.gui.SimulatorObserverGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverPhase.java similarity index 91% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverPhase.java index e3707c3e..631af8d7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/observer/ObserverPhase.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/observer/ObserverPhase.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.observer; +package de.steamwar.bausystem.simulator.data.observer; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstoneElement.java similarity index 78% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstoneElement.java index 3b949609..ec39d80a 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstoneElement.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstoneElement.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.redstone; +package de.steamwar.bausystem.simulator.data.redstone; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorBlockAlignedElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.gui.SimulatorRedstoneGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorBlockAlignedElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.gui.SimulatorRedstoneGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstonePhase.java similarity index 90% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstonePhase.java index 614be659..debaee53 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/redstone/RedstonePhase.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/redstone/RedstonePhase.java @@ -2,7 +2,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -18,10 +18,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.redstone; +package de.steamwar.bausystem.simulator.data.redstone; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import lombok.NoArgsConstructor; import org.bukkit.Material; import org.bukkit.World; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTElement.java similarity index 88% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTElement.java index 4fbede7e..1a39a82d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTElement.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTElement.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.tnt; +package de.steamwar.bausystem.simulator.data.tnt; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.gui.SimulatorTNTGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.gui.SimulatorTNTGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; import lombok.Getter; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTPhase.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTPhase.java index 4c03ac9b..c85e488f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/data/tnt/TNTPhase.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.data.tnt; +package de.steamwar.bausystem.simulator.data.tnt; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.execute.SimulatorAction; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.execute.SimulatorAction; import de.steamwar.bausystem.region.Region; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorAction.java similarity index 90% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorAction.java index c6c9f1da..bcda99a9 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorAction.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorAction.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.execute; +package de.steamwar.bausystem.simulator.execute; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorExecutor.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorExecutor.java index 5c3d30e0..90d5c292 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/execute/SimulatorExecutor.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.execute; +package de.steamwar.bausystem.simulator.execute; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; import de.steamwar.bausystem.features.tpslimit.TPSUtils; import de.steamwar.bausystem.features.tracer.TraceRecorder; import de.steamwar.bausystem.region.Region; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupChooserGui.java similarity index 85% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupChooserGui.java index 10396677..6d93bcf3 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupChooserGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupChooserGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorPageGui; import de.steamwar.inventory.InvCallback; import de.steamwar.inventory.SWItem; import org.bukkit.Material; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupGui.java similarity index 88% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupGui.java index c3b8ee1a..62398f47 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorPageGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupSettingsGui.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupSettingsGui.java index ba5b984e..fd468f0a 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGroupSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGroupSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,18 +17,17 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.util.Vector; import java.util.Arrays; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGui.java similarity index 83% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGui.java index e35f0eaa..ebc73719 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.gui.base.SimulatorPageGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorMaterialGui.java similarity index 87% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorMaterialGui.java index 84f1e682..d010623d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorMaterialGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorMaterialGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorPageGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorPageGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverGui.java index 42669387..a11b314e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.observer.ObserverElement; +import de.steamwar.bausystem.simulator.data.observer.ObserverPhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorScrollGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverPhaseSettingsGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverPhaseSettingsGui.java index f7925c34..6c4ca698 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverPhaseSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.data.observer.ObserverElement; +import de.steamwar.bausystem.simulator.data.observer.ObserverPhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.core.Core; import de.steamwar.inventory.SWItem; import org.bukkit.Material; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverSettingsGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverSettingsGui.java index 8084c7b1..a2c836bd 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorObserverSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.observer.ObserverElement; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneGui.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneGui.java index 2e288895..bbb08108 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.redstone.RedstoneElement; +import de.steamwar.bausystem.simulator.data.redstone.RedstonePhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorScrollGui; import de.steamwar.inventory.SWItem; import lombok.AllArgsConstructor; import org.bukkit.Material; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstonePhaseSettingsGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstonePhaseSettingsGui.java index 27901b09..40f8a241 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstonePhaseSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.data.redstone.RedstoneElement; +import de.steamwar.bausystem.simulator.data.redstone.RedstonePhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.core.Core; import de.steamwar.inventory.SWItem; import org.bukkit.Material; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneSettingsGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneSettingsGui.java index 184d73a1..035bc2bc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorRedstoneSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.redstone.RedstoneElement; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorSettingsGui.java similarity index 92% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorSettingsGui.java index ccb00412..63e35230 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTGui.java similarity index 91% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTGui.java index a9c178ce..c9798f0c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorScrollGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTPhaseSettingsGui.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTPhaseSettingsGui.java index 9bfc4fe5..2d37e1d8 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTPhaseSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.core.Core; import de.steamwar.inventory.SWItem; import org.bukkit.Material; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTSettingsGui.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTSettingsGui.java index 24dbb22e..563797a8 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/SimulatorTNTSettingsGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,17 +17,16 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui; +package de.steamwar.bausystem.simulator.gui; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui; -import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.gui.base.SimulatorAnvilGui; +import de.steamwar.bausystem.simulator.gui.base.SimulatorBaseGui; import de.steamwar.inventory.SWItem; import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.util.Vector; import java.util.ArrayList; import java.util.Arrays; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorAnvilGui.java similarity index 95% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorAnvilGui.java index 380dc618..8c05550a 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorAnvilGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorAnvilGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui.base; +package de.steamwar.bausystem.simulator.gui.base; import de.steamwar.bausystem.BauSystem; import de.steamwar.inventory.SWAnvilInv; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorBaseGui.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorBaseGui.java index 41f95a88..e310163c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorBaseGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui.base; +package de.steamwar.bausystem.simulator.gui.base; -import de.steamwar.bausystem.features.simulator.SimulatorWatcher; -import de.steamwar.bausystem.features.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.SimulatorWatcher; +import de.steamwar.bausystem.simulator.data.Simulator; import de.steamwar.core.Core; import de.steamwar.inventory.SWInventory; import de.steamwar.inventory.SWItem; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorPageGui.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorPageGui.java index e3c3ccbd..c9e84cfc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorPageGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorPageGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui.base; +package de.steamwar.bausystem.simulator.gui.base; -import de.steamwar.bausystem.features.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.Simulator; import de.steamwar.core.Core; import de.steamwar.inventory.SWItem; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorScrollGui.java similarity index 94% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorScrollGui.java index a4cfbb5d..e7ecf6fc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorScrollGui.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/gui/base/SimulatorScrollGui.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.gui.base; +package de.steamwar.bausystem.simulator.gui.base; -import de.steamwar.bausystem.features.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.Simulator; import de.steamwar.core.Core; import de.steamwar.inventory.SWItem; import org.bukkit.entity.Player; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimFormatSimulatorLoader.java similarity index 85% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimFormatSimulatorLoader.java index 218c89a4..f03c349c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimFormatSimulatorLoader.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,18 +17,18 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.storage; +package de.steamwar.bausystem.simulator.storage; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorElement; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.SimulatorPhase; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverElement; -import de.steamwar.bausystem.features.simulator.data.observer.ObserverPhase; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstoneElement; -import de.steamwar.bausystem.features.simulator.data.redstone.RedstonePhase; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorElement; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.SimulatorPhase; +import de.steamwar.bausystem.simulator.data.observer.ObserverElement; +import de.steamwar.bausystem.simulator.data.observer.ObserverPhase; +import de.steamwar.bausystem.simulator.data.redstone.RedstoneElement; +import de.steamwar.bausystem.simulator.data.redstone.RedstonePhase; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; import org.bukkit.Material; import org.bukkit.util.Vector; import yapion.exceptions.YAPIONException; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorFormatSimulatorLoader.java similarity index 93% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorFormatSimulatorLoader.java index a386f86d..e713880f 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorFormatSimulatorLoader.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorFormatSimulatorLoader.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.storage; +package de.steamwar.bausystem.simulator.storage; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; import org.bukkit.Material; import org.bukkit.util.Vector; import yapion.exceptions.YAPIONException; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorLoader.java similarity index 84% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorLoader.java index 4c9e3f92..03e761e8 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorLoader.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorLoader.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.storage; +package de.steamwar.bausystem.simulator.storage; -import de.steamwar.bausystem.features.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.Simulator; import java.io.File; import java.util.List; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorSaver.java similarity index 95% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorSaver.java index 48ccfd7a..ba7b4879 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/SimulatorSaver.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.storage; +package de.steamwar.bausystem.simulator.storage; -import de.steamwar.bausystem.features.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.Simulator; import lombok.experimental.UtilityClass; import yapion.hierarchy.output.FileOutput; import yapion.hierarchy.types.YAPIONArray; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/YAPIONFormatSimulatorLoader.java similarity index 90% rename from BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java rename to BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/YAPIONFormatSimulatorLoader.java index 0c715443..b5c7a894 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/YAPIONFormatSimulatorLoader.java +++ b/BauSystem_Simulator/src/de/steamwar/bausystem/simulator/storage/YAPIONFormatSimulatorLoader.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2023 SteamWar.de-Serverteam + * Copyright (C) 2024 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 @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.features.simulator.storage; +package de.steamwar.bausystem.simulator.storage; -import de.steamwar.bausystem.features.simulator.data.Simulator; -import de.steamwar.bausystem.features.simulator.data.SimulatorGroup; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement; -import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase; +import de.steamwar.bausystem.simulator.data.Simulator; +import de.steamwar.bausystem.simulator.data.SimulatorGroup; +import de.steamwar.bausystem.simulator.data.tnt.TNTElement; +import de.steamwar.bausystem.simulator.data.tnt.TNTPhase; import de.steamwar.sql.SteamwarUser; import org.bukkit.Material; import org.bukkit.util.Vector; diff --git a/BauSystem_Simulator/src/plugin.yml b/BauSystem_Simulator/src/plugin.yml deleted file mode 100644 index cf7115ba..00000000 --- a/BauSystem_Simulator/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_TPSLimit/build.gradle b/BauSystem_TPSLimit/build.gradle index dba3947a..f9ff1197 100644 --- a/BauSystem_TPSLimit/build.gradle +++ b/BauSystem_TPSLimit/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' @@ -44,9 +46,9 @@ sourceSets { dependencies { implementation project(":BauSystem_PluginBase") - implementation project(":BauSystem_GUI") + compileOnly project(":BauSystem_GUI") annotationProcessor project(":BauSystem_GUI") - implementation project(":BauSystem_Scoreboard") + compileOnly project(":BauSystem_Scoreboard") annotationProcessor project(":BauSystem_Scoreboard") compileOnly 'org.projectlombok:lombok:1.18.22' diff --git a/BauSystem_TPSLimit/src/plugin.yml b/BauSystem_TPSLimit/src/plugin.yml deleted file mode 100644 index ea4df5f2..00000000 --- a/BauSystem_TPSLimit/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem_TPSLimit -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore, BauSystem_GUI, BauSystem_Scoreboard ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Tracer/build.gradle b/BauSystem_Tracer/build.gradle index dd0a66df..ba94acaf 100644 --- a/BauSystem_Tracer/build.gradle +++ b/BauSystem_Tracer/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' diff --git a/BauSystem_Tracer/src/plugin.yml b/BauSystem_Tracer/src/plugin.yml deleted file mode 100644 index 9a751ebb..00000000 --- a/BauSystem_Tracer/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem_Tracer -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/BauSystem_Warp/build.gradle b/BauSystem_Warp/build.gradle index dd0a66df..ba94acaf 100644 --- a/BauSystem_Warp/build.gradle +++ b/BauSystem_Warp/build.gradle @@ -22,6 +22,8 @@ plugins { id 'java' } +apply from: '../module.gradle' + group 'steamwar' version '1.0' diff --git a/BauSystem_Warp/src/plugin.yml b/BauSystem_Warp/src/plugin.yml deleted file mode 100644 index 3d2e390f..00000000 --- a/BauSystem_Warp/src/plugin.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: BauSystem_Warp -authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ] -version: "2.0" -depend: [ WorldEdit, SpigotCore ] -load: POSTWORLD -main: de.steamwar.bausystem.BauSystemPlugin -api-version: "1.13" -website: "https://steamwar.de" -description: "So unseriös wie wir sind: BauSystem nur besser." - -commands: diff --git a/build.gradle b/build.gradle index 5b8a3f12..e005af23 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ dependencies { return } if (new File(it, "build.gradle").exists()) { - implementation project(":" + it.name) + compileOnly project(":" + it.name) } } } diff --git a/module.gradle b/module.gradle new file mode 100644 index 00000000..4eae4ecc --- /dev/null +++ b/module.gradle @@ -0,0 +1,67 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2024 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 . + */ + +processResources { + doLast { + List hardDependencies = new ArrayList<>() + List softDependencies = new ArrayList<>() + new File("${buildDir}/../build.gradle").eachLine { + if (it.trim().startsWith("compileOnly project(\":BauSystem_") && it.trim().endsWith("\")")) { + String softDepends = it.trim().substring(32, it.trim().size() - 2) + softDependencies.add(softDepends) + } else if (it.trim().startsWith("compileOnly project(\":BauSystem_") && it.trim().endsWith("\") // SOFT")) { + String softDepends = it.trim().substring(32, it.trim().size() - 10) + softDependencies.add(softDepends) + } else if (it.trim().startsWith("compileOnly project(\":BauSystem_") && it.trim().endsWith("\") // HARD")) { + String hardDepends = it.trim().substring(32, it.trim().size() - 10) + hardDependencies.add(hardDepends) + } + } + + File pluginYmlFile = new File("${buildDir}/resources/main/plugin.yml") + pluginYmlFile.parentFile.mkdirs() + pluginYmlFile.createNewFile() + pluginYmlFile.append("name: ${project.name}\n") + pluginYmlFile.append("authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ]\n") + pluginYmlFile.append("version: \"2.0\"\n") + + pluginYmlFile.append("depend:\n") + pluginYmlFile.append("- WorldEdit\n") + pluginYmlFile.append("- SpigotCore\n") + hardDependencies.forEach { + pluginYmlFile.append("- BauSystem_${it}\n") + } + + if (!softDependencies.isEmpty()) { + pluginYmlFile.append("softdepend:") + softDependencies.forEach { + pluginYmlFile.append("\n- BauSystem_${it}") + } + pluginYmlFile.append("\n") + } + + pluginYmlFile.append("load: POSTWORLD\n") + pluginYmlFile.append("main: de.steamwar.bausystem.BauSystemPlugin\n") + pluginYmlFile.append("api-version: \"1.13\"\n") + pluginYmlFile.append("website: \"https://steamwar.de\"\n") + pluginYmlFile.append("description: \"So unseriös wie wir sind: BauSystem nur besser.\"\n") + pluginYmlFile.append("\n") + pluginYmlFile.append("commands:\n") + } +}