From 0763e4b18967b30febcf34b225276c95eb27f478 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Fri, 1 Aug 2025 22:34:51 +0200 Subject: [PATCH] Move some stuff around --- .../bausystem/region/FixedRegionSystem.java | 1 + .../region/{ => fixed}/FixedFlagStorage.java | 29 ++++++++++--------- .../{ => fixed}/FixedGlobalFlagStorage.java | 5 +++- .../region/{ => fixed}/FixedGlobalRegion.java | 27 ++++++++--------- .../region/{ => fixed}/Prototype.java | 6 ++-- .../regionold/loader/PrototypeLoader.java.txt | 2 +- .../regionold/loader/RegionLoader.java.txt | 2 +- 7 files changed, 41 insertions(+), 31 deletions(-) rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedFlagStorage.java (55%) rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedGlobalFlagStorage.java (92%) rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/FixedGlobalRegion.java (77%) rename BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/{ => fixed}/Prototype.java (98%) diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java index 473ec0d3..f9ca3d13 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java @@ -19,6 +19,7 @@ package de.steamwar.bausystem.region; +import de.steamwar.bausystem.region.fixed.FixedGlobalRegion; import lombok.NonNull; import org.bukkit.Location; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java similarity index 55% rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java index f2c05616..3de70483 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java @@ -1,24 +1,27 @@ /* - * This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. * - * Copyright (C) 2024 SteamWar.de-Serverteam + * Copyright (C) 2020 SteamWar.de-Serverteam * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is 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. + * 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 . + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ -package de.steamwar.bausystem.region; +package de.steamwar.bausystem.region.fixed; +import de.steamwar.bausystem.region.FlagOptional; +import de.steamwar.bausystem.region.FlagStorage; +import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.core.Core; import lombok.NonNull; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java similarity index 92% rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java index f20f9a02..164b40e6 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalFlagStorage.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java @@ -17,8 +17,11 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.region; +package de.steamwar.bausystem.region.fixed; +import de.steamwar.bausystem.region.FlagOptional; +import de.steamwar.bausystem.region.FlagStorage; +import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.flags.ColorMode; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.ProtectMode; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java similarity index 77% rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java index d00b5a2c..3dbcbdd4 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java @@ -1,25 +1,26 @@ /* - * This file is a part of the SteamWar software. + * This file is a part of the SteamWar software. * - * Copyright (C) 2024 SteamWar.de-Serverteam + * Copyright (C) 2020 SteamWar.de-Serverteam * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This program is 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. + * 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 . + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ -package de.steamwar.bausystem.region; +package de.steamwar.bausystem.region.fixed; import com.sk89q.worldedit.EditSession; +import de.steamwar.bausystem.region.*; import de.steamwar.bausystem.utils.PasteBuilder; import lombok.NonNull; import org.bukkit.Location; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java similarity index 98% rename from BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java rename to BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java index f4aefc56..962d9a19 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/Prototype.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/Prototype.java @@ -1,7 +1,7 @@ /* * This file is a part of the SteamWar software. * - * Copyright (C) 2021 SteamWar.de-Serverteam + * Copyright (C) 2020 SteamWar.de-Serverteam * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,8 +17,10 @@ * along with this program. If not, see . */ -package de.steamwar.bausystem.region; +package de.steamwar.bausystem.region.fixed; +import de.steamwar.bausystem.region.FlagStorage; +import de.steamwar.bausystem.region.Region; import lombok.AllArgsConstructor; import lombok.Getter; import yapion.hierarchy.types.YAPIONObject; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt index 851cdcfd..001ab702 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/PrototypeLoader.java.txt @@ -19,7 +19,7 @@ package de.steamwar.bausystem.region.loader; -import de.steamwar.bausystem.region.Prototype; +import de.steamwar.bausystem.region.fixed.Prototype; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; import yapion.hierarchy.diff.DiffDelete; diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt index 7a66dbba..0fe7a16f 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/regionold/loader/RegionLoader.java.txt @@ -21,7 +21,7 @@ package de.steamwar.bausystem.region.loader; import de.steamwar.bausystem.region.FlagStorage; import de.steamwar.bausystem.region.GlobalRegion; -import de.steamwar.bausystem.region.Prototype; +import de.steamwar.bausystem.region.fixed.Prototype; import de.steamwar.bausystem.worlddata.WorldData; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit;