diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java index 24dc1143..29318e42 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java @@ -63,7 +63,7 @@ public interface RegionBackups { @SuppressWarnings("java:S3038") // This forces everybody to implement 'deleteRegion' for Backups! @Override - public abstract void deleteRegion(); + public abstract void delete(); } @CheckReturnValue diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java index 61850ef7..36e4b5cd 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionData.java @@ -39,12 +39,12 @@ public abstract class RegionData { protected RegionData(RegionDataStore store) { this.store = store; initialize(); - store.loadRegion(this); + store.load(this); } public final void setStore(RegionDataStore store) { this.store = store; - store.saveRegion(); + store.save(); } protected void initialize() { @@ -66,11 +66,11 @@ public abstract class RegionData { public final & Flag.Value> boolean set(@NonNull Flag flag, @NonNull T value) { if (has(flag).isWritable()) { boolean needsSave = flagMap.put(flag, value) != value; - if (needsSave) store.saveRegion(); + if (needsSave) store.save(); connectedRegions().forEach(region -> { if (region.getRegionData().flagMap.put(flag, value) != value) { - region.saveRegion(); + region.save(); } }); return needsSave; @@ -93,13 +93,13 @@ public abstract class RegionData { } initialize(); properties.forEach(property -> property.set(null)); - store.saveRegion(); + store.save(); connectedRegions().forEach(region -> { region.getRegionData().flagMap.keySet().removeAll(remove); region.getRegionData().initialize(); 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) { testblockSchematic.set(schematic); - store.saveRegion(); + store.save(); } @Override diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionDataStore.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionDataStore.java index 3523f193..4ec6a7a4 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionDataStore.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionDataStore.java @@ -20,8 +20,8 @@ package de.steamwar.bausystem.region; public interface RegionDataStore { - void saveRegion(); - void loadRegion(RegionData regionData); - default void deleteRegion() { + void save(); + void load(RegionData regionData); + default void delete() { } } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionCommand.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionCommand.java index fa1a442f..2524fad2 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionCommand.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionCommand.java @@ -65,7 +65,7 @@ public class DynamicRegionCommand extends SWCommand { public void deleteRegion(Player player) { Region region = DynamicRegionSystem.INSTANCE.get(player.getLocation()); if (!region.getType().isDeletable()) return; - region.deleteRegion(); + region.delete(); } @Mapper("regionType") diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java index 9f6ec04c..3a68b58d 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java @@ -48,7 +48,7 @@ public abstract class DynamicRegion implements Region { this.minZ = minZ; init(); DynamicRegionSystem.INSTANCE.add(this); - saveRegion(); + save(); } public abstract void init(); @@ -95,7 +95,7 @@ public abstract class DynamicRegion implements Region { } @Override - public void deleteRegion() { + public void delete() { if (!getType().isDeletable()) return; DynamicRegionSystem.INSTANCE.remove(this); DynamicRegionRepository.deleteRegion(this); diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java index 8219baf4..c208334c 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/global/GlobalRegion.java @@ -135,12 +135,12 @@ public class GlobalRegion implements Region { } @Override - public void saveRegion() { + public void save() { DynamicRegionRepository.saveRegion(this); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { DynamicRegionRepository.loadRegionData(this, regionData); } } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java index 165751e8..3be9e689 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/path/PathRegion.java @@ -115,12 +115,12 @@ public class PathRegion extends DynamicRegion { } @Override - public void saveRegion() { + public void save() { DynamicRegionRepository.saveRegion(this); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { DynamicRegionRepository.loadRegionData(this, regionData); } 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 34a51ebb..5060e214 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 @@ -92,12 +92,12 @@ public class DryRegion extends DynamicRegion { } @Override - public void saveRegion() { + public void save() { DynamicRegionRepository.saveRegion(this); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { DynamicRegionRepository.loadRegionData(this, regionData); } } 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 b21049bb..f8293f4f 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 @@ -91,12 +91,12 @@ public class WetRegion extends DynamicRegion { } @Override - public void saveRegion() { + public void save() { DynamicRegionRepository.saveRegion(this); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { DynamicRegionRepository.loadRegionData(this, regionData); } } diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java index 865e075f..1e84ea84 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalRegion.java @@ -142,12 +142,12 @@ public final class FixedGlobalRegion implements Region { } @Override - public void saveRegion() { + public void save() { FixedRegionDataUtils.saveRegionData("global", FLAG_STORAGE); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { FixedRegionDataUtils.loadRegionData("global", FLAG_STORAGE); } } diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java index 20fc0440..5b897f4b 100644 --- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java +++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java @@ -139,15 +139,15 @@ public class FixedRegion implements Region { } @Override - public void saveRegion() { + public void save() { } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { } @Override - public void deleteRegion() { + public void delete() { file.delete(); } } @@ -402,12 +402,12 @@ public class FixedRegion implements Region { } @Override - public void saveRegion() { + public void save() { FixedRegionDataUtils.saveRegionData(name, flagStorage); } @Override - public void loadRegion(RegionData regionData) { + public void load(RegionData regionData) { FixedRegionDataUtils.loadRegionData(name, flagStorage); } }