From a9fc7b55c363678a8c4a784a9c2ccbd0d64f81ac Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Tue, 5 Aug 2025 21:21:43 +0200 Subject: [PATCH] Update stuff --- .../bausystem/region/DynamicRegionSystem.java | 5 ----- .../region/dynamic/global/GlobalRegion.java | 5 ++--- .../normal/work/MicroWarGear21WorkRegion.java | 4 ++-- .../normal/work/MiniWarGear21WorkRegion.java | 4 ++-- .../dynamic/normal/work/WarGear21WorkRegion.java | 4 ++-- .../dynamic/normal/work/WarShip21WorkRegion.java | 4 ++-- .../bausystem/region/dynamic/path/PathRegion.java | 6 +++--- .../region/dynamic/spawn/SpawnPathRegion.java | 14 +++++++------- .../region/dynamic/spawn/SpawnRegion.java | 6 +++--- 9 files changed, 23 insertions(+), 29 deletions(-) diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java index da082a16..def463e1 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java @@ -128,9 +128,4 @@ public class DynamicRegionSystem implements RegionSystem { neighbours.remove(GlobalRegion.INSTANCE); return ((Set)(Set) neighbours).stream(); } - - @Override - public boolean isModular() { - return true; - } } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java index abacec3a..a0b021b0 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java @@ -21,7 +21,6 @@ package de.steamwar.bausystem.region.dynamic.global; import com.sk89q.worldedit.extent.clipboard.Clipboard; import de.steamwar.bausystem.region.*; -import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.dynamic.NonNormalFlagStorage; import de.steamwar.bausystem.region.dynamic.RegionDataRepository; import de.steamwar.bausystem.utils.PasteBuilder; @@ -89,7 +88,7 @@ public class GlobalRegion implements Region { } }; - private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null); + private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null); private static FlagStorage FLAG_STORAGE = new NonNormalFlagStorage(); static { @@ -130,7 +129,7 @@ public class GlobalRegion implements Region { } @Override - public @NonNull RegionConfig getGameModeConfig() { + public @NonNull GameModeConfig getGameModeConfig() { return GLOBAL_CONFIG; } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MicroWarGear21WorkRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MicroWarGear21WorkRegion.java index afa1375e..b6d1163d 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MicroWarGear21WorkRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MicroWarGear21WorkRegion.java @@ -19,7 +19,7 @@ package de.steamwar.bausystem.region.dynamic.normal.work; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.RegionConstructorData; import de.steamwar.bausystem.region.dynamic.normal.WorkArea; @@ -41,7 +41,7 @@ public class MicroWarGear21WorkRegion extends WorkRegion { private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem"); @Getter - private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement + private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement public MicroWarGear21WorkRegion(int minX, int minZ) { super(minX, minZ); diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MiniWarGear21WorkRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MiniWarGear21WorkRegion.java index b36bd740..5ce422ac 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MiniWarGear21WorkRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/MiniWarGear21WorkRegion.java @@ -19,7 +19,7 @@ package de.steamwar.bausystem.region.dynamic.normal.work; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.RegionConstructorData; import de.steamwar.bausystem.region.dynamic.normal.WorkArea; @@ -41,7 +41,7 @@ public class MiniWarGear21WorkRegion extends WorkRegion { private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem"); @Getter - private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement + private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement public MiniWarGear21WorkRegion(int minX, int minZ) { super(minX, minZ); diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarGear21WorkRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarGear21WorkRegion.java index f7c70ab1..e92ec2b3 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarGear21WorkRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarGear21WorkRegion.java @@ -19,7 +19,7 @@ package de.steamwar.bausystem.region.dynamic.normal.work; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.RegionConstructorData; import de.steamwar.bausystem.region.dynamic.normal.WorkArea; @@ -41,7 +41,7 @@ public class WarGear21WorkRegion extends WorkRegion { private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem"); @Getter - private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement + private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement public WarGear21WorkRegion(int minX, int minZ) { super(minX, minZ); diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarShip21WorkRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarShip21WorkRegion.java index bb7e3e34..b96f34a1 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarShip21WorkRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/normal/work/WarShip21WorkRegion.java @@ -19,7 +19,7 @@ package de.steamwar.bausystem.region.dynamic.normal.work; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.RegionConstructorData; import de.steamwar.bausystem.region.dynamic.normal.WorkArea; @@ -41,7 +41,7 @@ public class WarShip21WorkRegion extends WorkRegion { private static final File TESTBLOCK_FILE = new File(MODE_DIR, "Testblock.schem"); @Getter - private final RegionConfig gameModeConfig = new RegionConfig(null); // TODO: Implement + private final GameModeConfig gameModeConfig = new GameModeConfig(null); // TODO: Implement public WarShip21WorkRegion(int minX, int minZ) { super(minX, minZ); diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java index 99b12e41..f0abadcd 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java @@ -20,7 +20,7 @@ package de.steamwar.bausystem.region.dynamic.path; import de.steamwar.bausystem.region.FlagStorage; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionHistory; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.DynamicRegion; @@ -40,7 +40,7 @@ public class PathRegion extends DynamicRegion { private FlagStorage flagStorage = new NonNormalFlagStorage(); private final Area area; - private final RegionConfig config = new RegionConfig(null); + private final GameModeConfig config = new GameModeConfig(null); public PathRegion(int minX, int minZ) { super(minX, minZ); @@ -103,7 +103,7 @@ public class PathRegion extends DynamicRegion { } @Override - public @NonNull RegionConfig getGameModeConfig() { + public @NonNull GameModeConfig getGameModeConfig() { return config; } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnPathRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnPathRegion.java index 2bf50e8c..15b46705 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnPathRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnPathRegion.java @@ -19,11 +19,11 @@ package de.steamwar.bausystem.region.dynamic.spawn; -import de.steamwar.bausystem.region.FlagStorage; -import de.steamwar.bausystem.region.RegionConfig; -import de.steamwar.bausystem.region.RegionHistory; -import de.steamwar.bausystem.region.RegionType; -import de.steamwar.bausystem.region.dynamic.*; +import de.steamwar.bausystem.region.*; +import de.steamwar.bausystem.region.dynamic.DynamicRegion; +import de.steamwar.bausystem.region.dynamic.NonNormalFlagStorage; +import de.steamwar.bausystem.region.dynamic.RegionConstructorData; +import de.steamwar.bausystem.region.dynamic.RegionDataRepository; import lombok.NonNull; import org.bukkit.Bukkit; @@ -39,7 +39,7 @@ public class SpawnPathRegion extends DynamicRegion { private FlagStorage flagStorage = new NonNormalFlagStorage(); private final Area area; - private final RegionConfig config = new RegionConfig(null); + private final GameModeConfig config = new GameModeConfig(null); public SpawnPathRegion(int minX, int minZ) { super(minX, minZ); @@ -101,7 +101,7 @@ public class SpawnPathRegion extends DynamicRegion { } @Override - public @NonNull RegionConfig getGameModeConfig() { + public @NonNull GameModeConfig getGameModeConfig() { return config; } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnRegion.java index 321a8602..aae7f45f 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnRegion.java @@ -20,7 +20,7 @@ package de.steamwar.bausystem.region.dynamic.spawn; import de.steamwar.bausystem.region.FlagStorage; -import de.steamwar.bausystem.region.RegionConfig; +import de.steamwar.bausystem.region.GameModeConfig; import de.steamwar.bausystem.region.RegionHistory; import de.steamwar.bausystem.region.RegionType; import de.steamwar.bausystem.region.dynamic.DynamicRegion; @@ -39,7 +39,7 @@ public class SpawnRegion extends DynamicRegion { private FlagStorage flagStorage = new NonNormalFlagStorage(); private final Area area; - private final RegionConfig config = new RegionConfig(null); + private final GameModeConfig config = new GameModeConfig(null); public SpawnRegion(int minX, int minZ) { super(minX, minZ); @@ -88,7 +88,7 @@ public class SpawnRegion extends DynamicRegion { } @Override - public @NonNull RegionConfig getGameModeConfig() { + public @NonNull GameModeConfig getGameModeConfig() { return config; }