Merge pull request #4 from BitByLogics/refactor/location

Position Refactor

Author: BitByLogics

src/main/java/net/bitbylogic/packetblocks/adapter/ChunkLoadAdapter.java

@@ -32,7 +32,7 @@ public void onPacketSend(PacketSendEvent event) {
         int chunkX = packet.getColumn().getX();
         int chunkZ = packet.getColumn().getZ();
 
-        List<PacketBlock> blocks = new ArrayList<>(manager.getBlocks(player.getWorld(), chunkX, chunkZ));
+        List<PacketBlock> blocks = new ArrayList<>(manager.getBlocks(player.getWorld(), chunkX, chunkZ).values());
         if (blocks.isEmpty()) return;
 
         BaseChunk[] sections = packet.getColumn().getChunks();

src/main/java/net/bitbylogic/packetblocks/block/PacketBlock.java

@@ -5,10 +5,11 @@
 import lombok.Setter;
 import net.bitbylogic.packetblocks.PacketBlocks;
 import net.bitbylogic.packetblocks.event.PacketBlockBreakEvent;
-import net.bitbylogic.utils.Pair;
+import net.bitbylogic.packetblocks.util.BoundingBoxes;
+import net.bitbylogic.utils.location.ChunkPosition;
+import net.bitbylogic.utils.location.WorldPosition;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
@@ -23,10 +24,12 @@
 @Getter
 public class PacketBlock {
 
-    private final World world;
+    private final WorldPosition position;
+    private final ChunkPosition chunk;
+
     private final Location location;
-    private final Pair<Integer, Integer> chunk;
-    private final BoundingBox boundingBox;
+
+    private final List<BoundingBox> boundingBoxes;
 
     private final Set<Predicate<Player>> viewConditions;
     private final HashMap<UUID, PacketBlockPlayerData> viewers;
@@ -52,10 +55,12 @@ public class PacketBlock {
      * @param blockData The visual and physical characteristics of the block. Must not be null.
      */
     protected PacketBlock(@NonNull Location location, @NonNull BlockData blockData) {
-        this.world = location.getWorld();
+        this.position = WorldPosition.ofBlock(location);
+        this.chunk = position.toChunkPosition();
+
         this.location = location;
-        this.chunk = new Pair<>(location.getChunk().getX(), location.getChunk().getZ());
-        this.boundingBox = BoundingBox.of(location.clone(), location.clone().add(1, 1, 1));
+
+        this.boundingBoxes = BoundingBoxes.getBoxes(blockData);
         this.blockData = blockData;
 
         this.viewConditions = new HashSet<>();

src/main/java/net/bitbylogic/packetblocks/block/PacketBlockManager.java

@@ -5,7 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import net.bitbylogic.packetblocks.PacketBlocks;
 import net.bitbylogic.utils.location.ChunkPosition;
-import net.bitbylogic.utils.location.LocationUtil;
+import net.bitbylogic.utils.location.WorldPosition;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
@@ -25,7 +25,7 @@
 @Getter
 public class PacketBlockManager {
 
-    private final ConcurrentHashMap<ChunkPosition, List<PacketBlock>> blockLocations = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<ChunkPosition, Map<WorldPosition, PacketBlock>> blockLocations = new ConcurrentHashMap<>();
 
     private final PacketBlocks plugin;
 
@@ -55,19 +55,19 @@ public PacketBlock createBlock(@NonNull Location location, @NonNull BlockData bl
         ChunkPosition identifier = new ChunkPosition(location.getWorld().getName(), chunk.getX(), chunk.getZ());
 
         if (blockLocations.containsKey(identifier)) {
-            List<PacketBlock> blocks = blockLocations.get(identifier);
+            Map<WorldPosition, PacketBlock> blocks = blockLocations.get(identifier);
 
-            if (blocks.contains(packetBlock)) {
+            if (blocks.containsValue(packetBlock)) {
                 return packetBlock;
             }
 
-            blocks.add(packetBlock);
+            blocks.put(packetBlock.getPosition(), packetBlock);
             blockLocations.put(identifier, blocks);
             return packetBlock;
         }
 
-        List<PacketBlock> newBlocks = new ArrayList<>();
-        newBlocks.add(packetBlock);
+        Map<WorldPosition, PacketBlock> newBlocks = new HashMap<>();
+        newBlocks.put(packetBlock.getPosition(), packetBlock);
 
         blockLocations.put(identifier, newBlocks);
         return packetBlock;
@@ -82,29 +82,29 @@ public PacketBlock createBlock(@NonNull Location location, @NonNull BlockData bl
      * @param packetBlock the {@link PacketBlock} to be removed; must not be null
      */
     public void removeBlock(@NonNull PacketBlock packetBlock) {
-        for (Map.Entry<ChunkPosition, List<PacketBlock>> entry : blockLocations.entrySet()) {
-            List<PacketBlock> blocks = entry.getValue();
+        ChunkPosition chunk = packetBlock.getChunk();
 
-            if (!blocks.contains(packetBlock)) {
-                continue;
-            }
-
-            blocks.remove(packetBlock);
+        Map<WorldPosition, PacketBlock> blocks = blockLocations.get(chunk);
 
-            blockLocations.put(entry.getKey(), blocks);
+        if (blocks == null) {
+            return;
         }
 
+        blocks.remove(packetBlock.getPosition());
+
         packetBlock.getViewers().keySet().forEach(uuid -> {
             Player player = Bukkit.getPlayer(uuid);
 
-            if (player == null) {
-                return;
+            if (player != null) {
+                player.sendBlockChange(
+                        packetBlock.getLocation(),
+                        packetBlock.getLocation().getBlock().getBlockData()
+                );
             }
-
-            player.sendBlockChange(packetBlock.getLocation(), packetBlock.getLocation().getBlock().getBlockData());
         });
     }
 
+
     /**
      * Removes {@link PacketBlock} instances from the managed collection if they satisfy a specified condition.
      * The condition is defined by the provided {@link Predicate}.
@@ -114,10 +114,10 @@ public void removeBlock(@NonNull PacketBlock packetBlock) {
      *                        must not be null.
      */
     public void removeIf(Predicate<PacketBlock> removePredicate) {
-        for (Map.Entry<ChunkPosition, List<PacketBlock>> entry : blockLocations.entrySet()) {
-            List<PacketBlock> blocks = entry.getValue();
+        for (Map.Entry<ChunkPosition, Map<WorldPosition, PacketBlock>> entry : blockLocations.entrySet()) {
+            Map<WorldPosition, PacketBlock> blocks = entry.getValue();
 
-            blocks.stream().filter(removePredicate).forEach(packetBlock -> {
+            blocks.values().stream().filter(removePredicate).forEach(packetBlock -> {
                 packetBlock.getViewers().keySet().forEach(uuid -> {
                     Player player = Bukkit.getPlayer(uuid);
 
@@ -129,7 +129,7 @@ public void removeIf(Predicate<PacketBlock> removePredicate) {
                 });
             });
 
-            blocks.removeIf(removePredicate);
+            blocks.values().removeIf(removePredicate);
             blockLocations.put(entry.getKey(), blocks);
         }
     }
@@ -149,9 +149,15 @@ public Optional<PacketBlock> getBlock(@NonNull Location location) {
         }
 
         Chunk chunk = location.getChunk();
-        return new ArrayList<>(getBlocks(world, chunk.getX(), chunk.getZ())).stream()
-                .filter(loc -> loc != null && loc.getLocation() != null && LocationUtil.matches(loc.getLocation().toBlockLocation(), location.toBlockLocation()))
-                .findFirst();
+        ChunkPosition chunkPosition = ChunkPosition.of(chunk);
+
+        Map<WorldPosition, PacketBlock> blocks = blockLocations.get(chunkPosition);
+
+        if (blocks == null) {
+            return Optional.empty();
+        }
+
+        return Optional.ofNullable(blocks.get(WorldPosition.ofBlock(location)));
     }
 
     /**
@@ -165,7 +171,7 @@ public List<PacketBlock> getBlocks(@NonNull World world) {
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.values().forEach(packetBlocks -> {
-            packetBlocks.forEach(block -> {
+            packetBlocks.values().forEach(block -> {
                 if(block == null || block.getLocation() == null) {
                     return;
                 }
@@ -193,9 +199,9 @@ public List<PacketBlock> getBlocks(@NonNull World world) {
      * @return a list of {@link PacketBlock} instances within the specified chunk,
      *         or an empty list if no blocks are found
      */
-    public List<PacketBlock> getBlocks(@NonNull World world, int chunkX, int chunkZ) {
+    public Map<WorldPosition, PacketBlock> getBlocks(@NonNull World world, int chunkX, int chunkZ) {
         ChunkPosition chunkIdentifier = new ChunkPosition(world.getName(), chunkX, chunkZ);
-        return blockLocations.getOrDefault(chunkIdentifier, new ArrayList<>());
+        return blockLocations.getOrDefault(chunkIdentifier, new HashMap<>());
     }
 
     /**
@@ -209,7 +215,7 @@ public List<PacketBlock> getBlocksByViewer(@NonNull Player player) {
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.forEach((identifier, value) -> {
-            value.forEach(block -> {
+            value.values().forEach(block -> {
                 if (!block.getViewers().containsKey(player.getUniqueId())) {
                     return;
                 }
@@ -234,7 +240,7 @@ public List<PacketBlock> getBlocksByViewerWithMeta(@NonNull Player player, @NonN
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.forEach((identifier, value) -> {
-            value.forEach(block -> {
+            value.values().forEach(block -> {
                 if (!block.getViewers().containsKey(player.getUniqueId()) || !block.getMetadata().containsKey(metaKey)) {
                     return;
                 }
@@ -256,7 +262,7 @@ public List<PacketBlock> getBlocksByMetadata(@NonNull String key) {
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.forEach((identifier, value) -> {
-            value.forEach(block -> {
+            value.values().forEach(block -> {
                 if (!block.getMetadata().containsKey(key)) {
                     return;
                 }
@@ -280,12 +286,15 @@ public List<PacketBlock> getHitBlocks(@NonNull World world, @NonNull BoundingBox
         List<PacketBlock> blocks = new ArrayList<>();
 
         getChunksInBoundingBox(world, boundingBox).forEach(chunk -> {
-            getBlocks(world, chunk.getX(), chunk.getZ()).forEach(block -> {
-                if (!block.getBoundingBox().overlaps(boundingBox)) {
-                    return;
-                }
+            getBlocks(world, chunk.getX(), chunk.getZ()).values().forEach(block -> {
+                for (BoundingBox box : block.getBoundingBoxes()) {
+                    if(!box.overlaps(boundingBox)) {
+                        continue;
+                    }
 
-                blocks.add(block);
+                    blocks.add(block);
+                    break;
+                }
             });
         });
 
@@ -333,7 +342,7 @@ public List<PacketBlock> getHitBlocksByViewer(@NonNull Player player, @NonNull B
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.forEach((identifier, value) -> {
-            value.forEach(block -> {
+            value.values().forEach(block -> {
                 if (!block.getViewers().containsKey(player.getUniqueId())) {
                     return;
                 }
@@ -365,7 +374,7 @@ public List<PacketBlock> getHitBlocksByViewerWithMeta(@NonNull Player player, @N
         List<PacketBlock> blocks = new ArrayList<>();
 
         blockLocations.forEach((identifier, value) -> {
-            value.forEach(block -> {
+            value.values().forEach(block -> {
                 if (!block.getViewers().containsKey(player.getUniqueId())) {
                     return;
                 }