Skip to content

Commit

Permalink
Merge pull request #120 from InsightsPlugin/fix/remove-extra-scan
Browse files Browse the repository at this point in the history 
Remove need for extra scan on block break
  • Loading branch information
@FrankHeijden
FrankHeijden authored Jul 16, 2021
2 parents c70935d + 6899a1f commit 4406d4c
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 37 deletions.
13 changes: 13 additions & 0 deletions Insights-API/src/main/java/dev/frankheijden/insights/api/util/MaterialTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.NamespacedKey;
import org.bukkit.Tag;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
Expand All @@ -14,6 +15,18 @@ public class MaterialTags implements Tag<Material> {

private static final List<Material> MATERIALS = Arrays.asList(Material.values());
public static final MaterialTags BUCKETS = new MaterialTags(m -> m.name().endsWith("_BUCKET"), "buckets");
public static final MaterialTags NEEDS_GROUND = new MaterialTags(
EnumSet.of(
Material.ACTIVATOR_RAIL,
Material.COMPARATOR,
Material.DETECTOR_RAIL,
Material.POWERED_RAIL,
Material.RAIL,
Material.REDSTONE_WIRE,
Material.REPEATER
),
"needs_ground"
);

private final Set<Material> materials;
private final String key;
Expand Down
82 changes: 45 additions & 37 deletions Insights/src/main/java/dev/frankheijden/insights/listeners/BlockListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
import dev.frankheijden.insights.api.objects.wrappers.ScanObject;
import dev.frankheijden.insights.api.util.MaterialTags;
import dev.frankheijden.insights.api.utils.BlockUtils;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Directional;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;
Expand Down Expand Up @@ -49,13 +47,13 @@ public BlockListener(Insights plugin) {
*/
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) {
Block block = event.getBlock();
Location location = block.getLocation();
Material material = block.getType();
Player player = event.getPlayer();
var block = event.getBlock();
var location = block.getLocation();
var material = block.getType();
var player = event.getPlayer();

// In case of BlockMultiPlaceEvent, we may need to take a different delta.
int delta = 0;
var delta = 0;
if (event instanceof BlockMultiPlaceEvent) {
List<BlockState> replacedBlockStates = ((BlockMultiPlaceEvent) event).getReplacedBlockStates();
for (BlockState state : replacedBlockStates) {
Expand All @@ -78,16 +76,16 @@ public void onBlockPlace(BlockPlaceEvent event) {
*/
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockPlaceMonitor(BlockPlaceEvent event) {
Block block = event.getBlock();
Location location = block.getLocation();
Material material = block.getType();
Player player = event.getPlayer();
var block = event.getBlock();
var location = block.getLocation();
var material = block.getType();
var player = event.getPlayer();

// In case of BlockMultiPlaceEvent, we need to update the cache differently.
if (event instanceof BlockMultiPlaceEvent) {
List<BlockState> replacedBlockStates = ((BlockMultiPlaceEvent) event).getReplacedBlockStates();
for (BlockState state : replacedBlockStates) {
Location loc = state.getLocation();
var loc = state.getLocation();
handleModification(loc, state.getType(), material, 1);
}
} else {
Expand All @@ -103,15 +101,15 @@ public void onBlockPlaceMonitor(BlockPlaceEvent event) {
*/
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockBreak(BlockBreakEvent event) {
Block block = event.getBlock();
Location location = block.getLocation();
Material material = block.getType();
Player player = event.getPlayer();
var block = event.getBlock();
var location = block.getLocation();
var material = block.getType();
var player = event.getPlayer();

if (Tag.BEDS.isTagged(material)) {
Optional<Block> blockOptional = BlockUtils.getOtherHalf(block);
if (blockOptional.isPresent()) {
Block otherHalf = blockOptional.get();
var otherHalf = blockOptional.get();

// Update the other half's location
handleModification(otherHalf.getLocation(), material, -1);
Expand All @@ -121,10 +119,20 @@ public void onBlockBreak(BlockBreakEvent event) {
// Handle the removal
handleRemoval(player, location, ScanObject.of(material), 1, false);

// Reschedule the chunk for scanning
// Hacky way of allowing indirect block breaks,
// such as redstone wire popping off when the block below it is being broken.
plugin.getChunkContainerExecutor().submit(block.getChunk());
// Need to check if block above broken block was a block which needs support (solid block below it),
// and subtract that from the cache as well (only if it does not make a sound when broken, i.e. REDSTONE_WIRE)
var aboveBlock = getTopNonGravityBlock(block);
var aboveMaterial = aboveBlock.getType();
if (MaterialTags.NEEDS_GROUND.isTagged(aboveMaterial)) {
handleRemoval(player, aboveBlock.getLocation(), ScanObject.of(aboveMaterial), 1, false);
}
}

private Block getTopNonGravityBlock(Block start) {
do {
start = start.getRelative(BlockFace.UP);
} while (start.getType().hasGravity());
return start;
}

@AllowDisabling
Expand All @@ -139,12 +147,12 @@ public void onBlockBurn(BlockBurnEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockDispense(BlockDispenseEvent event) {
Block block = event.getBlock();
BlockData blockData = block.getBlockData();
var block = event.getBlock();
var blockData = block.getBlockData();

// If block is not directional, we don't know the dispensed block's position.
if (!(blockData instanceof Directional)) return;
Block relative = block.getRelative(((Directional) blockData).getFacing());
var relative = block.getRelative(((Directional) blockData).getFacing());

Material item = event.getItem().getType();

Expand Down Expand Up @@ -173,14 +181,14 @@ public void onBlockDispense(BlockDispenseEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockExplode(BlockExplodeEvent event) {
Block block = event.getBlock();
Location location = block.getLocation();
var block = event.getBlock();
var location = block.getLocation();

PlayerListener playerListener = ((Insights) plugin).getPlayerListener();
var playerListener = ((Insights) plugin).getPlayerListener();
Optional<PlayerListener.ExplodedBed> bedOptional = playerListener.getIntentionalDesignBugAt(location);
if (bedOptional.isPresent()) {
PlayerListener.ExplodedBed explodedBed = bedOptional.get();
Material material = explodedBed.getMaterial();
var explodedBed = bedOptional.get();
var material = explodedBed.getMaterial();
handleModification(explodedBed.getHead(), material, -1);
handleModification(explodedBed.getFoot(), material, -1);
} else {
Expand All @@ -198,7 +206,7 @@ public void onBlockExplode(BlockExplodeEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockFade(BlockFadeEvent event) {
Block block = event.getBlock();
var block = event.getBlock();
handleModification(block.getLocation(), block.getType(), event.getNewState().getType(), 1);
}

Expand All @@ -208,7 +216,7 @@ public void onBlockFade(BlockFadeEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockFromTo(BlockFromToEvent event) {
Block block = event.getToBlock();
var block = event.getToBlock();

// For some weird reason the "ToBlock" contains the from data...
handleModification(block.getLocation(), block.getType(), event.getBlock().getType(), 1);
Expand All @@ -228,7 +236,7 @@ public void onFluidLevelChange(FluidLevelChangeEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockGrow(BlockGrowEvent event) {
Block block = event.getBlock();
var block = event.getBlock();
handleModification(block.getLocation(), block.getType(), event.getNewState().getType(), 1);
}

Expand Down Expand Up @@ -256,7 +264,7 @@ public void onBlockPistonRetract(BlockPistonRetractEvent event) {
*/
private void handlePistonEvent(BlockPistonEvent event, List<Block> blocks) {
for (Block block : blocks) {
Block relative = block.getRelative(event.getDirection());
var relative = block.getRelative(event.getDirection());

handleModification(block.getLocation(), block.getType(), -1);
handleModification(relative.getLocation(), block.getType(), 1);
Expand All @@ -269,7 +277,7 @@ private void handlePistonEvent(BlockPistonEvent event, List<Block> blocks) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockSpread(BlockSpreadEvent event) {
Block block = event.getBlock();
var block = event.getBlock();
handleModification(block.getLocation(), block.getType(), event.getNewState().getType(), 1);
}

Expand All @@ -279,7 +287,7 @@ public void onBlockSpread(BlockSpreadEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onEntityBlockForm(EntityBlockFormEvent event) {
Block block = event.getBlock();
var block = event.getBlock();
handleModification(block.getLocation(), block.getType(), event.getNewState().getType(), 1);
}

Expand All @@ -298,7 +306,7 @@ public void onLeavesDecay(LeavesDecayEvent event) {
@AllowDisabling
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onSpongeAbsorb(SpongeAbsorbEvent event) {
Block block = event.getBlock();
var block = event.getBlock();
handleModification(block.getLocation(), Material.SPONGE, Material.WET_SPONGE, 1);
for (BlockState state : event.getBlocks()) {
handleModification(state.getLocation(), Material.WATER, state.getType(), 1);
Expand Down

0 comments on commit 4406d4c

Please sign in to comment.