From 054dc6be14f4c987761d21d82f70de0f8cca84ad Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 22 Jun 2021 10:49:36 +0100 Subject: [PATCH] Relocate locations to world.locations --- .../mc/civmodcore/CivModCorePlugin.java | 8 +++--- .../{ => world}/locations/QTBox.java | 2 +- .../{ => world}/locations/QTBoxImpl.java | 2 +- .../{ => world}/locations/SparseQuadTree.java | 2 +- .../locations/chunkmeta/CacheState.java | 2 +- .../locations/chunkmeta/ChunkCoord.java | 4 +-- .../locations/chunkmeta/ChunkMeta.java | 4 +-- .../locations/chunkmeta/ChunkMetaFactory.java | 2 +- .../chunkmeta/ChunkMetaListener.java | 6 ++-- .../chunkmeta/GlobalChunkMetaManager.java | 8 +++--- .../chunkmeta/WorldChunkMetaManager.java | 2 +- .../locations/chunkmeta/XZWCoord.java | 4 +-- .../locations/chunkmeta/api/APIView.java | 2 +- .../api/BlockBasedChunkMetaView.java | 18 ++++++------ .../locations/chunkmeta/api/ChunkMetaAPI.java | 28 +++++++++---------- .../chunkmeta/api/ChunkMetaView.java | 8 +++--- .../chunkmeta/api/ChunkMetaViewTracker.java | 2 +- .../chunkmeta/api/SingleBlockAPIView.java | 6 ++-- .../chunkmeta/block/BlockBasedChunkMeta.java | 6 ++-- .../block/BlockBasedStorageEngine.java | 2 +- .../chunkmeta/block/BlockDataObject.java | 4 +-- .../chunkmeta/block/StorageEngine.java | 4 +-- .../block/auto/AutoBlockChunkMeta.java | 6 ++-- .../block/auto/AutoStorageEngine.java | 10 +++---- .../block/auto/JsonStorageEngine.java | 2 +- .../block/auto/JsonableDataObject.java | 2 +- .../block/auto/SerializableDataObject.java | 4 +-- .../chunkmeta/block/auto/YamlDataObject.java | 2 +- .../block/auto/YamlStorageEngine.java | 2 +- .../block/fallback/SingleBlockTracker.java | 8 +++--- .../block/table/TableBasedBlockChunkMeta.java | 6 ++-- .../block/table/TableBasedDataObject.java | 6 ++-- .../block/table/TableStorageEngine.java | 10 +++---- .../locations/global/CMCWorldDAO.java | 2 +- .../global/GlobalLocationTracker.java | 8 +++--- .../locations/global/GlobalTrackableDAO.java | 2 +- .../locations/global/LocationTrackable.java | 4 +-- .../locations/global/WorldIDManager.java | 2 +- 38 files changed, 101 insertions(+), 101 deletions(-) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/QTBox.java (71%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/QTBoxImpl.java (95%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/SparseQuadTree.java (99%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/CacheState.java (86%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/ChunkCoord.java (97%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/ChunkMeta.java (96%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/ChunkMetaFactory.java (93%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/ChunkMetaListener.java (93%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/GlobalChunkMetaManager.java (93%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/WorldChunkMetaManager.java (99%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/XZWCoord.java (93%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/APIView.java (81%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/BlockBasedChunkMetaView.java (88%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/ChunkMetaAPI.java (81%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/ChunkMetaView.java (95%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/ChunkMetaViewTracker.java (94%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/api/SingleBlockAPIView.java (80%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/BlockBasedChunkMeta.java (98%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/BlockBasedStorageEngine.java (77%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/BlockDataObject.java (89%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/StorageEngine.java (70%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java (82%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/AutoStorageEngine.java (94%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/JsonStorageEngine.java (89%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/JsonableDataObject.java (86%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/SerializableDataObject.java (64%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/YamlDataObject.java (87%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/auto/YamlStorageEngine.java (91%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/fallback/SingleBlockTracker.java (83%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java (90%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/table/TableBasedDataObject.java (73%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/chunkmeta/block/table/TableStorageEngine.java (78%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/global/CMCWorldDAO.java (98%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/global/GlobalLocationTracker.java (91%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/global/GlobalTrackableDAO.java (93%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/global/LocationTrackable.java (84%) rename plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/{ => world}/locations/global/WorldIDManager.java (97%) diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java index 893660f06..825cdce8f 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/CivModCorePlugin.java @@ -16,10 +16,10 @@ import vg.civcraft.mc.civmodcore.inventory.items.PotionUtils; import vg.civcraft.mc.civmodcore.inventory.items.SpawnEggUtils; import vg.civcraft.mc.civmodcore.inventory.items.TreeTypeUtils; import vg.civcraft.mc.civmodcore.inventory.gui.ClickableInventoryListener; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.GlobalChunkMetaManager; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.api.ChunkMetaAPI; -import vg.civcraft.mc.civmodcore.locations.global.CMCWorldDAO; -import vg.civcraft.mc.civmodcore.locations.global.WorldIDManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.GlobalChunkMetaManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api.ChunkMetaAPI; +import vg.civcraft.mc.civmodcore.world.locations.global.CMCWorldDAO; +import vg.civcraft.mc.civmodcore.world.locations.global.WorldIDManager; import vg.civcraft.mc.civmodcore.maps.MapColours; import vg.civcraft.mc.civmodcore.players.settings.PlayerSettingAPI; import vg.civcraft.mc.civmodcore.players.settings.commands.ConfigCommand; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBox.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java similarity index 71% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBox.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java index 73d54c18e..b628ad18b 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBox.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBox.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations; +package vg.civcraft.mc.civmodcore.world.locations; public interface QTBox { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBoxImpl.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java similarity index 95% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBoxImpl.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java index 4cf887502..ecab991ff 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/QTBoxImpl.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/QTBoxImpl.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations; +package vg.civcraft.mc.civmodcore.world.locations; import org.bukkit.Location; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/SparseQuadTree.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java similarity index 99% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/SparseQuadTree.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java index 59b389481..587a5c99e 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/SparseQuadTree.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/SparseQuadTree.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations; +package vg.civcraft.mc.civmodcore.world.locations; import java.util.HashSet; import java.util.Set; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/CacheState.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java similarity index 86% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/CacheState.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java index 7576bce4e..22ab533d0 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/CacheState.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/CacheState.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; public enum CacheState { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkCoord.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java similarity index 97% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkCoord.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java index a623cdc11..d5c44509c 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkCoord.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Iterator; import java.util.Map; @@ -8,7 +8,7 @@ import java.util.function.Supplier; import java.util.logging.Level; import org.bukkit.World; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.api.ChunkMetaViewTracker; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api.ChunkMetaViewTracker; public class ChunkCoord extends XZWCoord { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java similarity index 96% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java index 4c37f0223..309251972 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMeta.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMeta.java @@ -1,7 +1,7 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import org.bukkit.World; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.StorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.StorageEngine; /** * Represents data for one specific chunk for one specific plugin. diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaFactory.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java similarity index 93% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaFactory.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java index 3cf748ef7..3b2ee08e4 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaFactory.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaFactory.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Collection; import java.util.HashMap; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java similarity index 93% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaListener.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java index fe7c197e9..139d93d59 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/ChunkMetaListener.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; @@ -10,8 +10,8 @@ import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.event.world.WorldLoadEvent; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.api.ChunkMetaViewTracker; -import vg.civcraft.mc.civmodcore.locations.global.WorldIDManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api.ChunkMetaViewTracker; +import vg.civcraft.mc.civmodcore.world.locations.global.WorldIDManager; public class ChunkMetaListener implements Listener { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/GlobalChunkMetaManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java similarity index 93% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/GlobalChunkMetaManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java index 9c2e25999..4e915848b 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/GlobalChunkMetaManager.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/GlobalChunkMetaManager.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Map; import java.util.TreeMap; @@ -8,9 +8,9 @@ import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.api.ChunkMetaViewTracker; -import vg.civcraft.mc.civmodcore.locations.global.CMCWorldDAO; -import vg.civcraft.mc.civmodcore.locations.global.WorldIDManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api.ChunkMetaViewTracker; +import vg.civcraft.mc.civmodcore.world.locations.global.CMCWorldDAO; +import vg.civcraft.mc.civmodcore.world.locations.global.WorldIDManager; public class GlobalChunkMetaManager { private final CMCWorldDAO chunkDao; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/WorldChunkMetaManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java similarity index 99% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/WorldChunkMetaManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java index ed58931a3..e1d9206a0 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/WorldChunkMetaManager.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/WorldChunkMetaManager.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/XZWCoord.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java similarity index 93% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/XZWCoord.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java index 110d08213..cac83c73f 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/XZWCoord.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/XZWCoord.java @@ -1,10 +1,10 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta; import java.util.Objects; import org.bukkit.Chunk; import org.bukkit.Location; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; public class XZWCoord implements Comparable { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/APIView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java similarity index 81% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/APIView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java index 6de40813d..cdf7b70fb 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/APIView.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/APIView.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import org.bukkit.plugin.java.JavaPlugin; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/BlockBasedChunkMetaView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java similarity index 88% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/BlockBasedChunkMetaView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java index 79417419c..08b8c0fe0 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/BlockBasedChunkMetaView.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/BlockBasedChunkMetaView.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import java.util.function.Supplier; import org.bukkit.Location; @@ -6,14 +6,14 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.plugin.java.JavaPlugin; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.GlobalChunkMetaManager; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedStorageEngine; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockDataObject; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.fallback.SingleBlockTracker; -import vg.civcraft.mc.civmodcore.locations.global.WorldIDManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.GlobalChunkMetaManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedStorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockDataObject; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.fallback.SingleBlockTracker; +import vg.civcraft.mc.civmodcore.world.locations.global.WorldIDManager; /** * API view for block based chunk metas, which adds convenience methods for diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaAPI.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java similarity index 81% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaAPI.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java index ec3200d51..ede47d010 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaAPI.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaAPI.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import java.util.ArrayList; import java.util.HashMap; @@ -8,19 +8,19 @@ import java.util.function.Supplier; import java.util.logging.Level; import org.bukkit.plugin.java.JavaPlugin; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkMetaFactory; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.GlobalChunkMetaManager; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedStorageEngine; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockDataObject; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto.AutoBlockChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto.AutoStorageEngine; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto.SerializableDataObject; -import vg.civcraft.mc.civmodcore.locations.global.CMCWorldDAO; -import vg.civcraft.mc.civmodcore.locations.global.GlobalLocationTracker; -import vg.civcraft.mc.civmodcore.locations.global.GlobalTrackableDAO; -import vg.civcraft.mc.civmodcore.locations.global.LocationTrackable; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkMetaFactory; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.GlobalChunkMetaManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedStorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockDataObject; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto.AutoBlockChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto.AutoStorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto.SerializableDataObject; +import vg.civcraft.mc.civmodcore.world.locations.global.CMCWorldDAO; +import vg.civcraft.mc.civmodcore.world.locations.global.GlobalLocationTracker; +import vg.civcraft.mc.civmodcore.world.locations.global.GlobalTrackableDAO; +import vg.civcraft.mc.civmodcore.world.locations.global.LocationTrackable; public class ChunkMetaAPI { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java similarity index 95% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java index b7175bc72..efdd64388 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaView.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaView.java @@ -1,13 +1,13 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import java.util.function.Supplier; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.plugin.java.JavaPlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.GlobalChunkMetaManager; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.GlobalChunkMetaManager; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; public class ChunkMetaView> extends APIView { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaViewTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java similarity index 94% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaViewTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java index 1df683126..45be623c3 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/ChunkMetaViewTracker.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/ChunkMetaViewTracker.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import java.util.ArrayList; import java.util.List; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/SingleBlockAPIView.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java similarity index 80% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/SingleBlockAPIView.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java index 4926b1b53..605cd0de3 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/api/SingleBlockAPIView.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/api/SingleBlockAPIView.java @@ -1,11 +1,11 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.api; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.plugin.java.JavaPlugin; -import vg.civcraft.mc.civmodcore.locations.global.GlobalLocationTracker; -import vg.civcraft.mc.civmodcore.locations.global.LocationTrackable; +import vg.civcraft.mc.civmodcore.world.locations.global.GlobalLocationTracker; +import vg.civcraft.mc.civmodcore.world.locations.global.LocationTrackable; public class SingleBlockAPIView extends APIView { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java similarity index 98% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java index 3cd61747f..fcd91ad45 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedChunkMeta.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedChunkMeta.java @@ -1,10 +1,10 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block; import java.util.function.Consumer; import org.bukkit.Location; import org.bukkit.block.Block; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkMeta; /** * diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java similarity index 77% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java index 4ceb36d74..3b0ff31d2 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockBasedStorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockBasedStorageEngine.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block; public interface BlockBasedStorageEngine> extends StorageEngine { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java similarity index 89% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java index c094efe63..39d79be46 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/BlockDataObject.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/BlockDataObject.java @@ -1,7 +1,7 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; public abstract class BlockDataObject> { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/StorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java similarity index 70% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/StorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java index b3433cbb6..4c6c138b1 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/StorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/StorageEngine.java @@ -1,7 +1,7 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block; import java.util.Collection; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; public interface StorageEngine { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java similarity index 82% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java index 46ab72c7f..975a6a35a 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoBlockChunkMeta.java @@ -1,8 +1,8 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; public class AutoBlockChunkMeta> extends BlockBasedChunkMeta> { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java similarity index 94% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java index 3bd62613f..48035ebcf 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/AutoStorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/AutoStorageEngine.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,10 +14,10 @@ import org.bukkit.Location; import org.bukkit.World; import vg.civcraft.mc.civmodcore.CivModCorePlugin; import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.ChunkCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedStorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.ChunkCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedStorageEngine; public class AutoStorageEngine> implements BlockBasedStorageEngine { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java similarity index 89% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java index f4179ac46..6a035c009 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonStorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonStorageEngine.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonableDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java similarity index 86% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonableDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java index 8024887e0..ef9dc666e 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/JsonableDataObject.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/JsonableDataObject.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import com.google.gson.JsonObject; import org.bukkit.Location; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/SerializableDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java similarity index 64% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/SerializableDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java index 89145e373..2245b2a2c 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/SerializableDataObject.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/SerializableDataObject.java @@ -1,7 +1,7 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockDataObject; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockDataObject; public abstract class SerializableDataObject > extends BlockDataObject { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java similarity index 87% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java index b18f74d64..cab387f06 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlDataObject.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlDataObject.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import org.bukkit.Location; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java similarity index 91% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java index cd4fa9806..167f20a62 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/auto/YamlStorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/auto/YamlStorageEngine.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.auto; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.auto; import java.util.function.BiFunction; import java.util.logging.Logger; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/fallback/SingleBlockTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java similarity index 83% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/fallback/SingleBlockTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java index 861ca528c..054aa4c25 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/fallback/SingleBlockTracker.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/fallback/SingleBlockTracker.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.fallback; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.fallback; import java.util.ArrayList; import java.util.Collection; @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockDataObject; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockDataObject; public class SingleBlockTracker> { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java similarity index 90% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java index ba208c967..d4a969987 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedBlockChunkMeta.java @@ -1,10 +1,10 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.table; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.table; import java.util.ArrayList; import java.util.List; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; public abstract class TableBasedBlockChunkMeta extends BlockBasedChunkMeta> { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedDataObject.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java similarity index 73% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedDataObject.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java index 78bbc289a..3641c2544 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableBasedDataObject.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableBasedDataObject.java @@ -1,8 +1,8 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.table; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.table; import org.bukkit.Location; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockDataObject; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockDataObject; public class TableBasedDataObject extends BlockDataObject { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableStorageEngine.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java similarity index 78% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableStorageEngine.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java index 1ab93b967..c0b37d487 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/chunkmeta/block/table/TableStorageEngine.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/block/table/TableStorageEngine.java @@ -1,12 +1,12 @@ -package vg.civcraft.mc.civmodcore.locations.chunkmeta.block.table; +package vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.table; import java.util.function.Consumer; import java.util.logging.Logger; import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedStorageEngine; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedStorageEngine; public abstract class TableStorageEngine implements BlockBasedStorageEngine { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/CMCWorldDAO.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java similarity index 98% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/CMCWorldDAO.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java index 6242978f4..efd4b1676 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/CMCWorldDAO.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/CMCWorldDAO.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.global; +package vg.civcraft.mc.civmodcore.world.locations.global; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalLocationTracker.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java similarity index 91% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalLocationTracker.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java index 49ee3511f..180f114a0 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalLocationTracker.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalLocationTracker.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.global; +package vg.civcraft.mc.civmodcore.world.locations.global; import java.util.HashMap; import java.util.Map; @@ -6,9 +6,9 @@ import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.block.Block; import vg.civcraft.mc.civmodcore.CivModCorePlugin; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.XZWCoord; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.block.BlockBasedChunkMeta; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.XZWCoord; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.block.BlockBasedChunkMeta; public class GlobalLocationTracker { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalTrackableDAO.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java similarity index 93% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalTrackableDAO.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java index 60732e432..88b75cef4 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/GlobalTrackableDAO.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/GlobalTrackableDAO.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.global; +package vg.civcraft.mc.civmodcore.world.locations.global; import java.util.function.Consumer; import java.util.logging.Logger; diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/LocationTrackable.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java similarity index 84% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/LocationTrackable.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java index 2d1cf785d..70dea9546 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/LocationTrackable.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/LocationTrackable.java @@ -1,8 +1,8 @@ -package vg.civcraft.mc.civmodcore.locations.global; +package vg.civcraft.mc.civmodcore.world.locations.global; import org.bukkit.Location; import org.bukkit.block.Block; -import vg.civcraft.mc.civmodcore.locations.chunkmeta.CacheState; +import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.CacheState; public abstract class LocationTrackable { diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/WorldIDManager.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java similarity index 97% rename from plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/WorldIDManager.java rename to plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java index 66d8fe450..7bf2036c8 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/locations/global/WorldIDManager.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/global/WorldIDManager.java @@ -1,4 +1,4 @@ -package vg.civcraft.mc.civmodcore.locations.global; +package vg.civcraft.mc.civmodcore.world.locations.global; import java.util.Map; import java.util.TreeMap;