Replace RegionDataStore.saveRegion to save

Replace RegionDataStore.loadRegion to load
Replace RegionDataStore.deleteRegion to delete
This commit is contained in:
2026-03-07 20:37:10 +01:00
parent a2aeaa5668
commit 12af4d0af1
11 changed files with 29 additions and 29 deletions
@@ -63,7 +63,7 @@ public interface RegionBackups {
@SuppressWarnings("java:S3038") // This forces everybody to implement 'deleteRegion' for Backups! @SuppressWarnings("java:S3038") // This forces everybody to implement 'deleteRegion' for Backups!
@Override @Override
public abstract void deleteRegion(); public abstract void delete();
} }
@CheckReturnValue @CheckReturnValue
@@ -39,12 +39,12 @@ public abstract class RegionData {
protected RegionData(RegionDataStore store) { protected RegionData(RegionDataStore store) {
this.store = store; this.store = store;
initialize(); initialize();
store.loadRegion(this); store.load(this);
} }
public final void setStore(RegionDataStore store) { public final void setStore(RegionDataStore store) {
this.store = store; this.store = store;
store.saveRegion(); store.save();
} }
protected void initialize() { protected void initialize() {
@@ -66,11 +66,11 @@ public abstract class RegionData {
public final <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) { public final <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
if (has(flag).isWritable()) { if (has(flag).isWritable()) {
boolean needsSave = flagMap.put(flag, value) != value; boolean needsSave = flagMap.put(flag, value) != value;
if (needsSave) store.saveRegion(); if (needsSave) store.save();
connectedRegions().forEach(region -> { connectedRegions().forEach(region -> {
if (region.getRegionData().flagMap.put(flag, value) != value) { if (region.getRegionData().flagMap.put(flag, value) != value) {
region.saveRegion(); region.save();
} }
}); });
return needsSave; return needsSave;
@@ -93,13 +93,13 @@ public abstract class RegionData {
} }
initialize(); initialize();
properties.forEach(property -> property.set(null)); properties.forEach(property -> property.set(null));
store.saveRegion(); store.save();
connectedRegions().forEach(region -> { connectedRegions().forEach(region -> {
region.getRegionData().flagMap.keySet().removeAll(remove); region.getRegionData().flagMap.keySet().removeAll(remove);
region.getRegionData().initialize(); region.getRegionData().initialize();
region.getRegionData().properties.forEach(property -> property.set(null)); region.getRegionData().properties.forEach(property -> property.set(null));
region.saveRegion(); region.save();
}); });
} }
@@ -117,7 +117,7 @@ public abstract class RegionData {
public final void setTestblockSchematic(SchematicNode schematic) { public final void setTestblockSchematic(SchematicNode schematic) {
testblockSchematic.set(schematic); testblockSchematic.set(schematic);
store.saveRegion(); store.save();
} }
@Override @Override
@@ -20,8 +20,8 @@
package de.steamwar.bausystem.region; package de.steamwar.bausystem.region;
public interface RegionDataStore { public interface RegionDataStore {
void saveRegion(); void save();
void loadRegion(RegionData regionData); void load(RegionData regionData);
default void deleteRegion() { default void delete() {
} }
} }
@@ -65,7 +65,7 @@ public class DynamicRegionCommand extends SWCommand {
public void deleteRegion(Player player) { public void deleteRegion(Player player) {
Region region = DynamicRegionSystem.INSTANCE.get(player.getLocation()); Region region = DynamicRegionSystem.INSTANCE.get(player.getLocation());
if (!region.getType().isDeletable()) return; if (!region.getType().isDeletable()) return;
region.deleteRegion(); region.delete();
} }
@Mapper("regionType") @Mapper("regionType")
@@ -48,7 +48,7 @@ public abstract class DynamicRegion implements Region {
this.minZ = minZ; this.minZ = minZ;
init(); init();
DynamicRegionSystem.INSTANCE.add(this); DynamicRegionSystem.INSTANCE.add(this);
saveRegion(); save();
} }
public abstract void init(); public abstract void init();
@@ -95,7 +95,7 @@ public abstract class DynamicRegion implements Region {
} }
@Override @Override
public void deleteRegion() { public void delete() {
if (!getType().isDeletable()) return; if (!getType().isDeletable()) return;
DynamicRegionSystem.INSTANCE.remove(this); DynamicRegionSystem.INSTANCE.remove(this);
DynamicRegionRepository.deleteRegion(this); DynamicRegionRepository.deleteRegion(this);
@@ -135,12 +135,12 @@ public class GlobalRegion implements Region {
} }
@Override @Override
public void saveRegion() { public void save() {
DynamicRegionRepository.saveRegion(this); DynamicRegionRepository.saveRegion(this);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData); DynamicRegionRepository.loadRegionData(this, regionData);
} }
} }
@@ -115,12 +115,12 @@ public class PathRegion extends DynamicRegion {
} }
@Override @Override
public void saveRegion() { public void save() {
DynamicRegionRepository.saveRegion(this); DynamicRegionRepository.saveRegion(this);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData); DynamicRegionRepository.loadRegionData(this, regionData);
} }
@@ -92,12 +92,12 @@ public class DryRegion extends DynamicRegion {
} }
@Override @Override
public void saveRegion() { public void save() {
DynamicRegionRepository.saveRegion(this); DynamicRegionRepository.saveRegion(this);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData); DynamicRegionRepository.loadRegionData(this, regionData);
} }
} }
@@ -91,12 +91,12 @@ public class WetRegion extends DynamicRegion {
} }
@Override @Override
public void saveRegion() { public void save() {
DynamicRegionRepository.saveRegion(this); DynamicRegionRepository.saveRegion(this);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
DynamicRegionRepository.loadRegionData(this, regionData); DynamicRegionRepository.loadRegionData(this, regionData);
} }
} }
@@ -142,12 +142,12 @@ public final class FixedGlobalRegion implements Region {
} }
@Override @Override
public void saveRegion() { public void save() {
FixedRegionDataUtils.saveRegionData("global", FLAG_STORAGE); FixedRegionDataUtils.saveRegionData("global", FLAG_STORAGE);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
FixedRegionDataUtils.loadRegionData("global", FLAG_STORAGE); FixedRegionDataUtils.loadRegionData("global", FLAG_STORAGE);
} }
} }
@@ -139,15 +139,15 @@ public class FixedRegion implements Region {
} }
@Override @Override
public void saveRegion() { public void save() {
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
} }
@Override @Override
public void deleteRegion() { public void delete() {
file.delete(); file.delete();
} }
} }
@@ -402,12 +402,12 @@ public class FixedRegion implements Region {
} }
@Override @Override
public void saveRegion() { public void save() {
FixedRegionDataUtils.saveRegionData(name, flagStorage); FixedRegionDataUtils.saveRegionData(name, flagStorage);
} }
@Override @Override
public void loadRegion(RegionData regionData) { public void load(RegionData regionData) {
FixedRegionDataUtils.loadRegionData(name, flagStorage); FixedRegionDataUtils.loadRegionData(name, flagStorage);
} }
} }