From 63ae103b70b5c59359233732cabdba2bfdd78487 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Sat, 5 Sep 2026 16:10:23 +0200 Subject: [PATCH] Remove any references to Core.getVersion --- .../bausystem/region/dynamic/global/GlobalRegionData.java | 6 +----- .../bausystem/region/dynamic/modes/DisplayRegionData.java | 6 +----- .../bausystem/region/dynamic/modes/PlotRegionData.java | 6 +----- .../bausystem/region/dynamic/path/PathRegionData.java | 6 +----- .../bausystem/region/dynamic/special/SpecialRegionData.java | 6 +----- .../bausystem/region/dynamic/special/dry/DryRegion.java | 5 +---- .../bausystem/region/dynamic/special/wet/WetRegion.java | 5 +---- 7 files changed, 7 insertions(+), 33 deletions(-) diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegionData.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegionData.java index d1abe3ac..dbe6bd55 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegionData.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegionData.java @@ -24,7 +24,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.ProtectMode; import de.steamwar.bausystem.region.flags.TNTMode; -import de.steamwar.core.Core; import lombok.NonNull; public class GlobalRegionData extends RegionData { @@ -44,10 +43,7 @@ public class GlobalRegionData extends RegionData { if (flag.oneOf(Flag.PROTECT)) { return RegionFlagPolicy.READ_ONLY; } - if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { - return RegionFlagPolicy.WRITABLE; - } - if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.WATER_DESTROY)) { + if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.WATER_DESTROY, Flag.ITEMS)) { return RegionFlagPolicy.WRITABLE; } return RegionFlagPolicy.NOT_APPLICABLE; diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/DisplayRegionData.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/DisplayRegionData.java index 26dee8dc..645af517 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/DisplayRegionData.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/DisplayRegionData.java @@ -24,7 +24,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.TNTMode; -import de.steamwar.core.Core; import lombok.NonNull; public class DisplayRegionData extends RegionData { @@ -40,10 +39,7 @@ public class DisplayRegionData extends RegionData { @Override public @NonNull & Flag.Value> RegionFlagPolicy has(@NonNull Flag flag) { - if (flag.oneOf(Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY)) { - return RegionFlagPolicy.WRITABLE; - } - if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { + if (flag.oneOf(Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.ITEMS)) { return RegionFlagPolicy.WRITABLE; } if (flag.oneOf(Flag.TNT, Flag.PROTECT)) { diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/PlotRegionData.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/PlotRegionData.java index e16a45a1..d44bbbb6 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/PlotRegionData.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/PlotRegionData.java @@ -25,7 +25,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TestblockMode; -import de.steamwar.core.Core; import lombok.NonNull; public class PlotRegionData extends RegionData { @@ -42,10 +41,7 @@ public class PlotRegionData extends RegionData { @Override public @NonNull & Flag.Value> RegionFlagPolicy has(@NonNull Flag flag) { - if (flag.oneOf(Flag.TNT, Flag.PROTECT, Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.TESTBLOCK, Flag.CHANGED)) { - return RegionFlagPolicy.WRITABLE; - } - if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { + if (flag.oneOf(Flag.TNT, Flag.PROTECT, Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.TESTBLOCK, Flag.CHANGED, Flag.ITEMS)) { return RegionFlagPolicy.WRITABLE; } return RegionFlagPolicy.NOT_APPLICABLE; diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegionData.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegionData.java index c6d2ec20..79597f55 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegionData.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegionData.java @@ -27,7 +27,6 @@ import de.steamwar.bausystem.region.flags.FireMode; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.ProtectMode; import de.steamwar.bausystem.region.flags.TNTMode; -import de.steamwar.core.Core; import lombok.NonNull; import java.util.UUID; @@ -64,10 +63,7 @@ public class PathRegionData extends RegionData { if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.PROTECT)) { return RegionFlagPolicy.READ_ONLY; } - if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { - return RegionFlagPolicy.WRITABLE; - } - if (flag.oneOf(Flag.FREEZE)) { + if (flag.oneOf(Flag.FREEZE, Flag.ITEMS)) { return RegionFlagPolicy.WRITABLE; } return RegionFlagPolicy.NOT_APPLICABLE; diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/SpecialRegionData.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/SpecialRegionData.java index 5dea2318..09058adc 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/SpecialRegionData.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/SpecialRegionData.java @@ -26,7 +26,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy; import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.TNTMode; -import de.steamwar.core.Core; import lombok.NonNull; import java.util.stream.Stream; @@ -52,10 +51,7 @@ public class SpecialRegionData extends RegionData { @Override public @NonNull & Flag.Value> RegionFlagPolicy has(@NonNull Flag flag) { - if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.WATER_DESTROY)) { - return RegionFlagPolicy.WRITABLE; - } - if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { + if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.ITEMS)) { return RegionFlagPolicy.WRITABLE; } return RegionFlagPolicy.NOT_APPLICABLE; diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java index 9eab28ed..d8997ca7 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java @@ -31,12 +31,9 @@ import de.steamwar.sql.GameModeConfig; import lombok.NonNull; import org.bukkit.Material; -import java.io.File; import java.io.IOException; import java.util.UUID; -import static de.steamwar.bausystem.region.dynamic.special.SpecialArea.SPECIAL_PATH_DIR; - @RegionConstructorData( identifier = "special_dry", name = "Dry", @@ -49,7 +46,7 @@ public class DryRegion extends DynamicRegion { protected static final int TILE_X = 1; protected static final int TILE_Z = 1; - private static final VariantSelector DRY = VariantSelector.Get(new File(SPECIAL_PATH_DIR, "dry")); + private static final VariantSelector DRY = VariantSelector.Folder(180028); private final SpecialArea area; diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java index 7c3535d6..b663fd4b 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java @@ -30,12 +30,9 @@ import de.steamwar.sql.GameModeConfig; import lombok.NonNull; import org.bukkit.Material; -import java.io.File; import java.io.IOException; import java.util.UUID; -import static de.steamwar.bausystem.region.dynamic.special.SpecialArea.SPECIAL_PATH_DIR; - @RegionConstructorData( identifier = "special_wet", name = "Wet", @@ -48,7 +45,7 @@ public class WetRegion extends DynamicRegion { protected static final int TILE_X = 1; protected static final int TILE_Z = 1; - private static final VariantSelector WET = VariantSelector.Get(new File(SPECIAL_PATH_DIR, "wet")); + private static final VariantSelector WET = VariantSelector.Folder(180026); private final SpecialArea area;