YouHaveTrouble/Enchantio
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/Enchantio.git synced 2026-10-26 12:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid pdc since there's already a map of data about multimining

Browse Source
This commit is contained in:
YouHaveTrouble
2026-09-29 19:02:36 +02:00
parent 0f628fb3fc
commit 21946bfe3b
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/enchantio/listeners/TunnellingListener.java
+6 -17
View File
@@ -22,7 +22,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.persistence.PersistentDataType;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -32,10 +31,8 @@ public class TunnellingListener implements Listener {
private final static Set<Block> blockBreakSkips = new HashSet<>(); private final static Set<Block> blockBreakSkips = new HashSet<>();
private final static Map<UUID, BlockBreakData> blockBreakData = new ConcurrentHashMap<>(); private final static Map<UUID, BlockBreakData> blockBreakData = new ConcurrentHashMap<>();
private final Enchantment tunnelling = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT).get(TunnellingEnchant.KEY); private final Enchantment tunnelling = RegistryAccess.registryAccess().getRegistry(RegistryKey.ENCHANTMENT).get(TunnellingEnchant.KEY);
private final NamespacedKey tunnellingBlockFaceKey = new NamespacedKey("enchantio", "tunellingblockface");
private final TunnellingEnchant tunnellingEnchant; private final TunnellingEnchant tunnellingEnchant;
public TunnellingListener() { public TunnellingListener() {
if (EnchantioConfig.ENCHANTS.get(TunnellingEnchant.KEY) instanceof TunnellingEnchant enchant) { if (EnchantioConfig.ENCHANTS.get(TunnellingEnchant.KEY) instanceof TunnellingEnchant enchant) {
this.tunnellingEnchant = enchant; this.tunnellingEnchant = enchant;
@@ -71,12 +68,11 @@ public class TunnellingListener implements Listener {
if (item.isEmpty()) return; if (item.isEmpty()) return;
int enchantLevel = item.getEnchantmentLevel(tunnelling); int enchantLevel = item.getEnchantmentLevel(tunnelling);
if (enchantLevel == -1) return; if (enchantLevel == -1) return;
player.getPersistentDataContainer().set(tunnellingBlockFaceKey, PersistentDataType.STRING, event.getBlockFace().toString());
if (!tunnellingEnchant.shouldVisualizeBreaking()) return; if (!tunnellingEnchant.shouldVisualizeBreaking()) return;
if (blockBreakData.containsKey(player.getUniqueId())) return; if (blockBreakData.containsKey(player.getUniqueId())) return;
Block block = event.getBlock(); Block block = event.getBlock();
Set<Block> blocksToBreak = getSquare(block, event.getBlockFace(), tunnellingEnchant.getBlocksPerLevel() * enchantLevel); Set<Block> blocksToBreak = getSquare(block, event.getBlockFace(), tunnellingEnchant.getBlocksPerLevel() * enchantLevel);
blockBreakData.put(player.getUniqueId(), new BlockBreakData(block, block.getWorld().getFullTime(), blocksToBreak)); blockBreakData.put(player.getUniqueId(), new BlockBreakData(block, block.getWorld().getFullTime(), event.getBlockFace(), blocksToBreak));
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -104,26 +100,19 @@ public class TunnellingListener implements Listener {
public void onTunnelBlockBreak(BlockBreakEvent event) { public void onTunnelBlockBreak(BlockBreakEvent event) {
if (tunnelling == null) return; if (tunnelling == null) return;
Player player = event.getPlayer(); Player player = event.getPlayer();
Block block = event.getBlock();
BlockBreakData data = blockBreakData.remove(player.getUniqueId()); BlockBreakData data = blockBreakData.remove(player.getUniqueId());
if (blockBreakSkips.contains(block)) return;
if (data != null) updateBlockBreakProgress(player, data, 0f); if (data != null) updateBlockBreakProgress(player, data, 0f);
if (GameMode.CREATIVE.equals(player.getGameMode())) return; if (GameMode.CREATIVE.equals(player.getGameMode())) return;
if (player.isSneaking()) return; if (player.isSneaking()) return;
String rawFace = player.getPersistentDataContainer().get(tunnellingBlockFaceKey, PersistentDataType.STRING);
if (rawFace == null) return;
ItemStack item = event.getPlayer().getInventory().getItemInMainHand(); ItemStack item = event.getPlayer().getInventory().getItemInMainHand();
int enchantLevel = item.getEnchantmentLevel(tunnelling); int enchantLevel = item.getEnchantmentLevel(tunnelling);
if (enchantLevel <= 0) return; if (enchantLevel <= 0) return;
Block block = event.getBlock();
BlockType blockType = block.getType().asBlockType(); BlockType blockType = block.getType().asBlockType();
if (!Registry.BLOCK.getTagValues(BlockTypeTagKeys.create(TunnellingEnchant.AFFECTED_BLOCKS_KEY)).contains(blockType)) return; if (!Registry.BLOCK.getTagValues(BlockTypeTagKeys.create(TunnellingEnchant.AFFECTED_BLOCKS_KEY)).contains(blockType)) return;
if (blockBreakSkips.contains(block)) return; if (data == null) return;
BlockFace blockFace; Set<Block> blocksToBreak = getSquare(block, data.blockFace, tunnellingEnchant.getBlocksPerLevel() * enchantLevel);
try {
blockFace = BlockFace.valueOf(rawFace);
} catch (IllegalArgumentException e) {
return;
}
Set<Block> blocksToBreak = getSquare(block, blockFace, tunnellingEnchant.getBlocksPerLevel() * enchantLevel);
blockBreakSkips.addAll(blocksToBreak); blockBreakSkips.addAll(blocksToBreak);
for (Block b : blocksToBreak) { for (Block b : blocksToBreak) {
if (player.getInventory().getItemInMainHand().isEmpty()) { if (player.getInventory().getItemInMainHand().isEmpty()) {
@@ -182,6 +171,6 @@ public class TunnellingListener implements Listener {
return blocks; return blocks;
} }
private record BlockBreakData(Block block, long startedBreakingAtTick, Set<Block> blocksToSyncDamage) {} private record BlockBreakData(Block block, long startedBreakingAtTick, BlockFace blockFace, Set<Block> blocksToSyncDamage) {}
} }