feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Correctly log 1.16 blocks

Browse Source
This commit is contained in:
Brokkonaut
2020-06-27 22:40:08 +02:00
parent 04b5d9e7ed
commit 3bfb19cdfa
2 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/diddiz/util/BukkitUtils.java
View File

@ -168,6 +168,11 @@ public class BukkitUtils {
singleBlockPlants.add(Material.LILY_OF_THE_VALLEY);
singleBlockPlants.add(Material.CORNFLOWER);
singleBlockPlants.add(Material.WITHER_ROSE);
singleBlockPlants.add(Material.CRIMSON_FUNGUS);
singleBlockPlants.add(Material.WARPED_FUNGUS);
singleBlockPlants.add(Material.CRIMSON_ROOTS);
singleBlockPlants.add(Material.WARPED_ROOTS);
singleBlockPlants.add(Material.NETHER_SPROUTS);
doublePlants = EnumSet.noneOf(Material.class);
doublePlants.add(Material.TALL_GRASS);
@ -238,6 +243,8 @@ public class BukkitUtils {
relativeTopBreakable.addAll(doublePlants);
relativeTopBreakable.add(Material.BAMBOO);
relativeTopBreakable.add(Material.BAMBOO_SAPLING);
relativeTopBreakable.add(Material.TWISTING_VINES);
relativeTopBreakable.add(Material.TWISTING_VINES_PLANT);
for (Material m : Material.values()) {
if (m.name().startsWith("POTTED_")) {
relativeTopBreakable.add(m);
@ -998,6 +1005,12 @@ public class BukkitUtils {
case PUMPKIN_STEM:
case ATTACHED_PUMPKIN_STEM:
return found == Material.PUMPKIN_STEM || found == Material.ATTACHED_PUMPKIN_STEM;
case TWISTING_VINES:
case TWISTING_VINES_PLANT:
return found == Material.TWISTING_VINES || found == Material.TWISTING_VINES_PLANT;
case WEEPING_VINES:
case WEEPING_VINES_PLANT:
return found == Material.WEEPING_VINES || found == Material.WEEPING_VINES_PLANT;
}
return false;
}

50
src/main/java/de/diddiz/util/LoggingUtil.java
View File

@ -27,7 +27,20 @@ public class LoggingUtil {
public static void smartLogBlockPlace(Consumer consumer, Actor actor, BlockState replaced, BlockState placed) {
Location loc = replaced.getLocation();
if (!placed.getType().hasGravity() || !BukkitUtils.canDirectlyFallIn(replaced.getBlock().getRelative(BlockFace.DOWN).getType())) {
Material placedType = placed.getType();
if (!placedType.hasGravity() || !BukkitUtils.canDirectlyFallIn(replaced.getBlock().getRelative(BlockFace.DOWN).getType())) {
if (placedType == Material.TWISTING_VINES) {
Block below = placed.getBlock().getRelative(BlockFace.DOWN);
if (below.getType() == Material.TWISTING_VINES) {
consumer.queueBlockReplace(actor, below.getState(), Material.TWISTING_VINES_PLANT.createBlockData());
}
}
if (placedType == Material.WEEPING_VINES) {
Block above = placed.getBlock().getRelative(BlockFace.UP);
if (above.getType() == Material.WEEPING_VINES) {
consumer.queueBlockReplace(actor, above.getState(), Material.WEEPING_VINES_PLANT.createBlockData());
}
}
if (BukkitUtils.isEmpty(replaced.getType())) {
consumer.queueBlockPlace(actor, placed);
} else {
@ -118,6 +131,19 @@ public class LoggingUtil {
if (wcfg == null) {
return;
}
Material replacedType = origin.getType();
if (replacedType == Material.TWISTING_VINES || replacedType == Material.TWISTING_VINES_PLANT) {
Block below = origin.getRelative(BlockFace.DOWN);
if (below.getType() == Material.TWISTING_VINES_PLANT) {
consumer.queueBlockReplace(actor, below.getState(), Material.TWISTING_VINES.createBlockData());
}
}
if (replacedType == Material.WEEPING_VINES || replacedType == Material.WEEPING_VINES_PLANT) {
Block above = origin.getRelative(BlockFace.UP);
if (above.getType() == Material.WEEPING_VINES_PLANT) {
consumer.queueBlockReplace(actor, above.getState(), Material.WEEPING_VINES.createBlockData());
}
}
Block checkBlock = origin.getRelative(BlockFace.UP);
Material typeAbove = checkBlock.getType();
@ -148,6 +174,14 @@ public class LoggingUtil {
}
} else {
consumer.queueBlockBreak(actor, checkBlock.getState());
// check next blocks above
checkBlock = checkBlock.getRelative(BlockFace.UP);
typeAbove = checkBlock.getType();
while (BukkitUtils.getRelativeTopBreakabls().contains(typeAbove)) {
consumer.queueBlockBreak(actor, checkBlock.getState());
checkBlock = checkBlock.getRelative(BlockFace.UP);
typeAbove = checkBlock.getType();
}
}
} else if (typeAbove == Material.LANTERN) {
Lantern lantern = (Lantern) checkBlock.getBlockData();
@ -173,6 +207,16 @@ public class LoggingUtil {
if (bell.getAttachment() == Attachment.CEILING) {
consumer.queueBlockBreak(actor, checkBlock.getState());
}
} else if (typeBelow == Material.WEEPING_VINES || typeBelow == Material.WEEPING_VINES_PLANT) {
consumer.queueBlockBreak(actor, checkBlock.getState());
// check next blocks above
checkBlock = checkBlock.getRelative(BlockFace.DOWN);
typeBelow = checkBlock.getType();
while (typeBelow == Material.WEEPING_VINES || typeBelow == Material.WEEPING_VINES_PLANT) {
consumer.queueBlockBreak(actor, checkBlock.getState());
checkBlock = checkBlock.getRelative(BlockFace.DOWN);
typeBelow = checkBlock.getType();
}
}
List<Location> relativeBreakables = BukkitUtils.getBlocksNearby(origin, BukkitUtils.getRelativeBreakables());
@ -197,7 +241,7 @@ public class LoggingUtil {
}
// Special door check
if (origin.getType() == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(origin.getType())) {
if (replacedType == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(replacedType)) {
Block doorBlock = origin;
// Up or down?
@ -210,7 +254,7 @@ public class LoggingUtil {
if (doorBlock.getType() == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(doorBlock.getType())) {
consumer.queueBlockBreak(actor, doorBlock.getState());
}
} else if (BukkitUtils.isDoublePlant(origin.getType())) { // Special double plant check
} else if (BukkitUtils.isDoublePlant(replacedType)) { // Special double plant check
Block plantBlock = origin;
// Up or down?