From b695a7e089823f56007a9b4c8b5f323562210928 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Tue, 5 Aug 2025 20:59:43 +0200 Subject: [PATCH] Update stuff from peer review --- .../bausystem/features/tracer/TraceRepository.java | 2 +- .../region/{RegionConfig.java => GameModeConfig.java} | 7 +++++-- .../src/de/steamwar/bausystem/region/Region.java | 2 +- .../src/de/steamwar/bausystem/region/RegionSystem.java | 7 ------- .../de/steamwar/bausystem/region/flags/ChangedMode.java | 5 ++++- .../src/de/steamwar/bausystem/region/flags/ColorMode.java | 5 ++++- .../src/de/steamwar/bausystem/region/flags/FireMode.java | 5 ++++- .../de/steamwar/bausystem/region/flags/FreezeMode.java | 5 ++++- .../src/de/steamwar/bausystem/region/flags/ItemMode.java | 5 ++++- .../de/steamwar/bausystem/region/flags/NoGravityMode.java | 5 ++++- .../de/steamwar/bausystem/region/flags/ProtectMode.java | 5 ++++- .../src/de/steamwar/bausystem/region/flags/TNTMode.java | 5 ++++- .../de/steamwar/bausystem/region/flags/TestblockMode.java | 5 ++++- .../de/steamwar/bausystem/region/FixedRegionSystem.java | 5 ----- .../bausystem/region/fixed/FixedGlobalRegion.java | 4 ++-- .../de/steamwar/bausystem/region/fixed/FixedRegion.java | 8 ++++---- 16 files changed, 49 insertions(+), 31 deletions(-) rename BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/{RegionConfig.java => GameModeConfig.java} (97%) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java index 0765d92b..209dee9a 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRepository.java @@ -18,7 +18,7 @@ public class TraceRepository { /** * Increment this when changing serialisation format */ - public static final int SERIALISATION_VERSION = 2; + public static final int SERIALISATION_VERSION = 3; public static final int WRITE_TICK_DATA = 0b00000001; public static final int EXPLOSION = 0b00000010; public static final int IN_WATER = 0b00000100; diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java similarity index 97% rename from BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java rename to BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java index 71e347c6..e0197661 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionConfig.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java @@ -33,17 +33,20 @@ import java.util.*; import java.util.stream.Collectors; @Getter -public class RegionConfig { +public class GameModeConfig { private final boolean loaded; + /** + * See gamemode config Times key + */ private Times Times = new Times(); private Schematic Schematic = new Schematic(); private Arena Arena = new Arena(); private Server Server = new Server(); private Techhider Techhider = new Techhider(); - public RegionConfig(File file) { + public GameModeConfig(File file) { if (file == null || !file.exists()) { loaded = false; return; diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java index 609364a1..d00cb4e1 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java @@ -64,7 +64,7 @@ public interface Region { Area getTestblockArea(); @NonNull - RegionConfig getGameModeConfig(); + GameModeConfig getGameModeConfig(); @NonNull RegionHistory getHistory(); diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java index bc37f66f..5d967f1a 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java @@ -74,8 +74,6 @@ public interface RegionSystem { @NonNull Stream getRegions(); - boolean isModular(); - private static RegionSystem init() { try { return (RegionSystem) Class.forName("de.steamwar.bausystem.region.FixedRegionSystem").getConstructor().newInstance(); @@ -116,11 +114,6 @@ public interface RegionSystem { public Stream getRegions() { throw new UnsupportedOperationException(); } - - @Override - public boolean isModular() { - throw new UnsupportedOperationException(); - } }; } } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java index ee7e7399..07b054b7 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ChangedMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * ChangedMode defines that a Region has changed or not + */ @Getter @AllArgsConstructor public enum ChangedMode implements Flag.Value { @@ -36,7 +39,7 @@ public enum ChangedMode implements Flag.Value { @Override public ChangedMode[] getValues() { if (ChangedMode.values == null) { - ChangedMode.values = ChangedMode.values(); //NOSONAR + ChangedMode.values = ChangedMode.values(); } return ChangedMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java index 1f7db755..60d8abfa 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ColorMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * ColorMode defines the colors a Region can have + */ @Getter @AllArgsConstructor public enum ColorMode implements Flag.Value { @@ -49,7 +52,7 @@ public enum ColorMode implements Flag.Value { @Override public ColorMode[] getValues() { if (ColorMode.values == null) { - ColorMode.values = ColorMode.values(); //NOSONAR + ColorMode.values = ColorMode.values(); } return ColorMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java index 48deb0b7..1c48b649 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FireMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * FireMode defines if fire should be enabled or disabled in a Region + */ @Getter @AllArgsConstructor public enum FireMode implements Flag.Value { @@ -35,7 +38,7 @@ public enum FireMode implements Flag.Value { @Override public FireMode[] getValues() { if (FireMode.values == null) { - FireMode.values = FireMode.values(); //NOSONAR + FireMode.values = FireMode.values(); } return FireMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java index 4f80ca57..ad3f0d09 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/FreezeMode.java @@ -23,6 +23,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * FreezeMode defines if freeze should be enabled or disabled in a Region + */ @Getter @AllArgsConstructor public enum FreezeMode implements Flag.Value { @@ -36,7 +39,7 @@ public enum FreezeMode implements Flag.Value { @Override public FreezeMode[] getValues() { if (FreezeMode.values == null) { - FreezeMode.values = FreezeMode.values(); //NOSONAR + FreezeMode.values = FreezeMode.values(); } return FreezeMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java index a846a53c..60235e4f 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ItemMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * ItemMode defines if items should be droppable or deleted in a Region + */ @Getter @AllArgsConstructor public enum ItemMode implements Flag.Value { @@ -35,7 +38,7 @@ public enum ItemMode implements Flag.Value { @Override public ItemMode[] getValues() { if (ItemMode.values == null) { - ItemMode.values = ItemMode.values(); //NOSONAR + ItemMode.values = ItemMode.values(); } return ItemMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java index 921d36ea..98bd0b5f 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/NoGravityMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * NoGravityMode defines if entities and items should have gravity or not in a Region + */ @Getter @AllArgsConstructor public enum NoGravityMode implements Flag.Value { @@ -35,7 +38,7 @@ public enum NoGravityMode implements Flag.Value { @Override public NoGravityMode[] getValues() { if (NoGravityMode.values == null) { - NoGravityMode.values = NoGravityMode.values(); //NOSONAR + NoGravityMode.values = NoGravityMode.values(); } return NoGravityMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java index be4f6132..7805d49b 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/ProtectMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * ProtectMode defines if the floor should be protected inside a Region + */ @Getter @AllArgsConstructor public enum ProtectMode implements Flag.Value { @@ -35,7 +38,7 @@ public enum ProtectMode implements Flag.Value { @Override public ProtectMode[] getValues() { if (ProtectMode.values == null) { - ProtectMode.values = ProtectMode.values(); //NOSONAR + ProtectMode.values = ProtectMode.values(); } return ProtectMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java index fe343707..8c7d61f5 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TNTMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * TNTMode defines what TNT Explosions should destroy in a Region + */ @Getter @AllArgsConstructor public enum TNTMode implements Flag.Value { @@ -36,7 +39,7 @@ public enum TNTMode implements Flag.Value { @Override public TNTMode[] getValues() { if (TNTMode.values == null) { - TNTMode.values = TNTMode.values(); //NOSONAR + TNTMode.values = TNTMode.values(); } return TNTMode.values; } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java index ba1b8f61..e89ab19f 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/TestblockMode.java @@ -22,6 +22,9 @@ package de.steamwar.bausystem.region.flags; import lombok.AllArgsConstructor; import lombok.Getter; +/** + * TestblockMode defines where the Testblock should be inside a Region + */ @Getter @AllArgsConstructor public enum TestblockMode implements Flag.Value { @@ -37,7 +40,7 @@ public enum TestblockMode implements Flag.Value { @Override public TestblockMode[] getValues() { if (TestblockMode.values == null) { - TestblockMode.values = TestblockMode.values(); //NOSONAR + TestblockMode.values = TestblockMode.values(); } return TestblockMode.values; } 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 8a817870..df41ac6f 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java @@ -79,9 +79,4 @@ public class FixedRegionSystem implements RegionSystem { public Stream getRegions() { return REGION_MAP.values().stream(); } - - @Override - public boolean isModular() { - return false; - } } diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java index 8edc97db..39e8ca1f 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java @@ -90,7 +90,7 @@ public final class FixedGlobalRegion implements Region { } }; - private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null); + private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null); private FixedGlobalRegion() { } @@ -126,7 +126,7 @@ public final class FixedGlobalRegion implements Region { } @Override - public @NonNull RegionConfig getGameModeConfig() { + public @NonNull GameModeConfig getGameModeConfig() { return GLOBAL_CONFIG; } diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java index 7d58262c..ab6ae1cb 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java @@ -56,7 +56,7 @@ public class FixedRegion implements Region { private final Area testblock; private final int floorLevel; private final int waterLevel; - private final RegionConfig regionConfig; + private final GameModeConfig gameModeConfig; private final RegionHistory regionHistory = new RegionHistory.Impl(20); private final RegionBackups regionBackups = new RegionBackups() { @@ -336,7 +336,7 @@ public class FixedRegion implements Region { break; } } - this.regionConfig = new RegionConfig(found); + this.gameModeConfig = new GameModeConfig(found); } @Override @@ -370,8 +370,8 @@ public class FixedRegion implements Region { } @Override - public @NonNull RegionConfig getGameModeConfig() { - return regionConfig; + public @NonNull GameModeConfig getGameModeConfig() { + return gameModeConfig; } @Override