Merge pull request #12 from Kooperlol/1.0.0

1.0.0

Author: Kooperlol

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'codes.kooper'
-version = '1.0.0-alpha-3'
+version = '1.0.0-alpha-4'
 
 repositories {
     mavenCentral()

src/main/java/codes/kooper/blockify/managers/BlockChangeManager.java

@@ -148,7 +148,7 @@ public void sendBlockChanges(Stage stage, Audience audience, Collection<Blockify
         if (blockCount < 3000) {
             Map<Position, BlockData> multiBlockChange = new HashMap<>();
             for (BlockifyChunk chunk : chunks) {
-                if (!stage.getWorld().isChunkLoaded(chunk.x(), chunk.z())) continue;
+                if (!stage.getWorld().isChunkLoaded(chunk.x(), chunk.z()) || !blockChanges.containsKey(chunk)) continue;
                 for (Map.Entry<BlockifyPosition, BlockData> entry : blockChanges.get(chunk).entrySet()) {
                     multiBlockChange.put(entry.getKey().toPosition(), entry.getValue());
                 }
@@ -306,13 +306,33 @@ public void sendChunkPacket(Stage stage, Player player, BlockifyChunk chunk, boo
 
     private ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> getBlockChanges(Stage stage, Collection<BlockifyChunk> chunks) {
         ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> blockChanges = new ConcurrentHashMap<>();
+        ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, Integer>> highestZIndexes = new ConcurrentHashMap<>();
+
         for (View view : stage.getViews()) {
+            int zIndex = view.getZIndex();
             for (Map.Entry<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> entry : view.getBlocks().entrySet()) {
-                if (!chunks.contains(entry.getKey())) continue;
-                if (blockChanges.containsKey(entry.getKey())) {
-                    blockChanges.get(entry.getKey()).putAll(entry.getValue());
-                } else {
-                    blockChanges.put(entry.getKey(), new ConcurrentHashMap<>(entry.getValue()));
+                BlockifyChunk chunk = entry.getKey();
+                if (!chunks.contains(chunk)) continue;
+
+                highestZIndexes.computeIfAbsent(chunk, k -> new ConcurrentHashMap<>());
+
+                for (Map.Entry<BlockifyPosition, BlockData> positionEntry : entry.getValue().entrySet()) {
+                    BlockifyPosition position = positionEntry.getKey();
+                    BlockData blockData = positionEntry.getValue();
+
+                    highestZIndexes.get(chunk).compute(position, (key, currentMaxZIndex) -> {
+                        if (currentMaxZIndex == null || zIndex > currentMaxZIndex) {
+                            // This view has a higher Z-index, so update the block data
+                            blockChanges.computeIfAbsent(chunk, k -> new ConcurrentHashMap<>()).put(position, blockData);
+                            return zIndex;
+                        } else if (zIndex == currentMaxZIndex) {
+                            // Z-index is the same, merge the blocks
+                            blockChanges.get(chunk).put(position, blockData);
+                            return currentMaxZIndex;
+                        }
+                        // This view has a lower Z-index, do nothing
+                        return currentMaxZIndex;
+                    });
                 }
             }
         }

src/main/java/codes/kooper/blockify/models/View.java

@@ -15,6 +15,7 @@ public class View {
     private final ConcurrentHashMap<BlockifyChunk, ConcurrentHashMap<BlockifyPosition, BlockData>> blocks;
     private final Stage stage;
     private final String name;
+    private int zIndex;
     private boolean breakable, placeable;
     private Pattern pattern;
 
@@ -32,6 +33,7 @@ public View(String name, Stage stage, Pattern pattern, boolean breakable) {
         this.stage = stage;
         this.breakable = breakable;
         this.pattern = pattern;
+        this.zIndex = 0;
     }
 
     /**

src/main/java/codes/kooper/blockify/protocol/BlockDigAdapter.java

@@ -39,10 +39,11 @@ public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
 
             BlockifyPosition position = new BlockifyPosition(wrapper.getBlockPosition().getX(), wrapper.getBlockPosition().getY(), wrapper.getBlockPosition().getZ());
 
-            // Loop through all stages and views to find the block
-            for (Stage stage : stages) {
-                for (View view : stage.getViews()) {
-                    if (view.hasBlock(position)) {
+            // Find the block in any stage and view using streams
+            stages.stream()
+                    .flatMap(stage -> stage.getViews().stream())
+                    .filter(view -> view.hasBlock(position)).min((view1, view2) -> Integer.compare(view2.getZIndex(), view1.getZIndex()))
+                    .ifPresent(view -> {
                         // Get block data from view
                         BlockData blockData = view.getBlock(position);
 
@@ -58,24 +59,22 @@ public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
                         // Block break functionality
                         if (actionType == DiggingAction.FINISHED_DIGGING || canInstantBreak(player, blockData)) {
                             Bukkit.getScheduler().runTask(Blockify.getInstance(), () -> {
-                                // Set block to air
-                                view.setBlock(position, Material.AIR.createBlockData());
-                                Blockify.getInstance().getBlockChangeManager().sendBlockChange(view.getStage(), view.getStage().getAudience(), position);
                                 // Call BlockifyBreakEvent
                                 BlockifyBreakEvent blockifyBreakEvent = new BlockifyBreakEvent(player, position, blockData, view, view.getStage());
                                 blockifyBreakEvent.callEvent();
+
+                                // Set to air
+                                player.sendBlockChange(position.toLocation(player.getWorld()), Material.AIR.createBlockData());
+                                view.setBlock(position, Material.AIR.createBlockData());
+
                                 // If block is not cancelled, break the block, otherwise, revert the block
                                 if (blockifyBreakEvent.isCancelled()) {
                                     player.sendBlockChange(position.toLocation(player.getWorld()), blockData);
                                     view.setBlock(position, blockData);
                                 }
                             });
                         }
-
-                        return;
-                    }
-                }
-            }
+                    });
         }
     }
 

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: Blockify
-version: '1.0.0-alpha-3'
+version: '1.0.0-alpha-4'
 main: codes.kooper.blockify.Blockify
 api-version: '1.20'
 depend: