SteamWar/SteamWar
12
2
Fork 1
Code Issues 74 Pull Requests 10 Actions Packages Projects 1 Activity

Cleanup stuff

Browse Source
This commit is contained in:
YoyoNow
2026-03-28 22:07:57 +01:00
parent 4c8b55167c
commit b5de5d4288
20 changed files with 22 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/GameModeConfig.java
View File
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/Region.java
+5
View File
@@ -105,6 +105,11 @@ public interface Region extends RegionDataStore {
return false;
}
@Override
public boolean inRegion(int x, int z, boolean extension) {
return false;
}
@Override
public Clipboard copy(boolean extension) {
return null;
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionSystem.java
+2 -2
View File
@@ -80,7 +80,7 @@ public interface RegionSystem {
* Only contains Regions of the same Type as the one you inputted.
*/
@NonNull
Stream<Region> getConnectedRegions(Region region);
Stream<Region> getConnectedRegions(@NonNull Region region);
private static RegionSystem init() {
if (Core.getVersion() >= 21) {
@@ -130,7 +130,7 @@ public interface RegionSystem {
}
@Override
public @NonNull Stream<Region> getConnectedRegions(Region region) {
public @NonNull Stream<Region> getConnectedRegions(@NonNull Region region) {
throw new UnsupportedOperationException();
}
};
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java
+1 -7
View File
@@ -40,7 +40,6 @@ import java.util.stream.Stream;
public class DynamicRegionSystem implements RegionSystem {
private static final int TILE_SIZE_ADJUSTED = Tile.tileSize - 1;
public static DynamicRegionSystem INSTANCE;
private static final Map<Long, Region> regionCache = new LinkedHashMap<>(16, 0.75f, true) {
@@ -140,11 +139,6 @@ public class DynamicRegionSystem implements RegionSystem {
return region;
}
private Region get(int x, int z, boolean fastCache, Collection<Region> regions) {
Tile tile = Tile.fromXZ(x, z).orElse(null);
return get(tile, fastCache, regions);
}
@Override
public @NonNull Region get(@NonNull Location location) {
return get(Tile.fromLocation(location).orElse(null), true, regionMap.values());
@@ -244,7 +238,7 @@ public class DynamicRegionSystem implements RegionSystem {
@Override
@NotNull
public Stream<Region> getConnectedRegions(Region region) {
public Stream<Region> getConnectedRegions(@NonNull Region region) {
Set<Region> regions = regionTypeMap.get(region.getType());
Set<Region> connected = new HashSet<>();
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java
+13 -2
View File
@@ -26,6 +26,7 @@ import de.steamwar.bausystem.region.Point;
import de.steamwar.bausystem.region.Region;
import de.steamwar.bausystem.region.RegionData;
import de.steamwar.bausystem.region.dynamic.path.PathRegion;
import de.steamwar.bausystem.utils.PasteBuilder;
import lombok.Getter;
import lombok.NonNull;
@@ -92,7 +93,7 @@ public abstract class DynamicRegion implements Region {
// Updating world state for all neighbouring PathRegions
list.forEach(data -> {
if (needsFullReset.contains(data.region.getID())) {
data.region.getArea().reset(null, false); // TODO: Implement!
data.region.getArea().reset(new PasteBuilder(), false);
} else {
data.region.update(this, data.direction.opposite());
}
@@ -130,7 +131,17 @@ public abstract class DynamicRegion implements Region {
}
@Override
public @NonNull UUID getID() {
public final @NonNull UUID getID() {
return id;
}
@Override
public final void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public final void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/microwargear_7/MiWG7DisplayRegion.java
-10
View File
@@ -109,14 +109,4 @@ public class MiWG7DisplayRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/microwargear_7/MiWG7PlotRegion.java
-10
View File
@@ -131,14 +131,4 @@ public class MiWG7PlotRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return backups;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/miniwargear/MWGDisplayRegion.java
-10
View File
@@ -109,14 +109,4 @@ public class MWGDisplayRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/miniwargear/MWGPlotRegion.java
-10
View File
@@ -131,14 +131,4 @@ public class MWGPlotRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return backups;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/wargear_45/WG45DisplayRegion.java
-10
View File
@@ -109,14 +109,4 @@ public class WG45DisplayRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/wargear_45/WG45PlotRegion.java
-10
View File
@@ -131,14 +131,4 @@ public class WG45PlotRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return backups;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/warship_175/WS175DisplayRegion.java
-10
View File
@@ -109,14 +109,4 @@ public class WS175DisplayRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/warship_175/WS175PlotRegion.java
-10
View File
@@ -131,14 +131,4 @@ public class WS175PlotRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return backups;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/warship_230/WS230DisplayRegion.java
-10
View File
@@ -109,14 +109,4 @@ public class WS230DisplayRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/modes/warship_230/WS230PlotRegion.java
-10
View File
@@ -131,14 +131,4 @@ public class WS230PlotRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return backups;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathArea.java
-12
View File
@@ -32,7 +32,6 @@ import de.steamwar.bausystem.shared.Pair;
import de.steamwar.bausystem.utils.PasteBuilder;
import lombok.NonNull;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.jetbrains.annotations.Nullable;
import java.io.File;
@@ -144,17 +143,6 @@ public class PathArea implements Region.Area {
return Point.ZERO;
}
@Override
public boolean inRegion(Location location, boolean extension) {
return inRegion(location.getBlockX(), location.getBlockZ(), extension);
}
@Override
public boolean inRegion(int x, int z, boolean extension) {
// TODO: Implement further!
return Region.Area.super.inRegion(x, z, extension);
}
@Override
public @Nullable Clipboard copy(boolean extension) {
return null;
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java
-15
View File
@@ -128,19 +128,4 @@ public class PathRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
@Override
public String toString() {
return tile + "=" + getID();
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/dry/DryRegion.java
-11
View File
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.region.dynamic.special.dry;
import com.google.gson.JsonArray;
import com.google.gson.stream.JsonWriter;
import de.steamwar.bausystem.region.RegionBackups;
import de.steamwar.bausystem.region.RegionData;
import de.steamwar.bausystem.region.RegionHistory;
import de.steamwar.bausystem.region.RegionType;
import de.steamwar.bausystem.region.dynamic.*;
@@ -109,14 +108,4 @@ public class DryRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/special/wet/WetRegion.java
-11
View File
@@ -22,7 +22,6 @@ package de.steamwar.bausystem.region.dynamic.special.wet;
import com.google.gson.JsonArray;
import com.google.gson.stream.JsonWriter;
import de.steamwar.bausystem.region.RegionBackups;
import de.steamwar.bausystem.region.RegionData;
import de.steamwar.bausystem.region.RegionHistory;
import de.steamwar.bausystem.region.RegionType;
import de.steamwar.bausystem.region.dynamic.*;
@@ -108,14 +107,4 @@ public class WetRegion extends DynamicRegion {
public @NonNull RegionBackups getBackups() {
return RegionBackups.EMPTY;
}
@Override
public void save() {
DynamicRegionRepository.saveRegion(this);
}
@Override
public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData);
}
}
BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/FixedRegionSystem.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class FixedRegionSystem implements RegionSystem {
}
@Override
public @NonNull Stream<Region> getConnectedRegions(Region region) {
public @NonNull Stream<Region> getConnectedRegions(@NonNull Region region) {
return Stream.empty();
}
}