Added back custom ming speed until 1.20.6 is mainstream

Author: Kooperlol

src/main/java/codes/kooper/blockify/Blockify.java

@@ -8,6 +8,7 @@
 import codes.kooper.blockify.protocol.BlockPlaceAdapter;
 import codes.kooper.blockify.protocol.ChunkLoadAdapter;
 import codes.kooper.blockify.protocol.PlayerInfoAdapter;
+import codes.kooper.blockify.utils.MiningUtils;
 import com.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
 import lombok.Getter;
@@ -18,6 +19,7 @@
 public final class Blockify extends JavaPlugin {
     private StageManager stageManager;
     private BlockChangeManager blockChangeManager;
+    private MiningUtils miningUtils;
 
     @Override
     public void onLoad() {
@@ -35,6 +37,7 @@ public void onEnable() {
 
         stageManager = new StageManager();
         blockChangeManager = new BlockChangeManager();
+        miningUtils = new MiningUtils();
 
         getServer().getPluginManager().registerEvents(new StageBoundListener(), this);
 

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

@@ -1,8 +1,11 @@
 package codes.kooper.blockify.models;
 
+import codes.kooper.blockify.Blockify;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
@@ -11,12 +14,14 @@
 public class Audience {
     private boolean arePlayersHidden = false;
     private final Set<UUID> players;
+    private final Map<UUID, Float> miningSpeeds;
 
     /**
      * @param players The players to show the block to
      */
     public Audience(Set<UUID> players) {
         this.players = players;
+        this.miningSpeeds = new HashMap<>();
     }
 
     /**
@@ -26,6 +31,7 @@ public Audience(Set<UUID> players) {
     public Audience(Set<UUID> players, boolean arePlayersHidden) {
         this.players = players;
         this.arePlayersHidden = arePlayersHidden;
+        this.miningSpeeds = new HashMap<>();
     }
 
     /**
@@ -46,4 +52,34 @@ public Set<UUID> removePlayer(UUID player) {
         return players;
     }
 
+    /**
+     * Sets the mining speed for a player
+     * @param player The player
+     * @param speed The speed
+     */
+    public void setMiningSpeed(UUID player, float speed) {
+        if (speed <= 0 || speed == 1) {
+            Blockify.getInstance().getLogger().warning("Invalid mining speed for player " + player + ": " + speed);
+            return;
+        }
+        miningSpeeds.put(player, speed);
+    }
+
+    /**
+     * Resets the mining speed for a player
+     * @param player The player
+     */
+    public void resetMiningSpeed(UUID player) {
+        miningSpeeds.remove(player);
+    }
+
+    /**
+     * Gets the mining speed of a player
+     * @param player The player
+     * @return The mining speed
+     */
+    public float getMiningSpeed(UUID player) {
+        return miningSpeeds.getOrDefault(player, 1f);
+    }
+
 }

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

@@ -1,7 +1,6 @@
 package codes.kooper.blockify.protocol;
 
 import codes.kooper.blockify.Blockify;
-import codes.kooper.blockify.events.BlockifyBreakEvent;
 import codes.kooper.blockify.events.BlockifyInteractEvent;
 import codes.kooper.blockify.models.Stage;
 import codes.kooper.blockify.models.View;
@@ -16,8 +15,6 @@
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerBlockChange;
 import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 
@@ -59,26 +56,11 @@ public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
                             return;
                         }
 
-                        if (actionType == DiggingAction.START_DIGGING) {
-                            if (canInstantBreak(player, blockData)) {
-                                actionType = DiggingAction.FINISHED_DIGGING;
-                            }
-                        }
-
-                        // Block break functionality
-                        if (actionType == DiggingAction.FINISHED_DIGGING) {
-                            Bukkit.getScheduler().runTask(Blockify.getInstance(), () -> {
-                                // Call BlockifyBreakEvent
-                                BlockifyBreakEvent ghostBreakEvent = new BlockifyBreakEvent(player, position.toPosition(), blockData, view, view.getStage());
-                                ghostBreakEvent.callEvent();
-                                // If block is not cancelled, break the block, otherwise, revert the block
-                                if (!ghostBreakEvent.isCancelled()) {
-                                    Blockify.getInstance().getBlockChangeManager().sendBlockChange(view.getStage(), view.getStage().getAudience(), position, Material.AIR.createBlockData());
-                                    view.setBlock(position, Material.AIR.createBlockData());
-                                } else {
-                                    player.sendBlockChange(position.toLocation(player.getWorld()), blockData);
-                                }
-                            });
+                        // Check if player has custom mining speed, if so, handle custom digging, else handle normal digging
+                        if (view.getStage().getAudience().getMiningSpeed(player.getUniqueId()) != 1) {
+                            Blockify.getInstance().getMiningUtils().handleCustomDigging(player, view, actionType, blockData, position);
+                        } else {
+                            Blockify.getInstance().getMiningUtils().handleNormalDigging(player, view, actionType, blockData, position);
                         }
 
                         return;
@@ -88,15 +70,4 @@ public void onPacketPlayReceive(PacketPlayReceiveEvent event) {
         }
     }
 
-    /**
-     * Check if player can instantly break block
-     *
-     * @param player    Player who is digging
-     * @param blockData BlockData of the block
-     * @return boolean
-     */
-    public boolean canInstantBreak(Player player, BlockData blockData) {
-        return blockData.getDestroySpeed(player.getInventory().getItemInMainHand(), true) >= blockData.getMaterial().getHardness() * 30 || player.getGameMode() == GameMode.CREATIVE;
-    }
-
-}
+}