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

Pot impl a FixedGlobalRegion

Browse Source
This commit is contained in:
YoyoNow
2025-07-31 14:31:16 +02:00
parent c49a212c05
commit 01d9532aa6
8 changed files with 171 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java
+18
View File
@@ -65,4 +65,22 @@ public interface RegionBackups {
@Nullable
Backup get(String name);
RegionBackups EMPTY = new RegionBackups() {
@Override
public Optional<Backup> create(BackupType backupType) {
return Optional.empty();
}
@Override
public @NonNull List<Backup> list() {
return List.of();
}
@Nullable
@Override
public Backup get(String name) {
return null;
}
};
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionHistory.java
+16
View File
@@ -29,4 +29,20 @@ public interface RegionHistory {
boolean undo();
boolean redo();
RegionHistory EMPTY = new RegionHistory() {
@Override
public void remember(@NonNull EditSession editSession) {
}
@Override
public boolean undo() {
return false;
}
@Override
public boolean redo() {
return false;
}
};
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSkins.java
+35
View File
@@ -40,6 +40,13 @@ public interface RegionSkins {
@CheckReturnValue
public abstract boolean apply();
public static final Skin GLOBAL = new Skin("Global", "§eSteam§8War") {
@Override
public boolean apply() {
return false;
}
};
}
@NonNull
@@ -52,4 +59,32 @@ public interface RegionSkins {
@Nullable
Skin get(@NonNull String name);
RegionSkins GLOBAL = new RegionSkins() {
@Override
public @NonNull Skin getCurrentSkin() {
return Skin.GLOBAL;
}
@Override
public @NonNull List<Skin> list() {
return List.of(Skin.GLOBAL);
}
@Override
public boolean has(@NonNull String name) {
return Skin.GLOBAL.name.equals(name);
}
@Nullable
@Override
public Skin get(@NonNull String name) {
if (Skin.GLOBAL.name.equals(name)) {
return Skin.GLOBAL;
} else {
return null;
}
}
};
}
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+5 -5
View File
@@ -29,6 +29,11 @@ import java.util.concurrent.atomic.AtomicInteger;
public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDisplay {
@Getter
private static final Set<Flag> flags = new HashSet<>();
private static AtomicInteger counter = new AtomicInteger(0);
public static final Flag<ColorMode> COLOR = new Flag<>("COLOR", "FLAG_COLOR", ColorMode.class, ColorMode.YELLOW);
public static final Flag<TNTMode> TNT = new Flag<>("TNT", "FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB);
public static final Flag<FireMode> FIRE = new Flag<>("FIRE", "FLAG_FIRE", FireMode.class, FireMode.ALLOW);
@@ -39,11 +44,6 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
public static final Flag<TestblockMode> TESTBLOCK = new Flag<>("TESTBLOCK", "FLAG_TESTBLOCK", TestblockMode.class, TestblockMode.NO_VALUE);
public static final Flag<ChangedMode> CHANGED = new Flag<>("CHANGED", "FLAG_CHANGED", ChangedMode.class, ChangedMode.NO_CHANGE);
@Getter
private static final Set<Flag> flags = new HashSet<>();
private static AtomicInteger counter = new AtomicInteger(0);
private String name;
private int ordinal;
BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedFlagStorage.java
+17 -15
View File
@@ -20,6 +20,7 @@
package de.steamwar.bausystem.region;
import de.steamwar.bausystem.region.flags.Flag;
import lombok.NonNull;
import java.io.File;
import java.util.HashMap;
@@ -29,27 +30,28 @@ public class FixedFlagStorage implements FlagStorage {
private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
public static FlagStorage createFromRegion(Region region) {
FlagStorage flagStorage = new FixedFlagStorage();
Flag.getFlags().forEach(flag -> {
if (region.hasFlag(flag).isReadable()) {
flagStorage.set(flag, flag.getDefaultValue());
}
});
return flagStorage;
}
public static FlagStorage createFromFile(File file) {
throw new IllegalStateException("Not implemented yet");
// throw new IllegalStateException("Not implemented yet");
return new FixedFlagStorage();
}
@Override
public <T extends Enum<T> & Flag.Value<T>> boolean set(Flag<T> flag, T value) {
return flagMap.put(flag, value) != value;
public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
return RegionFlagPolicy.NOT_APPLICABLE;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> T get(Flag<T> flag) {
return (T) flagMap.get(flag);
public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
return false;
}
@Override
public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
return FlagOptional.of(flag);
}
@Override
public void clear() {
flagMap.clear();
}
}
BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedGlobalRegion.java
+74 -58
View File
@@ -20,12 +20,14 @@
package de.steamwar.bausystem.region;
import com.sk89q.worldedit.EditSession;
import de.steamwar.bausystem.region.flags.Flag;
import de.steamwar.bausystem.utils.PasteBuilder;
import lombok.NonNull;
import org.bukkit.Location;
import javax.annotation.Nullable;
import java.io.File;
import java.util.Optional;
import java.util.UUID;
import java.util.function.BiConsumer;
public final class FixedGlobalRegion implements Region {
@@ -34,7 +36,58 @@ public final class FixedGlobalRegion implements Region {
private static final Point MIN_POINT = new Point(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);
private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
private final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromRegion(this); // TODO: Update to either File or Region creation!
private static final FlagStorage FLAG_STORAGE = FixedFlagStorage.createFromFile(null); // TODO: Update to either File or Region creation!
private static final UUID GLOBAL_REGION_ID = new UUID(0, 0);
private static final Area GLOBAL_AREA = new Area() {
@Override
public @NonNull Point getMinPoint(boolean extension) {
return MIN_POINT;
}
@Override
public @NonNull Point getMaxPoint(boolean extension) {
return MAX_POINT;
}
@Override
public @NonNull Point getCopyPoint() {
return Point.ZERO;
}
@Override
public boolean inRegion(Location location, boolean extension) {
return true;
}
@Nullable
@Override
public EditSession copy(boolean extension) {
return null;
}
@Nullable
@Override
public File getResetFile() {
return null;
}
@Override
public void reset(PasteBuilder pasteBuilder, boolean extension) {
}
@Override
public void forEachChunk(BiConsumer<Integer, Integer> executor) {
}
@Override
public boolean isChunkOutside(int chunkX, int chunkZ) {
return false;
}
};
private static final RegionConfig GLOBAL_CONFIG = new RegionConfig(null);
private FixedGlobalRegion() {
}
@@ -45,84 +98,47 @@ public final class FixedGlobalRegion implements Region {
}
@Override
public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.ITEMS, Flag.NO_GRAVITY)) {
return RegionFlagPolicy.WRITABLE;
}
return RegionFlagPolicy.NOT_APPLICABLE;
public @NonNull UUID getID() {
return GLOBAL_REGION_ID;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
return hasFlag(flag).isWritable() && FLAG_STORAGE.set(flag, value);
public @NonNull FlagStorage getFlags() {
return FLAG_STORAGE;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
if (hasFlag(flag).isReadable()) {
return Optional.ofNullable(FLAG_STORAGE.get(flag));
} else {
return Optional.empty();
}
public @NonNull Area getArea() {
return GLOBAL_AREA;
}
@Override
public Point getMinPoint() {
return MIN_POINT;
public @NonNull Area getBuildArea() {
return Area.EMPTY;
}
@Override
public Point getMaxPoint() {
return MAX_POINT;
public @NonNull Area getTestblockArea() {
return Area.EMPTY;
}
@Override
public boolean inRegion(Location location) {
return true;
public @NonNull RegionConfig getGameModeConfig() {
return GLOBAL_CONFIG;
}
@Override
public Inner getBuildArea() {
return Inner.EMPTY;
public @NonNull RegionHistory getHistory() {
return RegionHistory.EMPTY;
}
@Override
public Inner getTestblockArea() {
return Inner.EMPTY;
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public Optional<File> getGameModeConfig() {
return Optional.empty();
}
@Override
public Optional<EditSession> copy() {
return Optional.empty();
}
@Override
public boolean backup(boolean automatic) {
return false;
}
@Override
public void reset() {
}
@Override
public void remember(EditSession editSession) {
}
@Override
public boolean undo() {
return false;
}
@Override
public boolean redo() {
return false;
public @NonNull RegionSkins getSkins() {
return RegionSkins.GLOBAL;
}
}
BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegion.java
-111
View File
@@ -1,111 +0,0 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2024 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 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 <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.region;
import com.sk89q.worldedit.EditSession;
import de.steamwar.bausystem.region.flags.Flag;
import lombok.NonNull;
import org.bukkit.Location;
import java.io.File;
import java.util.Optional;
public class FixedRegion implements Region { // TODO: Implement!
@Override
public RegionType getType() {
return RegionType.NORMAL;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy hasFlag(@NonNull Flag<T> flag) {
return null;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> boolean setFlag(@NonNull Flag<T> flag, T value) {
return false;
}
@Override
public <T extends Enum<T> & Flag.Value<T>> Optional<T> getFlag(@NonNull Flag<T> flag) {
return Optional.empty();
}
@Override
public Point getMinPoint() {
return null;
}
@Override
public Point getMaxPoint() {
return null;
}
@Override
public boolean inRegion(Location location) {
return false;
}
@Override
public Inner getBuildArea() {
return Inner.EMPTY;
}
@Override
public Inner getTestblockArea() {
return Inner.EMPTY;
}
@Override
public Optional<File> getGameModeConfig() {
return Optional.empty();
}
@Override
public boolean backup(boolean automatic) {
return false;
}
@Override
public Optional<EditSession> copy() {
return Optional.empty();
}
@Override
public void reset() {
}
@Override
public void remember(EditSession editSession) {
}
@Override
public boolean undo() {
return false;
}
@Override
public boolean redo() {
return false;
}
}
BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+6 -4
View File
@@ -19,16 +19,18 @@
package de.steamwar.bausystem.region;
import lombok.NonNull;
import org.bukkit.Location;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Stream;
public class FixedRegionSystem implements RegionSystem {
private static final Map<String, Region> REGION_MAP = new HashMap<>();
private static final Map<UUID, Region> REGION_MAP = new HashMap<>();
@Override
public void load() {
@@ -48,14 +50,14 @@ public class FixedRegionSystem implements RegionSystem {
@Override
public Region get(Location location) {
return REGION_MAP.values().stream()
.filter(region -> region.inRegion(location))
.filter(region -> region.getArea().inRegion(location, false))
.findFirst()
.orElse(FixedGlobalRegion.INSTANCE);
}
@Override
public Optional<Region> getRegion(String name) {
return Optional.ofNullable(REGION_MAP.get(name));
public Optional<Region> getRegion(@NonNull UUID id) {
return Optional.ofNullable(REGION_MAP.get(id));
}
@Override