From 16cdb1c58bd20236c17207584d32acb8cce56f85 Mon Sep 17 00:00:00 2001 From: Dark Arc Date: Fri, 29 Mar 2013 20:36:17 -0400 Subject: [PATCH] Added tripwire & pressure plate logging --- src/main/java/de/diddiz/LogBlock/BlockChange.java | 4 ++++ src/main/java/de/diddiz/LogBlock/LogBlock.java | 2 +- src/main/java/de/diddiz/LogBlock/Logging.java | 3 +-- .../diddiz/LogBlock/listeners/InteractLogging.java | 13 +++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/BlockChange.java b/src/main/java/de/diddiz/LogBlock/BlockChange.java index af722b8..87e63e5 100644 --- a/src/main/java/de/diddiz/LogBlock/BlockChange.java +++ b/src/main/java/de/diddiz/LogBlock/BlockChange.java @@ -76,6 +76,10 @@ public class BlockChange implements LookupCacheElement msg.append("ate a piece of ").append(materialName(type)); else if (type == 25 || type == 93 || type == 94 || type == 149 || type == 150) msg.append("changed ").append(materialName(type)); + else if (type == 70 || type == 72 || type == 147 || type == 148) + msg.append("stepped on ").append(materialName(type)); + else if (type == 132) + msg.append("ran into ").append(materialName(type)); } else if (type == 0) msg.append("destroyed ").append(materialName(replaced, data)); else if (replaced == 0) diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java index f27a4e5..45b6025 100644 --- a/src/main/java/de/diddiz/LogBlock/LogBlock.java +++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java @@ -149,7 +149,7 @@ public class LogBlock extends JavaPlugin if (isLogging(Logging.CHESTACCESS)) { pm.registerEvents(new ChestAccessLogging(this), this); } - if (isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT)) + if (isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT) || isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT)) pm.registerEvents(new InteractLogging(this), this); if (isLogging(Logging.KILL)) pm.registerEvents(new KillLogging(this), this); diff --git a/src/main/java/de/diddiz/LogBlock/Logging.java b/src/main/java/de/diddiz/LogBlock/Logging.java index 7485d29..848a5d2 100644 --- a/src/main/java/de/diddiz/LogBlock/Logging.java +++ b/src/main/java/de/diddiz/LogBlock/Logging.java @@ -6,9 +6,8 @@ public enum Logging GHASTFIREBALLEXPLOSION(true), ENDERDRAGON(true), MISCEXPLOSION, FIRE(true), LEAVESDECAY, LAVAFLOW, WATERFLOW, CHESTACCESS, KILL, CHAT, SNOWFORM, SNOWFADE, DOORINTERACT, SWITCHINTERACT, CAKEEAT, ENDERMEN, NOTEBLOCKINTERACT, DIODEINTERACT, COMPARATORINTERACT, - NATURALSTRUCTUREGROW, WITHER(true), WITHER_SKULL(true), + PRESUREPLATEINTERACT, TRIPWIREINTERACT, NATURALSTRUCTUREGROW, WITHER(true), WITHER_SKULL(true), BONEMEALSTRUCTUREGROW, WORLDEDIT, TNTMINECARTEXPLOSION(true); - public static final int length = Logging.values().length; private final boolean defaultEnabled; diff --git a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java index 3064b63..f0712df 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java @@ -60,6 +60,19 @@ public class InteractLogging extends LoggingListener consumer.queueBlock(player.getName(), loc, typeId, typeId, blockData); } break; + case WOOD_PLATE: + case STONE_PLATE: + case IRON_PLATE: + case GOLD_PLATE: + if (wcfg.isLogging(Logging.PRESUREPLATEINTERACT) && event.getAction() == Action.PHYSICAL) { + consumer.queueBlock(player.getName(), loc, typeId, typeId, blockData); + } + break; + case TRIPWIRE: + if (wcfg.isLogging(Logging.TRIPWIREINTERACT) && event.getAction() == Action.PHYSICAL) { + consumer.queueBlock(player.getName(), loc, typeId, typeId, blockData); + } + break; } } }