Hut512/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Remove any references to Core.getVersion

Browse Source
This commit is contained in:
YoyoNow
2026-09-07 11:42:22 +02:00
parent 0d7a88bb4c
commit 63ae103b70
7 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegionData.java
+1 -5
View File
@@ -24,7 +24,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy;
import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.flags.ProtectMode; import de.steamwar.bausystem.region.flags.ProtectMode;
import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TNTMode;
import de.steamwar.core.Core;
import lombok.NonNull; import lombok.NonNull;
public class GlobalRegionData extends RegionData { public class GlobalRegionData extends RegionData {
@@ -44,10 +43,7 @@ public class GlobalRegionData extends RegionData {
if (flag.oneOf(Flag.PROTECT)) { if (flag.oneOf(Flag.PROTECT)) {
return RegionFlagPolicy.READ_ONLY; return RegionFlagPolicy.READ_ONLY;
} }
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.WATER_DESTROY, Flag.ITEMS)) {
return RegionFlagPolicy.WRITABLE;
}
if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.WATER_DESTROY)) {
return RegionFlagPolicy.WRITABLE; return RegionFlagPolicy.WRITABLE;
} }
return RegionFlagPolicy.NOT_APPLICABLE; return RegionFlagPolicy.NOT_APPLICABLE;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/DisplayRegionData.java
+1 -5
View File
@@ -24,7 +24,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy;
import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.dynamic.DynamicRegion;
import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TNTMode;
import de.steamwar.core.Core;
import lombok.NonNull; import lombok.NonNull;
public class DisplayRegionData extends RegionData { public class DisplayRegionData extends RegionData {
@@ -40,10 +39,7 @@ public class DisplayRegionData extends RegionData {
@Override @Override
public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) { public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
if (flag.oneOf(Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY)) { if (flag.oneOf(Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.ITEMS)) {
return RegionFlagPolicy.WRITABLE;
}
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
return RegionFlagPolicy.WRITABLE; return RegionFlagPolicy.WRITABLE;
} }
if (flag.oneOf(Flag.TNT, Flag.PROTECT)) { if (flag.oneOf(Flag.TNT, Flag.PROTECT)) {
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/PlotRegionData.java
+1 -5
View File
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy;
import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TNTMode;
import de.steamwar.bausystem.region.flags.TestblockMode; import de.steamwar.bausystem.region.flags.TestblockMode;
import de.steamwar.core.Core;
import lombok.NonNull; import lombok.NonNull;
public class PlotRegionData extends RegionData { public class PlotRegionData extends RegionData {
@@ -42,10 +41,7 @@ public class PlotRegionData extends RegionData {
@Override @Override
public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) { public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
if (flag.oneOf(Flag.TNT, Flag.PROTECT, Flag.FIRE, Flag.FREEZE, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.TESTBLOCK, Flag.CHANGED)) { 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;
}
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
return RegionFlagPolicy.WRITABLE; return RegionFlagPolicy.WRITABLE;
} }
return RegionFlagPolicy.NOT_APPLICABLE; return RegionFlagPolicy.NOT_APPLICABLE;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegionData.java
+1 -5
View File
@@ -27,7 +27,6 @@ import de.steamwar.bausystem.region.flags.FireMode;
import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.flags.ProtectMode; import de.steamwar.bausystem.region.flags.ProtectMode;
import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TNTMode;
import de.steamwar.core.Core;
import lombok.NonNull; import lombok.NonNull;
import java.util.UUID; import java.util.UUID;
@@ -64,10 +63,7 @@ public class PathRegionData extends RegionData {
if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.PROTECT)) { if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.PROTECT)) {
return RegionFlagPolicy.READ_ONLY; return RegionFlagPolicy.READ_ONLY;
} }
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) { if (flag.oneOf(Flag.FREEZE, Flag.ITEMS)) {
return RegionFlagPolicy.WRITABLE;
}
if (flag.oneOf(Flag.FREEZE)) {
return RegionFlagPolicy.WRITABLE; return RegionFlagPolicy.WRITABLE;
} }
return RegionFlagPolicy.NOT_APPLICABLE; return RegionFlagPolicy.NOT_APPLICABLE;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/SpecialRegionData.java
+1 -5
View File
@@ -26,7 +26,6 @@ import de.steamwar.bausystem.region.RegionFlagPolicy;
import de.steamwar.bausystem.region.dynamic.DynamicRegion; import de.steamwar.bausystem.region.dynamic.DynamicRegion;
import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.region.flags.TNTMode; import de.steamwar.bausystem.region.flags.TNTMode;
import de.steamwar.core.Core;
import lombok.NonNull; import lombok.NonNull;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -52,10 +51,7 @@ public class SpecialRegionData extends RegionData {
@Override @Override
public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) { public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.WATER_DESTROY)) { if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.WATER_DESTROY, Flag.ITEMS)) {
return RegionFlagPolicy.WRITABLE;
}
if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
return RegionFlagPolicy.WRITABLE; return RegionFlagPolicy.WRITABLE;
} }
return RegionFlagPolicy.NOT_APPLICABLE; return RegionFlagPolicy.NOT_APPLICABLE;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java
+1 -4
View File
@@ -31,12 +31,9 @@ import de.steamwar.sql.GameModeConfig;
import lombok.NonNull; import lombok.NonNull;
import org.bukkit.Material; import org.bukkit.Material;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import static de.steamwar.bausystem.region.dynamic.special.SpecialArea.SPECIAL_PATH_DIR;
@RegionConstructorData( @RegionConstructorData(
identifier = "special_dry", identifier = "special_dry",
name = "Dry", name = "Dry",
@@ -49,7 +46,7 @@ public class DryRegion extends DynamicRegion {
protected static final int TILE_X = 1; protected static final int TILE_X = 1;
protected static final int TILE_Z = 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; private final SpecialArea area;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java
+1 -4
View File
@@ -30,12 +30,9 @@ import de.steamwar.sql.GameModeConfig;
import lombok.NonNull; import lombok.NonNull;
import org.bukkit.Material; import org.bukkit.Material;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.UUID; import java.util.UUID;
import static de.steamwar.bausystem.region.dynamic.special.SpecialArea.SPECIAL_PATH_DIR;
@RegionConstructorData( @RegionConstructorData(
identifier = "special_wet", identifier = "special_wet",
name = "Wet", name = "Wet",
@@ -48,7 +45,7 @@ public class WetRegion extends DynamicRegion {
protected static final int TILE_X = 1; protected static final int TILE_X = 1;
protected static final int TILE_Z = 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; private final SpecialArea area;