First tries to get postgres up and running

Fix NPE, update dependencies

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.java]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.java text
+*.txt text
+*.yml text
+*.xml text
+*.md text
+LICENSE text

.travis.yml

@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk7
-  - openjdk6
+  - openjdk8
 notifications:
   email: false

CHANGELOG.md

@@ -0,0 +1,103 @@
+# 1.94
+
+This supports all versions of Bukkit from 1.7.2-R0.3 onwards, including 1.8
+
+## Main changes
+
+* Supports UUIDs - see [this wiki page](https://github.com/LogBlock/LogBlock/wiki/Converting-a-pre-existing-database-to-use-UUIDs) for a short description of the limitations of the migration system
+* Supports WorldEdit version 6 and up - unfortunately this means dropping support for previous versions of WorldEdit
+* Database insertion optimisation which in tests logged actions six times faster using a local database, and over **250** times faster when the database was on a different server than LogBlock
+
+## Fixes and improvements
+
+* Logs itemdata with values over 256 (logs potion types and item durability)
+* Better support for inventory types such as trapped chests
+* Fix error when trying to query a double chest without WorldEdit installed
+* Correctly log fireballs
+* Log players extinguishing fire
+* Support utf8mb4 text logging (fixes error when using some obscure characters)
+* Overhauled parameter parsing
+* Added "/lb hide on" and "/lb hide off" to complement the existing "/lb hide" toggle
+* Don't log chat from hidden players
+* Fixed error when trying to query illegal triple chests
+* Fixed error when a projectile that kills an entity had no source
+
+# 1.80
+* Wooden button logging
+* Better fireball logging
+* Better location querying
+* Smarter smart logging
+* Add TNT Carts
+* Ability to disable sanity ID
+* Allow more log rows
+* Use UTF-8 for logging
+* Comparator, tripwire, pressure plate, crop trample logging added
+* Door log fix
+* Better messages
+* Block spreading
+* Fix timezone support
+* Death logging fix
+* Chest decay
+* Various SQL improvements (see source)
+
+
+# v1.70
+* More prepared statements
+* Increase to accuracy (Thanks DarkArc)
+* WorldEdit logging
+* Case insensitive player ignoring
+* Consumer warnings + more aggressive defaults (Thanks DarkArc)
+
+# v1.61
+* Use more prepared statements
+* Fix timestamps on some entries
+* Report progress for large rollbacks
+
+
+# v1.60
+* Falling blocks (sand/gravel) are now logged properly in the location they land
+* The format of the date displayed in lookups is now customizable under "lookup.dateFormat" in config.yml, please refer to http://docs.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html for the display options
+* Parameters can now be escaped with double quotes, allowing for spaces in parameters e.g (world "world with spaces")
+* Blocks placed now have their data logged properly. Blocks with extra data such as stairs will now be resetted properly during redos
+* Fixed bug whereby lava and water logging options in world config weren't considered
+* Fixed duplicate "[LogBlock]" tags in message logging
+* Fixed y axis not being considered in the radius specified by area
+* Fixed possible crash on /lb tp
+
+
+# v1.59
+* Fix * permission
+
+# v1.58
+* Require WorldEdit once again.
+* 1.57 table updates are optional
+
+# v1.57
+* PermissionDefault to OP
+* Increase default table sizes
+
+# v1.56
+* Invert chest logging
+* Remove worldedit auto download
+
+# v1.55
+* Transition to maven
+* Use async chat event
+* Add metrics
+* Small performance increases
+
+# v1.54
+* Fix derpy fake inventory plugins throwing npes.
+
+# v1.53
+* Make use of the new chest logging system
+* Remove the use of old permissions systems
+
+# v1.52
+* Properly log block replacement.
+* Added option to disallow tool dropping to prevent item duplication.
+* Removed double logblock.tp permission.
+* Fixed config updater error.
+* Check if EntityChangeBlockEvent is triggered by Enderman.
+* Fixed onlinetime logging for players.
+* Fixed npe in /lb me.

README.md

@@ -4,4 +4,4 @@ LogBlock
 This plugin logs block changes such as breaking, placing, modifying, or burning to a MySQL Database. It can be used as an anti-griefing tool to find out who made a particular edit, or even roll back changes by certain players.
 Originally written by bootswithdefer, for hMod, ported to Bukkit by me, because of the inability to identfy griefers. BigBrother also did't work, so I was forced to do it myself. The honor belongs to bootswithdefer for the sourcecode, I only spent about 8 hours to transcribe. All functions except sign text logging shold work as in hMod. The use of permissions plugin is possible, but not necessary.
 
-Questioner: http://git.io/u2MxKQ
+You can download development builds [from our Jenkins server](https://www.iani.de/jenkins/job/LogBlock/).

pom.xml

@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.diddiz</groupId>
     <artifactId>logblock</artifactId>
-    <version>1.94</version>
+    <version>1.20.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>LogBlock</name>
@@ -29,66 +29,61 @@
 
     <distributionManagement>
         <repository>
-            <id>md_5-releases</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <id>nexus</id>
+            <name>Releases</name>
+            <url>https://www.iani.de/nexus/content/repositories/releases/</url>
         </repository>
         <snapshotRepository>
-            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+            <id>nexus</id>
+            <name>Snapshot</name>
+            <url>https://www.iani.de/nexus/content/repositories/snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 
     <dependencies>
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.7.2-R0.3</version>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>questioner</artifactId>
-            <version>${project.version}</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/LogBlockQuestioner.jar</systemPath>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>7.3.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <version>6.0.0-SNAPSHOT</version>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP-java6</artifactId>
-            <version>2.3.8</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.10</version>
+            <artifactId>HikariCP</artifactId>
+            <version>5.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
     <repositories>
         <repository>
-            <id>repobo-snap</id>
-            <url>http://repo.bukkit.org/content/groups/public</url>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
             <id>sk89q-repo</id>
-            <url>http://maven.sk89q.com/repo/</url>
+            <url>https://maven.enginehub.org/repo/</url>
         </repository>
         <repository>
-            <id>kitteh-repo</id>
-            <url>http://repo.kitteh.org/content/groups/public</url>
+            <id>brokkonaut-repo</id>
+            <url>https://www.iani.de/nexus/content/groups/public/</url>
         </repository>
     </repositories>
     <profiles>
@@ -123,23 +118,22 @@
         <resources>
             <resource>
                 <filtering>true</filtering>
-                <directory>${project.basedir}/src/main/resources</directory>
+                <directory>src/main/resources</directory>
             </resource>
         </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.12.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <release>17</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.9.1</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>regex-property</id>
@@ -159,7 +153,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.5.1</version>
                 <configuration>
                 </configuration>
                 <executions>
@@ -168,6 +162,14 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.zaxxer.hikari</pattern>
+                                    <shadedPattern>de.diddiz.lib.com.zaxxer.hikari</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>

src/main/java/de/diddiz/LogBlock/Actor.java

@@ -3,55 +3,89 @@ package de.diddiz.LogBlock;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
 
+import static de.diddiz.LogBlock.util.BukkitUtils.entityName;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import static de.diddiz.util.BukkitUtils.entityName;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
 
 public class Actor {
 
     @Override
     public int hashCode() {
-        int hash = 5;
-        hash = 79 * hash + (this.UUID != null ? this.UUID.hashCode() : 0);
-        return hash;
+        return this.UUID != null ? this.UUID.hashCode() : 0;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final Actor other = (Actor) obj;
-        return ((this.UUID == null && other.UUID == null) || this.UUID.equals(other.UUID));
+        return (this.UUID == null) ? (other.UUID == null) : this.UUID.equals(other.UUID);
     }
 
     final String name;
     final String UUID;
+    final Location blockLocation;
+    final Entity entity;
 
     public Actor(String name, String UUID) {
         this.name = name;
-        this.UUID = UUID;
+        this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
+        this.blockLocation = null;
+        this.entity = null;
+    }
 
+    public Actor(String name, String UUID, Block block) {
+        this.name = name;
+        this.UUID = UUID == null ? "unknown" : (UUID.length() > 36 ? UUID.substring(0, 36) : UUID);
+        this.blockLocation = block == null ? null : block.getLocation();
+        this.entity = null;
     }
 
     public Actor(String name, java.util.UUID UUID) {
         this.name = name;
         this.UUID = UUID.toString();
+        this.blockLocation = null;
+        this.entity = null;
+    }
 
+    public Actor(String name, java.util.UUID UUID, Block block) {
+        this.name = name;
+        this.UUID = UUID.toString();
+        this.blockLocation = block == null ? null : block.getLocation();
+        this.entity = null;
+    }
+
+    public Actor(String name, java.util.UUID UUID, Entity entity) {
+        this.name = name;
+        this.UUID = UUID.toString();
+        this.blockLocation = null;
+        this.entity = entity;
     }
 
     public Actor(String name) {
         this(name, generateUUID(name));
     }
 
+    public Actor(String name, Block block) {
+        this(name, generateUUID(name), block);
+    }
+
+    public Actor(String name, Entity entity) {
+        this.name = name;
+        this.UUID = generateUUID(name);
+        this.blockLocation = null;
+        this.entity = entity;
+    }
+
     public Actor(ResultSet rs) throws SQLException {
         this(rs.getString("playername"), rs.getString("UUID"));
     }
@@ -64,16 +98,33 @@ public class Actor {
         return UUID;
     }
 
-    public static Actor actorFromEntity(Entity entity) {
-        if (entity instanceof Player) {
-            return new Actor(entityName(entity), entity.getUniqueId());
-        } else {
-            return new Actor(entityName(entity));
-        }
+    public Location getBlockLocation() {
+        return blockLocation;
     }
 
+    /**
+     * The acting entity object (if known)
+     */
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public static Actor actorFromEntity(Entity entity) {
+        if (entity instanceof Player) {
+            return new Actor(entityName(entity), entity.getUniqueId(), entity);
+        }
+        if (entity instanceof Projectile) {
+            ProjectileSource shooter = ((Projectile) entity).getShooter();
+            if (shooter != null) {
+                return actorFromProjectileSource(shooter);
+            }
+        }
+        return new Actor(entityName(entity), entity);
+    }
+
+    @Deprecated
     public static Actor actorFromEntity(EntityType entity) {
-        return new Actor(entity.getName());
+        return new Actor(entity.name());
     }
 
     public static Actor actorFromProjectileSource(ProjectileSource psource) {
@@ -87,7 +138,8 @@ public class Actor {
         }
 
     }
-/**
+
+    /**
      * Generate an Actor object from a String name, trying to guess if it's an online player
      * and if so, setting the UUID accordingly. This only checks against currently online
      * players and is a "best effort" attempt for use with the pre-UUID API
@@ -96,18 +148,19 @@ public class Actor {
      * or {@link #actorFromEntity(org.bukkit.entity.EntityType) } methods
      * <p>
      * If you know something is a server effect (like gravity) use {@link #Actor(java.lang.String)}
+     *
      * @deprecated Only use this if you have a String of unknown origin
      *
- * @param actorName String of unknown origin
+     * @param actorName
+     *            String of unknown origin
      * @return
      */
+    @Deprecated
     public static Actor actorFromString(String actorName) {
-        Player[] players = Bukkit.getServer().getOnlinePlayers();
-        for (Player p : players) {
-            if (p.getName().equalsIgnoreCase(actorName)) {
+        Player p = Bukkit.getServer().getPlayerExact(actorName);
+        if (p != null) {
             return actorFromEntity(p);
         }
-        }
         // No player found online with that name, assuming non-player entity/effect
         return new Actor(actorName);
     }

src/main/java/de/diddiz/LogBlock/AutoClearLog.java

@@ -17,8 +17,12 @@ public class AutoClearLog implements Runnable {
     public void run() {
         final CommandsHandler handler = logblock.getCommandsHandler();
         for (final String paramStr : autoClearLog) {
+            if (!logblock.isCompletelyEnabled()) {
+                return; // do not try when plugin is disabled
+            }
             try {
                 final QueryParams params = new QueryParams(logblock, getConsoleSender(), Arrays.asList(paramStr.split(" ")));
+                params.noForcedLimit = true;
                 handler.new CommandClearLog(getServer().getConsoleSender(), params, false);
             } catch (final Exception ex) {
                 getLogger().log(Level.SEVERE, "Failed to schedule auto ClearLog: ", ex);

src/main/java/de/diddiz/LogBlock/BlockChange.java

@@ -1,128 +1,272 @@
 package de.diddiz.LogBlock;
 
-import de.diddiz.LogBlock.config.Config;
-import de.diddiz.util.BukkitUtils;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import static de.diddiz.LogBlock.util.ActionColor.CREATE;
+import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
+import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
+import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyState;
+import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
 
+import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import de.diddiz.LogBlock.util.Utils;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import static de.diddiz.util.LoggingUtil.checkText;
-import static de.diddiz.util.MaterialName.materialName;
+import java.util.logging.Level;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Note;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Lightable;
+import org.bukkit.block.data.Openable;
+import org.bukkit.block.data.Powerable;
+import org.bukkit.block.data.Waterlogged;
+import org.bukkit.block.data.type.Candle;
+import org.bukkit.block.data.type.Comparator;
+import org.bukkit.block.data.type.DaylightDetector;
+import org.bukkit.block.data.type.Lectern;
+import org.bukkit.block.data.type.NoteBlock;
+import org.bukkit.block.data.type.Repeater;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.Switch;
+import org.bukkit.block.data.type.WallSign;
+import org.bukkit.inventory.ItemStack;
 
 public class BlockChange implements LookupCacheElement {
     public final long id, date;
     public final Location loc;
     public final Actor actor;
     public final String playerName;
-    public final int replaced, type;
-    public final byte data;
-    public final String signtext;
+    public final int replacedMaterial, replacedData, typeMaterial, typeData;
+    public final byte[] replacedState, typeState;
     public final ChestAccess ca;
 
-    public BlockChange(long date, Location loc, Actor actor, int replaced, int type, byte data, String signtext, ChestAccess ca) {
+    public BlockChange(long date, Location loc, Actor actor, int replaced, int replacedData, byte[] replacedState, int type, int typeData, byte[] typeState, ChestAccess ca) {
         id = 0;
         this.date = date;
         this.loc = loc;
         this.actor = actor;
-        this.replaced = replaced;
-        this.type = type;
-        this.data = data;
-        this.signtext = checkText(signtext);
+        this.replacedMaterial = replaced;
+        this.replacedData = replacedData;
+        this.replacedState = replacedState;
+        this.typeMaterial = type;
+        this.typeData = typeData;
+        this.typeState = typeState;
         this.ca = ca;
         this.playerName = actor == null ? null : actor.getName();
     }
 
     public BlockChange(ResultSet rs, QueryParams p) throws SQLException {
-        id = p.needId ? rs.getInt("id") : 0;
+        id = p.needId ? rs.getLong("id") : 0;
         date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
         loc = p.needCoords ? new Location(p.world, rs.getInt("x"), rs.getInt("y"), rs.getInt("z")) : null;
         actor = p.needPlayer ? new Actor(rs) : null;
         playerName = p.needPlayer ? rs.getString("playername") : null;
-        replaced = p.needType ? rs.getInt("replaced") : 0;
-        type = p.needType ? rs.getInt("type") : 0;
-        data = p.needData ? rs.getByte("data") : (byte) 0;
-        signtext = p.needSignText ? rs.getString("signtext") : null;
-        ca = p.needChestAccess && rs.getShort("itemtype") != 0 && rs.getShort("itemamount") != 0 ? new ChestAccess(rs.getShort("itemtype"), rs.getShort("itemamount"), rs.getShort("itemdata")) : null;
+        replacedMaterial = p.needType ? rs.getInt("replaced") : 0;
+        replacedData = p.needType ? rs.getInt("replacedData") : -1;
+        typeMaterial = p.needType ? rs.getInt("type") : 0;
+        typeData = p.needType ? rs.getInt("typeData") : -1;
+        replacedState = p.needType ? rs.getBytes("replacedState") : null;
+        typeState = p.needType ? rs.getBytes("typeState") : null;
+        ChestAccess catemp = null;
+        if (p.needChestAccess) {
+            ItemStack stack = Utils.loadItemStack(rs.getBytes("item"));
+            if (stack != null) {
+                catemp = new ChestAccess(stack, rs.getBoolean("itemremove"), rs.getInt("itemtype"));
+            }
+        }
+        ca = catemp;
+    }
+
+    private BaseComponent getTypeDetails(BlockData type, byte[] typeState) {
+        return getTypeDetails(type, typeState, null, null);
+    }
+
+    private BaseComponent getTypeDetails(BlockData type, byte[] typeState, BlockData oldType, byte[] oldTypeState) {
+        BaseComponent typeDetails = null;
+
+        if (BlockStateCodecs.hasCodec(type.getMaterial())) {
+            try {
+                typeDetails = BlockStateCodecs.getChangesAsComponent(type.getMaterial(), Utils.deserializeYamlConfiguration(typeState), type.equals(oldType) ? Utils.deserializeYamlConfiguration(oldTypeState) : null);
+            } catch (Exception e) {
+                LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not parse BlockState for " + type.getMaterial(), e);
+            }
+        }
+
+        if (typeDetails == null) {
+            return new TextComponent("");
+        } else {
+            TextComponent component = new TextComponent(" ");
+            component.addExtra(typeDetails);
+            return component;
+        }
     }
 
     @Override
     public String toString() {
-        final StringBuilder msg = new StringBuilder();
+        return BaseComponent.toPlainText(getLogMessage(-1));
+    }
+
+    @Override
+    public BaseComponent[] getLogMessage(int entry) {
+        TextComponent msg = new TextComponent();
         if (date > 0) {
-            msg.append(Config.formatter.format(date)).append(" ");
+            msg.addExtra(prettyDate(date));
+            msg.addExtra(" ");
         }
         if (actor != null) {
-            msg.append(actor.getName()).append(" ");
+            msg.addExtra(actor.getName());
+            msg.addExtra(" ");
         }
-        if (signtext != null) {
-            final String action = type == 0 ? "destroyed " : "created ";
-            if (!signtext.contains("\0")) {
-                msg.append(action).append(signtext);
-            } else {
-                msg.append(action).append(materialName(type != 0 ? type : replaced)).append(" [").append(signtext.replace("\0", "] [")).append("]");
+        BlockData type = getBlockSet();
+        BlockData replaced = getBlockReplaced();
+        if (type == null || replaced == null) {
+            msg.addExtra("did an unknown block modification");
+            return new BaseComponent[] { msg };
         }
-        } else if (type == replaced) {
-            if (type == 0) {
-                msg.append("did an unspecified action");
+
+        // Process type details once for later use.
+        BaseComponent typeDetails = getTypeDetails(type, typeState, replaced, replacedState);
+        BaseComponent replacedDetails = getTypeDetails(replaced, replacedState);
+
+        if (type.getMaterial().equals(replaced.getMaterial()) || (type.getMaterial() == Material.CAKE && BukkitUtils.isCandleCake(replaced.getMaterial()))) {
+            if (BukkitUtils.isEmpty(type.getMaterial())) {
+                msg.addExtra(createTextComponentWithColor("did an unspecified action", INTERACT.getColor()));
             } else if (ca != null) {
-                if (ca.itemType == 0 || ca.itemAmount == 0) {
-                    msg.append("looked inside ").append(materialName(type));
-                } else if (ca.itemAmount < 0) {
-                    msg.append("took ").append(-ca.itemAmount).append("x ").append(materialName(ca.itemType, ca.itemData)).append(" from ").append(materialName(type));
+                if (ca.itemStack == null) {
+                    msg.addExtra(createTextComponentWithColor("looked inside ", INTERACT.getColor()));
+                    msg.addExtra(prettyMaterial(type));
+                } else if (ca.remove) {
+                    msg.addExtra(createTextComponentWithColor("took ", DESTROY.getColor()));
+                    msg.addExtra(BukkitUtils.toString(ca.itemStack));
+                    msg.addExtra(createTextComponentWithColor(" from ", DESTROY.getColor()));
+                    msg.addExtra(prettyMaterial(type));
                 } else {
-                    msg.append("put ").append(ca.itemAmount).append("x ").append(materialName(ca.itemType, ca.itemData)).append(" into ").append(materialName(type));
+                    msg.addExtra(createTextComponentWithColor("put ", CREATE.getColor()));
+                    msg.addExtra(BukkitUtils.toString(ca.itemStack));
+                    msg.addExtra(createTextComponentWithColor(" into ", CREATE.getColor()));
+                    msg.addExtra(prettyMaterial(type));
                 }
-            } else if (BukkitUtils.getContainerBlocks().contains(Material.getMaterial(type))) {
-                msg.append("opened ").append(materialName(type));
-            } else if (type == 64 || type == 71)
-            // This is a problem that will have to be addressed in LB 2,
-            // there is no way to tell from the top half of the block if
-            // the door is opened or closed.
-            {
-                msg.append("moved ").append(materialName(type));
-            }
-            // Trapdoor
-            else if (type == 96) {
-                msg.append((data < 8 || data > 11) ? "opened" : "closed").append(" ").append(materialName(type));
-            }
-            // Fence gate
-            else if (type == 107) {
-                msg.append(data > 3 ? "opened" : "closed").append(" ").append(materialName(type));
-            } else if (type == 69) {
-                msg.append("switched ").append(materialName(type));
-            } else if (type == 77 || type == 143) {
-                msg.append("pressed ").append(materialName(type));
-            } else if (type == 92) {
-                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) {
-            msg.append("created ").append(materialName(type, data));
+            } else if (type instanceof Waterlogged && ((Waterlogged) type).isWaterlogged() != ((Waterlogged) replaced).isWaterlogged()) {
+                if (((Waterlogged) type).isWaterlogged()) {
+                    msg.addExtra(createTextComponentWithColor("waterlogged ", CREATE.getColor()));
+                    msg.addExtra(prettyMaterial(type));
                 } else {
-            msg.append("replaced ").append(materialName(replaced, (byte) 0)).append(" with ").append(materialName(type, data));
+                    msg.addExtra(createTextComponentWithColor("dried ", DESTROY.getColor()));
+                    msg.addExtra(prettyMaterial(type));
+                }
+            } else if (BukkitUtils.isContainerBlock(type.getMaterial())) {
+                msg.addExtra(createTextComponentWithColor("opened ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type instanceof Openable && ((Openable) type).isOpen() != ((Openable) replaced).isOpen()) {
+                // Door, Trapdoor, Fence gate
+                msg.addExtra(createTextComponentWithColor(((Openable) type).isOpen() ? "opened " : "closed ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type.getMaterial() == Material.LEVER && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
+                msg.addExtra(createTextComponentWithColor("switched ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(prettyState(((Switch) type).isPowered() ? " on" : " off"));
+            } else if (type instanceof Switch && ((Switch) type).isPowered() != ((Switch) replaced).isPowered()) {
+                msg.addExtra(createTextComponentWithColor("pressed ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type.getMaterial() == Material.CAKE) {
+                msg.addExtra(createTextComponentWithColor("ate a piece of ", DESTROY.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type.getMaterial() == Material.NOTE_BLOCK) {
+                Note note = ((NoteBlock) type).getNote();
+                msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(" to ");
+                msg.addExtra(prettyState(note.getTone().name() + (note.isSharped() ? "#" : "")));
+            } else if (type.getMaterial() == Material.REPEATER) {
+                msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(" to ");
+                msg.addExtra(prettyState(((Repeater) type).getDelay()));
+                msg.addExtra(createTextComponentWithColor(" ticks delay", DEFAULT.getColor()));
+            } else if (type.getMaterial() == Material.COMPARATOR) {
+                msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(" to ");
+                msg.addExtra(prettyState(((Comparator) type).getMode()));
+            } else if (type.getMaterial() == Material.DAYLIGHT_DETECTOR) {
+                msg.addExtra(createTextComponentWithColor("set ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(" to ");
+                msg.addExtra(prettyState(((DaylightDetector) type).isInverted() ? "inverted" : "normal"));
+            } else if (type instanceof Lectern) {
+                msg.addExtra(createTextComponentWithColor("changed the book on a ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(" to");
+                msg.addExtra(prettyState(typeDetails));
+            } else if (type instanceof Powerable) {
+                msg.addExtra(createTextComponentWithColor("stepped on ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type.getMaterial() == Material.TRIPWIRE) {
+                msg.addExtra(createTextComponentWithColor("ran into ", INTERACT.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if (type instanceof Sign || type instanceof WallSign) {
+                msg.addExtra(createTextComponentWithColor("edited a ", CREATE.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(createTextComponentWithColor(" to", CREATE.getColor()));
+                msg.addExtra(prettyState(typeDetails));
+            } else if (type instanceof Candle && ((Candle) type).getCandles() != ((Candle) replaced).getCandles()) {
+                msg.addExtra(createTextComponentWithColor("added a candle to ", CREATE.getColor()));
+                msg.addExtra(prettyMaterial(type));
+            } else if ((type instanceof Candle || BukkitUtils.isCandleCake(type.getMaterial())) && ((Lightable) type).isLit() != ((Lightable) replaced).isLit()) {
+                if (((Lightable) type).isLit()) {
+                    msg.addExtra(createTextComponentWithColor("lit a ", CREATE.getColor()));
+                    msg.addExtra(prettyMaterial(type));
+                } else {
+                    msg.addExtra(createTextComponentWithColor("extinguished a ", CREATE.getColor()));
+                    msg.addExtra(prettyMaterial(type));
+                }
+            } else {
+                msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
+                msg.addExtra(prettyMaterial(replaced));
+                msg.addExtra(prettyState(replacedDetails));
+                msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
+                msg.addExtra(prettyMaterial(type));
+                msg.addExtra(prettyState(typeDetails));
+            }
+        } else if (BukkitUtils.isEmpty(type.getMaterial())) {
+            msg.addExtra(createTextComponentWithColor("destroyed ", DESTROY.getColor()));
+            msg.addExtra(prettyMaterial(replaced));
+            msg.addExtra(prettyState(replacedDetails));
+        } else if (BukkitUtils.isEmpty(replaced.getMaterial())) {
+            msg.addExtra(createTextComponentWithColor("created ", CREATE.getColor()));
+            msg.addExtra(prettyMaterial(type));
+            msg.addExtra(prettyState(typeDetails));
+        } else {
+            msg.addExtra(createTextComponentWithColor("replaced ", CREATE.getColor()));
+            msg.addExtra(prettyMaterial(replaced));
+            msg.addExtra(prettyState(replacedDetails));
+            msg.addExtra(createTextComponentWithColor(" with ", CREATE.getColor()));
+            msg.addExtra(prettyMaterial(type));
+            msg.addExtra(prettyState(typeDetails));
         }
         if (loc != null) {
-            msg.append(" at ").append(loc.getBlockX()).append(":").append(loc.getBlockY()).append(":").append(loc.getBlockZ());
+            msg.addExtra(" at ");
+            msg.addExtra(prettyLocation(loc, entry));
         }
-        return msg.toString();
+        return new BaseComponent[] { msg };
+    }
+
+    public BlockData getBlockReplaced() {
+        return MaterialConverter.getBlockData(replacedMaterial, replacedData);
+    }
+
+    public BlockData getBlockSet() {
+        return MaterialConverter.getBlockData(typeMaterial, typeData);
     }
 
     @Override
     public Location getLocation() {
         return loc;
     }
-
-    @Override
-    public String getMessage() {
-        return toString();
-    }
 }

src/main/java/de/diddiz/LogBlock/ChatMessage.java

@@ -1,11 +1,16 @@
 package de.diddiz.LogBlock;
 
-import org.bukkit.Location;
+import static de.diddiz.LogBlock.util.LoggingUtil.checkText;
+import static de.diddiz.LogBlock.util.MessagingUtil.brackets;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
 
+import de.diddiz.LogBlock.util.MessagingUtil;
+import de.diddiz.LogBlock.util.MessagingUtil.BracketType;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import static de.diddiz.util.LoggingUtil.checkText;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
 
 public class ChatMessage implements LookupCacheElement {
     final long id, date;
@@ -21,7 +26,7 @@ public class ChatMessage implements LookupCacheElement {
     }
 
     public ChatMessage(ResultSet rs, QueryParams p) throws SQLException {
-        id = p.needId ? rs.getInt("id") : 0;
+        id = p.needId ? rs.getLong("id") : 0;
         date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
         player = p.needPlayer ? new Actor(rs) : null;
         playerName = p.needPlayer ? rs.getString("playername") : null;
@@ -34,7 +39,21 @@ public class ChatMessage implements LookupCacheElement {
     }
 
     @Override
-    public String getMessage() {
-        return (player != null ? "<" + player.getName() + "> " : "") + (message != null ? message : "");
+    public BaseComponent[] getLogMessage(int entry) {
+        TextComponent msg = new TextComponent();
+        if (date > 0) {
+            msg.addExtra(prettyDate(date));
+            msg.addExtra(" ");
+        }
+        if (playerName != null) {
+            msg.addExtra(brackets(BracketType.ANGLE, MessagingUtil.createTextComponentWithColor(playerName, net.md_5.bungee.api.ChatColor.WHITE)));
+            msg.addExtra(" ");
+        }
+        if (message != null) {
+            for (BaseComponent messageComponent : TextComponent.fromLegacyText(message)) {
+                msg.addExtra(messageComponent);
+            }
+        }
+        return new BaseComponent[] { msg };
     }
 }

src/main/java/de/diddiz/LogBlock/ChestAccess.java

@@ -1,11 +1,15 @@
 package de.diddiz.LogBlock;
 
-public class ChestAccess {
-    final short itemType, itemAmount, itemData;
+import org.bukkit.inventory.ItemStack;
 
-    public ChestAccess(short itemType, short itemAmount, short itemData) {
+public class ChestAccess {
+    public final ItemStack itemStack;
+    public final boolean remove;
+    public final int itemType;
+
+    public ChestAccess(ItemStack itemStack, boolean remove, int itemType) {
+        this.itemStack = itemStack;
+        this.remove = remove;
         this.itemType = itemType;
-        this.itemAmount = itemAmount;
-        this.itemData = itemData >= 0 ? itemData : 0;
     }
 }

src/main/java/de/diddiz/LogBlock/CommandsHandler.java

@@ -1,25 +1,40 @@
 package de.diddiz.LogBlock;
 
+import static de.diddiz.LogBlock.Session.getSession;
+import static de.diddiz.LogBlock.config.Config.askClearLogAfterRollback;
+import static de.diddiz.LogBlock.config.Config.askClearLogs;
+import static de.diddiz.LogBlock.config.Config.askRedos;
+import static de.diddiz.LogBlock.config.Config.askRollbacks;
+import static de.diddiz.LogBlock.config.Config.defaultTime;
+import static de.diddiz.LogBlock.config.Config.dumpDeletedLog;
+import static de.diddiz.LogBlock.config.Config.getWorldConfig;
+import static de.diddiz.LogBlock.config.Config.linesLimit;
+import static de.diddiz.LogBlock.config.Config.linesPerPage;
+import static de.diddiz.LogBlock.config.Config.rollbackMaxArea;
+import static de.diddiz.LogBlock.config.Config.rollbackMaxTime;
+import static de.diddiz.LogBlock.config.Config.toolsByName;
+import static de.diddiz.LogBlock.config.Config.toolsByType;
+import static de.diddiz.LogBlock.util.BukkitUtils.giveTool;
+import static de.diddiz.LogBlock.util.BukkitUtils.safeSpawnHeight;
+import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
+import static de.diddiz.LogBlock.util.TypeColor.ERROR;
+import static de.diddiz.LogBlock.util.TypeColor.HEADER;
+import static de.diddiz.LogBlock.util.Utils.isInt;
+import static de.diddiz.LogBlock.util.Utils.listing;
+
 import de.diddiz.LogBlock.QueryParams.BlockChangeType;
 import de.diddiz.LogBlock.QueryParams.Order;
 import de.diddiz.LogBlock.QueryParams.SummarizationMode;
 import de.diddiz.LogBlock.config.Config;
 import de.diddiz.LogBlock.config.WorldConfig;
-import de.diddiz.LogBlockQuestioner.LogBlockQuestioner;
-import de.diddiz.util.Block;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitScheduler;
-
-import java.io.Closeable;
+import de.diddiz.LogBlock.util.MessagingUtil;
+import de.diddiz.LogBlock.util.Utils;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileWriter;
+import java.io.OutputStreamWriter;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -29,78 +44,105 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
-
-import static de.diddiz.LogBlock.Session.getSession;
-import static de.diddiz.LogBlock.config.Config.*;
-import static de.diddiz.util.BukkitUtils.giveTool;
-import static de.diddiz.util.BukkitUtils.saveSpawnHeight;
-import static de.diddiz.util.Utils.isInt;
-import static de.diddiz.util.Utils.listing;
-import static org.bukkit.Bukkit.getLogger;
-import static org.bukkit.Bukkit.getServer;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitScheduler;
 
 public class CommandsHandler implements CommandExecutor {
     private final LogBlock logblock;
     private final BukkitScheduler scheduler;
-    private final LogBlockQuestioner questioner;
 
     CommandsHandler(LogBlock logblock) {
         this.logblock = logblock;
         scheduler = logblock.getServer().getScheduler();
-        questioner = (LogBlockQuestioner) logblock.getServer().getPluginManager().getPlugin("LogBlockQuestioner");
     }
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
         try {
             if (args.length == 0) {
-                sender.sendMessage(ChatColor.LIGHT_PURPLE + "LogBlock v" + logblock.getDescription().getVersion() + " by DiddiZ");
-                sender.sendMessage(ChatColor.LIGHT_PURPLE + "Type /lb help for help");
+                sender.sendMessage(ChatColor.YELLOW + "------------------[ " + ChatColor.WHITE + "LogBlock" + ChatColor.YELLOW + " ]-------------------");
+                sender.sendMessage(ChatColor.GOLD + "LogBlock " + ChatColor.WHITE + "v" + logblock.getDescription().getVersion() + ChatColor.GOLD + " by DiddiZ");
+                TextComponent message = MessagingUtil.createTextComponentWithColor("Type ", net.md_5.bungee.api.ChatColor.GOLD);
+                TextComponent clickable = MessagingUtil.createTextComponentWithColor("/lb help", net.md_5.bungee.api.ChatColor.WHITE);
+                clickable.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb help"));
+                message.addExtra(clickable);
+                message.addExtra(" for help");
+                sender.spigot().sendMessage(message);
             } else {
                 final String command = args[0].toLowerCase();
                 if (command.equals("help")) {
-                    sender.sendMessage(ChatColor.DARK_AQUA + "LogBlock Help:");
-                    sender.sendMessage(ChatColor.GOLD + "For the commands list type '/lb commands'");
-                    sender.sendMessage(ChatColor.GOLD + "For the parameters list type '/lb params'");
-                    sender.sendMessage(ChatColor.GOLD + "For the list of permissions you got type '/lb permissions'");
+                    sender.sendMessage(ChatColor.YELLOW + "----------------[ " + ChatColor.WHITE + "LogBlock Help" + ChatColor.YELLOW + " ]----------------");
+
+                    TextComponent message = MessagingUtil.createTextComponentWithColor("For the commands list type ", net.md_5.bungee.api.ChatColor.GOLD);
+                    TextComponent clickable = MessagingUtil.createTextComponentWithColor("/lb commands", net.md_5.bungee.api.ChatColor.WHITE);
+                    clickable.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb commands"));
+                    message.addExtra(clickable);
+                    sender.spigot().sendMessage(message);
+
+                    message = MessagingUtil.createTextComponentWithColor("For the parameters list type ", net.md_5.bungee.api.ChatColor.GOLD);
+                    clickable = MessagingUtil.createTextComponentWithColor("/lb params", net.md_5.bungee.api.ChatColor.WHITE);
+                    clickable.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb params"));
+                    message.addExtra(clickable);
+                    sender.spigot().sendMessage(message);
+
+                    message = MessagingUtil.createTextComponentWithColor("For the list of permissions you got type ", net.md_5.bungee.api.ChatColor.GOLD);
+                    clickable = MessagingUtil.createTextComponentWithColor("/lb permissions", net.md_5.bungee.api.ChatColor.WHITE);
+                    clickable.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb permissions"));
+                    message.addExtra(clickable);
+                    sender.spigot().sendMessage(message);
                 } else if (command.equals("commands")) {
-                    sender.sendMessage(ChatColor.DARK_AQUA + "LogBlock Commands:");
-                    sender.sendMessage(ChatColor.GOLD + "/lb tool -- Gives you the lb tool");
-                    sender.sendMessage(ChatColor.GOLD + "/lb tool [on|off] -- Enables/Disables tool");
-                    sender.sendMessage(ChatColor.GOLD + "/lb tool [params] -- Sets the tool lookup query");
-                    sender.sendMessage(ChatColor.GOLD + "/lb tool default -- Sets the tool lookup query to default");
-                    sender.sendMessage(ChatColor.GOLD + "/lb toolblock -- Analog to tool");
-                    sender.sendMessage(ChatColor.GOLD + "/lb hide -- Hides you from log");
-                    sender.sendMessage(ChatColor.GOLD + "/lb rollback [params] -- Rollback");
-                    sender.sendMessage(ChatColor.GOLD + "/lb redo [params] -- Redo");
-                    sender.sendMessage(ChatColor.GOLD + "/lb tp [params] -- Teleports you to the location of griefing");
-                    sender.sendMessage(ChatColor.GOLD + "/lb writelogfile [params] -- Writes a log file");
-                    sender.sendMessage(ChatColor.GOLD + "/lb lookup [params] -- Lookup");
-                    sender.sendMessage(ChatColor.GOLD + "/lb prev|next -- Browse lookup result pages");
-                    sender.sendMessage(ChatColor.GOLD + "/lb page -- Shows a specific lookup result page");
-                    sender.sendMessage(ChatColor.GOLD + "/lb me -- Displays your stats");
-                    sender.sendMessage(ChatColor.GOLD + "Look at github.com/LogBlock/LogBlock/wiki/Commands for the full commands reference");
+                    sender.sendMessage(ChatColor.YELLOW + "--------------[ " + ChatColor.WHITE + "LogBlock Commands" + ChatColor.YELLOW + " ]--------------");
+                    sender.sendMessage(ChatColor.GOLD + "/lb tool " + ChatColor.WHITE + "-- Gives you the lb tool");
+                    sender.sendMessage(ChatColor.GOLD + "/lb tool [on|off] " + ChatColor.WHITE + "-- Enables/Disables tool");
+                    sender.sendMessage(ChatColor.GOLD + "/lb tool [params] " + ChatColor.WHITE + "-- Sets the tool lookup query");
+                    sender.sendMessage(ChatColor.GOLD + "/lb tool default " + ChatColor.WHITE + "-- Sets the tool lookup query to default");
+                    sender.sendMessage(ChatColor.GOLD + "/lb toolblock " + ChatColor.WHITE + "-- Analog to tool");
+                    sender.sendMessage(ChatColor.GOLD + "/lb hide " + ChatColor.WHITE + "-- Hides you from log");
+                    sender.sendMessage(ChatColor.GOLD + "/lb rollback [params] " + ChatColor.WHITE + "-- Rollback");
+                    sender.sendMessage(ChatColor.GOLD + "/lb redo [params] " + ChatColor.WHITE + "-- Redo");
+                    sender.sendMessage(ChatColor.GOLD + "/lb tp [params] " + ChatColor.WHITE + "-- Teleports you to the location of griefing");
+                    sender.sendMessage(ChatColor.GOLD + "/lb writelogfile [params] " + ChatColor.WHITE + "-- Writes a log file");
+                    sender.sendMessage(ChatColor.GOLD + "/lb lookup [params] " + ChatColor.WHITE + "-- Lookup");
+                    sender.sendMessage(ChatColor.GOLD + "/lb prev|next " + ChatColor.WHITE + "-- Browse lookup result pages");
+                    sender.sendMessage(ChatColor.GOLD + "/lb page " + ChatColor.WHITE + "-- Shows a specific lookup result page");
+                    sender.sendMessage(ChatColor.GOLD + "/lb me " + ChatColor.WHITE + "-- Displays your stats");
+                    sender.sendMessage("");
+                    sender.sendMessage(ChatColor.GOLD + "Look at " + ChatColor.WHITE + "github.com/LogBlock/LogBlock/wiki/Commands" + ChatColor.GOLD + " for the full commands reference");
                 } else if (command.equals("params")) {
-                    sender.sendMessage(ChatColor.DARK_AQUA + "LogBlock Query Parameters:");
+                    sender.sendMessage(ChatColor.YELLOW + "----------[ " + ChatColor.WHITE + "LogBlock Query Parameters" + ChatColor.YELLOW + " ]----------");
                     sender.sendMessage(ChatColor.GOLD + "Use doublequotes to escape a keyword: world \"world\"");
-                    sender.sendMessage(ChatColor.GOLD + "player [name1] <name2> <name3> -- List of players");
-                    sender.sendMessage(ChatColor.GOLD + "block [type1] <type2> <type3> -- List of block types");
-                    sender.sendMessage(ChatColor.GOLD + "created, destroyed -- Show only created/destroyed blocks");
-                    sender.sendMessage(ChatColor.GOLD + "chestaccess -- Show only chest accesses");
-                    sender.sendMessage(ChatColor.GOLD + "area <radius> -- Area around you");
-                    sender.sendMessage(ChatColor.GOLD + "selection, sel -- Inside current WorldEdit selection");
-                    sender.sendMessage(ChatColor.GOLD + "world [worldname] -- Changes the world");
-                    sender.sendMessage(ChatColor.GOLD + "time [number] [minutes|hours|days] -- Limits time");
-                    sender.sendMessage(ChatColor.GOLD + "since <dd.MM.yyyy> <HH:mm:ss> -- Limits time to a fixed point");
-                    sender.sendMessage(ChatColor.GOLD + "before <dd.MM.yyyy> <HH:mm:ss> -- Affects only blocks before a fixed time");
-                    sender.sendMessage(ChatColor.GOLD + "limit <row count> -- Limits the result to count of rows");
-                    sender.sendMessage(ChatColor.GOLD + "sum [none|blocks|players] -- Sums the result");
-                    sender.sendMessage(ChatColor.GOLD + "asc, desc -- Changes the order of the displayed log");
-                    sender.sendMessage(ChatColor.GOLD + "coords -- Shows coordinates for each block");
-                    sender.sendMessage(ChatColor.GOLD + "silent -- Displays lesser messages");
+                    sender.sendMessage(ChatColor.GOLD + "player [name1] <name2> <name3> " + ChatColor.WHITE + "-- List of players");
+                    sender.sendMessage(ChatColor.GOLD + "block [type1] <type2> <type3> " + ChatColor.WHITE + "-- List of block types");
+                    sender.sendMessage(ChatColor.GOLD + "created, destroyed " + ChatColor.WHITE + "-- Show only created/destroyed blocks");
+                    sender.sendMessage(ChatColor.GOLD + "chestaccess " + ChatColor.WHITE + "-- Show only chest accesses");
+                    sender.sendMessage(ChatColor.GOLD + "entities [type1] <type2> <type3> " + ChatColor.WHITE + "-- List of entity types; can not be combined with blocks");
+                    sender.sendMessage(ChatColor.GOLD + "area <radius> " + ChatColor.WHITE + "-- Area around you");
+                    sender.sendMessage(ChatColor.GOLD + "selection, sel " + ChatColor.WHITE + "-- Inside current WorldEdit selection");
+                    sender.sendMessage(ChatColor.GOLD + "world [worldname] " + ChatColor.WHITE + "-- Changes the world");
+                    sender.sendMessage(ChatColor.GOLD + "time [number] [minutes|hours|days] " + ChatColor.WHITE + "-- Limits time");
+                    sender.sendMessage(ChatColor.GOLD + "since <dd.MM.yyyy> <HH:mm:ss> " + ChatColor.WHITE + "-- Limits time to a fixed point");
+                    sender.sendMessage(ChatColor.GOLD + "before <dd.MM.yyyy> <HH:mm:ss> " + ChatColor.WHITE + "-- Affects only blocks before a fixed time");
+                    sender.sendMessage(ChatColor.GOLD + "force " + ChatColor.WHITE + "-- Forces replacing not matching blocks");
+                    sender.sendMessage(ChatColor.GOLD + "limit <row count> " + ChatColor.WHITE + "-- Limits the result to count of rows");
+                    sender.sendMessage(ChatColor.GOLD + "sum [none|blocks|players] " + ChatColor.WHITE + "-- Sums the result");
+                    sender.sendMessage(ChatColor.GOLD + "asc, desc " + ChatColor.WHITE + "-- Changes the order of the displayed log");
+                    sender.sendMessage(ChatColor.GOLD + "coords " + ChatColor.WHITE + "-- Shows coordinates for each block");
+                    sender.sendMessage(ChatColor.GOLD + "nocache " + ChatColor.WHITE + "-- Don't set the lookup cache");
+                    sender.sendMessage(ChatColor.GOLD + "silent " + ChatColor.WHITE + "-- Displays lesser messages");
                 } else if (command.equals("permissions")) {
                     sender.sendMessage(ChatColor.DARK_AQUA + "You've got the following permissions:");
-                    for (final String permission : new String[]{"me", "lookup", "tp", "rollback", "clearlog", "hide", "ignoreRestrictions", "spawnTools"}) {
+                    for (final String permission : new String[] { "me", "lookup", "tp", "rollback", "clearlog", "hide", "ignoreRestrictions", "spawnTools" }) {
                         if (logblock.hasPermission(sender, "logblock." + permission)) {
                             sender.sendMessage(ChatColor.GOLD + "logblock." + permission);
                         }
@@ -114,7 +156,7 @@ public class CommandsHandler implements CommandExecutor {
                     if (logblock.hasPermission(sender, "logblock.lookup")) {
                         World world = null;
                         if (args.length > 1) {
-                            world = getServer().getWorld(args[1]);
+                            world = logblock.getServer().getWorld(args[1]);
                         } else if (sender instanceof Player) {
                             world = ((Player) sender).getWorld();
                         }
@@ -122,7 +164,7 @@ public class CommandsHandler implements CommandExecutor {
                             final WorldConfig wcfg = getWorldConfig(world.getName());
                             if (wcfg != null) {
                                 sender.sendMessage(ChatColor.DARK_AQUA + "Currently logging in " + world.getName() + ":");
-                                final List<String> logging = new ArrayList<String>();
+                                final List<String> logging = new ArrayList<>();
                                 for (final Logging l : Logging.values()) {
                                     if (wcfg.isLogging(l)) {
                                         logging.add(l.toString());
@@ -144,12 +186,12 @@ public class CommandsHandler implements CommandExecutor {
                     if (logblock.hasPermission(sender, "logblock.tools." + tool.name)) {
                         if (sender instanceof Player) {
                             final Player player = (Player) sender;
-                            final Session session = Session.getSession(player.getName());
+                            final Session session = Session.getSession(player);
                             final ToolData toolData = session.toolData.get(tool);
                             if (args.length == 1) {
                                 if (logblock.hasPermission(player, "logblock.spawnTools")) {
                                     giveTool(player, tool.item);
-                                    session.toolData.get(tool).enabled = true;
+                                    toolData.enabled = true;
                                 } else {
                                     sender.sendMessage(ChatColor.RED + "You aren't allowed to do this.");
                                 }
@@ -158,7 +200,20 @@ public class CommandsHandler implements CommandExecutor {
                                 player.sendMessage(ChatColor.GREEN + "Tool enabled.");
                             } else if (args[1].equalsIgnoreCase("disable") || args[1].equalsIgnoreCase("off")) {
                                 toolData.enabled = false;
-                                player.getInventory().removeItem(new ItemStack(tool.item, 1));
+                                if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
+                                    if (!player.getInventory().removeItem(new ItemStack(tool.item, 1)).isEmpty()) {
+                                        // remove the tool from the offhand if it cannot be found in the main hand
+                                        ItemStack offhandItem = player.getInventory().getItemInOffHand();
+                                        if (offhandItem != null && offhandItem.isSimilar(new ItemStack(tool.item, 1))) {
+                                            if (offhandItem.getAmount() <= 1) {
+                                                player.getInventory().setItemInOffHand(null);
+                                            } else {
+                                                offhandItem.setAmount(offhandItem.getAmount() - 1);
+                                                player.getInventory().setItemInOffHand(offhandItem);
+                                            }
+                                        }
+                                    }
+                                }
                                 player.sendMessage(ChatColor.GREEN + "Tool disabled.");
                             } else if (args[1].equalsIgnoreCase("mode")) {
                                 if (args.length == 3) {
@@ -226,13 +281,16 @@ public class CommandsHandler implements CommandExecutor {
                     }
                 } else if (command.equals("page")) {
                     if (args.length == 2 && isInt(args[1])) {
+                        sender.sendMessage("");
                         showPage(sender, Integer.valueOf(args[1]));
                     } else {
                         sender.sendMessage(ChatColor.RED + "You have to specify a page");
                     }
                 } else if (command.equals("next") || command.equals("+")) {
+                    sender.sendMessage("");
                     showPage(sender, getSession(sender).page + 1);
                 } else if (command.equals("prev") || command.equals("-")) {
+                    sender.sendMessage("");
                     showPage(sender, getSession(sender).page - 1);
                 } else if (args[0].equalsIgnoreCase("savequeue")) {
                     if (logblock.hasPermission(sender, "logblock.rollback")) {
@@ -274,7 +332,6 @@ public class CommandsHandler implements CommandExecutor {
                                 final QueryParams params = new QueryParams(logblock);
                                 params.setPlayer(player.getName());
                                 params.world = player.getWorld();
-                                player.sendMessage("Total block changes: " + logblock.getCount(params));
                                 params.sum = SummarizationMode.TYPES;
                                 new CommandLookup(sender, params, true);
                             } else {
@@ -298,9 +355,10 @@ public class CommandsHandler implements CommandExecutor {
                     }
                 } else if (command.equals("clearlog")) {
                     if (logblock.hasPermission(sender, "logblock.clearlog")) {
-                        final QueryParams params = new QueryParams(logblock, sender, argsToList(args, 1));
-                        params.bct = BlockChangeType.ALL;
+                        final QueryParams params = new QueryParams(logblock);
                         params.limit = -1;
+                        params.bct = BlockChangeType.ALL;
+                        params.parseArgs(sender, argsToList(args, 1));
                         new CommandClearLog(sender, params, true);
                     } else {
                         sender.sendMessage(ChatColor.RED + "You aren't allowed to do this");
@@ -316,7 +374,7 @@ public class CommandsHandler implements CommandExecutor {
                                     if (pos >= 0 && pos < session.lookupCache.length) {
                                         final Location loc = session.lookupCache[pos].getLocation();
                                         if (loc != null) {
-                                            player.teleport(new Location(loc.getWorld(), loc.getX() + 0.5, saveSpawnHeight(loc), loc.getZ() + 0.5, player.getLocation().getYaw(), 90));
+                                            player.teleport(new Location(loc.getWorld(), loc.getX() + 0.5, player.getGameMode() != GameMode.SPECTATOR ? safeSpawnHeight(loc) : loc.getY(), loc.getZ() + 0.5, player.getLocation().getYaw(), 90));
                                             player.sendMessage(ChatColor.LIGHT_PURPLE + "Teleported to " + loc.getBlockX() + ":" + loc.getBlockY() + ":" + loc.getBlockZ());
                                         } else {
                                             sender.sendMessage(ChatColor.RED + "There is no location associated with that. Did you forget coords parameter?");
@@ -338,11 +396,16 @@ public class CommandsHandler implements CommandExecutor {
                     }
                 } else if (command.equals("lookup") || QueryParams.isKeyWord(args[0])) {
                     if (logblock.hasPermission(sender, "logblock.lookup")) {
-                        final List<String> argsList = new ArrayList<String>(Arrays.asList(args));
+                        final List<String> argsList = new ArrayList<>(Arrays.asList(args));
                         if (command.equals("lookup")) {
                             argsList.remove(0);
                         }
-                        new CommandLookup(sender, new QueryParams(logblock, sender, argsList), true);
+                        final QueryParams params = new QueryParams(logblock);
+                        params.since = defaultTime;
+                        params.bct = BlockChangeType.ALL;
+                        params.limit = Config.linesLimit;
+                        params.parseArgs(sender, argsList);
+                        new CommandLookup(sender, params, true);
                     } else {
                         sender.sendMessage(ChatColor.RED + "You aren't allowed to do this");
                     }
@@ -356,30 +419,43 @@ public class CommandsHandler implements CommandExecutor {
             sender.sendMessage(ChatColor.RED + "Not enough arguments given");
         } catch (final Exception ex) {
             sender.sendMessage(ChatColor.RED + "Error, check server.log");
-            getLogger().log(Level.WARNING, "Exception in commands handler: ", ex);
+            logblock.getLogger().log(Level.WARNING, "Exception in commands handler: ", ex);
         }
         return true;
     }
 
     private static void showPage(CommandSender sender, int page) {
-        final Session session = getSession(sender);
-        if (session.lookupCache != null && session.lookupCache.length > 0) {
+        showPage(sender, page, getSession(sender).lookupCache, true);
+    }
+
+    private static void showPage(CommandSender sender, int page, LookupCacheElement[] lookupElements, boolean setSessionPage) {
+        if (lookupElements != null && lookupElements.length > 0) {
             final int startpos = (page - 1) * linesPerPage;
-            if (page > 0 && startpos <= session.lookupCache.length - 1) {
-                final int stoppos = startpos + linesPerPage >= session.lookupCache.length ? session.lookupCache.length - 1 : startpos + linesPerPage - 1;
-                final int numberOfPages = (int) Math.ceil(session.lookupCache.length / (double) linesPerPage);
+            if (page > 0 && startpos <= lookupElements.length - 1) {
+                final int stoppos = startpos + linesPerPage >= lookupElements.length ? lookupElements.length - 1 : startpos + linesPerPage - 1;
+                final int numberOfPages = (int) Math.ceil(lookupElements.length / (double) linesPerPage);
                 if (numberOfPages != 1) {
-                    sender.sendMessage(ChatColor.DARK_AQUA + "Page " + page + "/" + numberOfPages);
+                    sender.sendMessage(HEADER + "Page " + page + "/" + numberOfPages);
                 }
                 for (int i = startpos; i <= stoppos; i++) {
-                    sender.sendMessage(ChatColor.GOLD + (session.lookupCache[i].getLocation() != null ? "(" + (i + 1) + ") " : "") + session.lookupCache[i].getMessage());
+                    TextComponent message = new TextComponent();
+                    message.setColor(DEFAULT.getColor());
+                    if (lookupElements[i].getLocation() != null) {
+                        message.addExtra(new TextComponent("(" + (i + 1) + ") "));
                     }
-                session.page = page;
-            } else {
-                sender.sendMessage(ChatColor.RED + "There isn't a page '" + page + "'");
+                    for (BaseComponent component : lookupElements[i].getLogMessage(i + 1)) {
+                        message.addExtra(component);
+                    }
+                    sender.spigot().sendMessage(message);
+                }
+                if (setSessionPage) {
+                    getSession(sender).page = page;
                 }
             } else {
-            sender.sendMessage(ChatColor.RED + "No blocks in lookup cache");
+                sender.sendMessage(ERROR + "There isn't a page '" + page + "'");
+            }
+        } else {
+            sender.sendMessage(ERROR + "No blocks in lookup cache");
         }
     }
 
@@ -387,18 +463,18 @@ public class CommandsHandler implements CommandExecutor {
         if (sender.isOp() || logblock.hasPermission(sender, "logblock.ignoreRestrictions")) {
             return true;
         }
-        if (rollbackMaxTime > 0 && (params.before > 0 || params.since > rollbackMaxTime)) {
+        if (rollbackMaxTime > 0 && (params.since <= 0 || params.since > rollbackMaxTime)) {
             sender.sendMessage(ChatColor.RED + "You are not allowed to rollback more than " + rollbackMaxTime + " minutes");
             return false;
         }
-        if (rollbackMaxArea > 0 && (params.sel == null && params.loc == null || params.radius > rollbackMaxArea || params.sel != null && (params.sel.getSelection().getLength() > rollbackMaxArea || params.sel.getSelection().getWidth() > rollbackMaxArea))) {
+        if (rollbackMaxArea > 0 && (params.sel == null && params.loc == null || params.radius > rollbackMaxArea || params.sel != null && (params.sel.getSizeX() > rollbackMaxArea || params.sel.getSizeZ() > rollbackMaxArea))) {
             sender.sendMessage(ChatColor.RED + "You are not allowed to rollback an area larger than " + rollbackMaxArea + " blocks");
             return false;
         }
         return true;
     }
 
-    public abstract class AbstractCommand implements Runnable, Closeable {
+    public abstract class AbstractCommand implements Runnable {
         protected CommandSender sender;
         protected QueryParams params;
         protected Connection conn = null;
@@ -407,17 +483,14 @@ public class CommandsHandler implements CommandExecutor {
 
         protected AbstractCommand(CommandSender sender, QueryParams params, boolean async) throws Exception {
             this.sender = sender;
-            this.params = params;
+            this.params = params == null ? null : params.clone();
             if (async) {
-                if (scheduler.scheduleAsyncDelayedTask(logblock, this) == -1) {
-                    throw new Exception("Failed to schedule the command");
-                }
+                scheduler.runTaskAsynchronously(logblock, this);
             } else {
                 run();
             }
         }
 
-        @Override
         public final void close() {
             try {
                 if (conn != null) {
@@ -430,7 +503,9 @@ public class CommandsHandler implements CommandExecutor {
                     rs.close();
                 }
             } catch (final SQLException ex) {
-                getLogger().log(Level.SEVERE, "[CommandsHandler] SQL exception on close", ex);
+                if (logblock.isCompletelyEnabled()) {
+                    logblock.getLogger().log(Level.SEVERE, "[CommandsHandler] SQL exception on close", ex);
+                }
             }
         }
     }
@@ -458,9 +533,6 @@ public class CommandsHandler implements CommandExecutor {
                     params.needType = true;
                     params.needData = true;
                     params.needPlayer = true;
-                    if (params.types.isEmpty() || Block.inList(params.types, 63) || Block.inList(params.types, 68)) {
-                        params.needSignText = true;
-                    }
                     if (params.bct == BlockChangeType.CHESTACCESS || params.bct == BlockChangeType.ALL) {
                         params.needChestAccess = true;
                     }
@@ -472,33 +544,52 @@ public class CommandsHandler implements CommandExecutor {
                 }
                 state = conn.createStatement();
                 rs = executeQuery(state, params.getQuery());
+                sender.sendMessage("");
                 sender.sendMessage(ChatColor.DARK_AQUA + params.getTitle() + ":");
-                if (rs.next()) {
-                    rs.beforeFirst();
-                    final List<LookupCacheElement> blockchanges = new ArrayList<LookupCacheElement>();
+                final List<LookupCacheElement> blockchanges = new ArrayList<>();
                 final LookupCacheElementFactory factory = new LookupCacheElementFactory(params, sender instanceof Player ? 2 / 3f : 1);
                 while (rs.next()) {
                     blockchanges.add(factory.getLookupCacheElement(rs));
                 }
-                    getSession(sender).lookupCache = blockchanges.toArray(new LookupCacheElement[blockchanges.size()]);
+                if (!blockchanges.isEmpty()) {
+                    LookupCacheElement[] blockChangeArray = blockchanges.toArray(new LookupCacheElement[blockchanges.size()]);
+                    if (!params.noCache) {
+                        getSession(sender).lookupCache = blockChangeArray;
+                    }
+                    if (params.sum == SummarizationMode.NONE) {
                         if (blockchanges.size() > linesPerPage) {
                             sender.sendMessage(ChatColor.DARK_AQUA.toString() + blockchanges.size() + " changes found." + (blockchanges.size() == linesLimit ? " Use 'limit -1' to see all changes." : ""));
                         }
-                    if (params.sum != SummarizationMode.NONE) {
+                    } else {
+                        int totalChanges = 0;
+                        for (LookupCacheElement element : blockchanges) {
+                            totalChanges += element.getNumChanges();
+                        }
+                        sender.sendMessage(ChatColor.DARK_AQUA.toString() + totalChanges + " changes found.");
                         if (params.bct == BlockChangeType.KILLS && params.sum == SummarizationMode.PLAYERS) {
+                            sender.sendMessage(ChatColor.DARK_AQUA.toString() + blockchanges.size() + " distinct players found.");
                             sender.sendMessage(ChatColor.GOLD + "Kills - Killed - Player");
                         } else {
-                            sender.sendMessage(ChatColor.GOLD + "Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? "Block" : "Player"));
+                            sender.sendMessage(ChatColor.DARK_AQUA.toString() + blockchanges.size() + " distinct " + (params.sum == SummarizationMode.TYPES ? (params.bct == BlockChangeType.ENTITIES ? "entities" : "blocks") : "players") + " found.");
+                            sender.sendMessage(ChatColor.GOLD + "Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? (params.bct == BlockChangeType.ENTITIES ? "Entity" : "Block") : "Player"));
                         }
                     }
+                    if (!params.noCache) {
                         showPage(sender, 1);
+                    } else {
+                        showPage(sender, 1, blockChangeArray, false);
+                    }
                 } else {
                     sender.sendMessage(ChatColor.DARK_AQUA + "No results found.");
+                    if (!params.noCache) {
                         getSession(sender).lookupCache = null;
                     }
+                }
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[Lookup] " + params.getQuery() + ": ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[Lookup] " + params.getQuery() + ": ", ex);
+                }
             } finally {
                 close();
             }
@@ -523,9 +614,6 @@ public class CommandsHandler implements CommandExecutor {
                     params.needType = true;
                     params.needData = true;
                     params.needPlayer = true;
-                    if (params.types.isEmpty() || Block.inList(params.types, 63) || Block.inList(params.types, 68)) {
-                        params.needSignText = true;
-                    }
                     if (params.bct == BlockChangeType.CHESTACCESS || params.bct == BlockChangeType.ALL) {
                         params.needChestAccess = true;
                     }
@@ -536,7 +624,11 @@ public class CommandsHandler implements CommandExecutor {
                     return;
                 }
                 state = conn.createStatement();
-                file = new File("plugins/LogBlock/log/" + params.getTitle().replace(":", ".") + ".log");
+                final File dumpFolder = new File(logblock.getDataFolder(), "log");
+                if (!dumpFolder.exists()) {
+                    dumpFolder.mkdirs();
+                }
+                file = new File(dumpFolder, params.getTitle().replace(":", ".").replace("/", "_").replace("\\", "_") + ".log");
                 sender.sendMessage(ChatColor.GREEN + "Creating " + file.getName());
                 rs = executeQuery(state, params.getQuery());
                 file.getParentFile().mkdirs();
@@ -546,18 +638,20 @@ public class CommandsHandler implements CommandExecutor {
                 file.getParentFile().mkdirs();
                 int counter = 0;
                 if (params.sum != SummarizationMode.NONE) {
-                    writer.write("Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? "Block" : "Player") + newline);
+                    writer.write("Created - Destroyed - " + (params.sum == SummarizationMode.TYPES ? (params.bct == BlockChangeType.ENTITIES ? "Entity" : "Block") : "Player") + newline);
                 }
                 final LookupCacheElementFactory factory = new LookupCacheElementFactory(params, sender instanceof Player ? 2 / 3f : 1);
                 while (rs.next()) {
-                    writer.write(factory.getLookupCacheElement(rs).getMessage() + newline);
+                    writer.write(BaseComponent.toPlainText(factory.getLookupCacheElement(rs).getLogMessage()) + newline);
                     counter++;
                 }
                 writer.close();
                 sender.sendMessage(ChatColor.GREEN + "Wrote " + counter + " lines.");
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[WriteLogFile] " + params.getQuery() + " (file was " + file.getAbsolutePath() + "): ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[WriteLogFile] " + params.getQuery() + " (file was " + file.getAbsolutePath() + "): ", ex);
+                }
             } finally {
                 close();
             }
@@ -572,20 +666,7 @@ public class CommandsHandler implements CommandExecutor {
         @Override
         public void run() {
             final Consumer consumer = logblock.getConsumer();
-            if (consumer.getQueueSize() > 0) {
             sender.sendMessage(ChatColor.DARK_AQUA + "Current queue size: " + consumer.getQueueSize());
-                int lastSize = -1, fails = 0;
-                while (consumer.getQueueSize() > 0) {
-                    fails = lastSize == consumer.getQueueSize() ? fails + 1 : 0;
-                    if (fails > 10) {
-                        sender.sendMessage(ChatColor.RED + "Unable to save queue");
-                        return;
-                    }
-                    lastSize = consumer.getQueueSize();
-                    consumer.run();
-                }
-                sender.sendMessage(ChatColor.GREEN + "Queue saved successfully");
-            }
         }
     }
 
@@ -619,18 +700,22 @@ public class CommandsHandler implements CommandExecutor {
                     logblock.getServer().getScheduler().scheduleSyncDelayedTask(logblock, new Runnable() {
                         @Override
                         public void run() {
-                            final int y2 = saveSpawnHeight(loc);
+                            if (player.getGameMode() != GameMode.SPECTATOR) {
+                                final int y2 = safeSpawnHeight(loc);
                                 loc.setY(y2);
-                            player.teleport(loc);
                                 sender.sendMessage(ChatColor.GREEN + "You were teleported " + Math.abs(y2 - y) + " blocks " + (y2 - y > 0 ? "above" : "below"));
                             }
+                            player.teleport(loc);
+                        }
                     });
                 } else {
                     sender.sendMessage(ChatColor.RED + "No block change found to teleport to");
                 }
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[Teleport] " + params.getQuery() + ": ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[Teleport] " + params.getQuery() + ": ", ex);
+                }
             } finally {
                 close();
             }
@@ -645,12 +730,23 @@ public class CommandsHandler implements CommandExecutor {
         @Override
         public void run() {
             try {
+                if (params.bct == BlockChangeType.CHAT) {
+                    sender.sendMessage(ChatColor.RED + "Chat cannot be rolled back");
+                    return;
+                }
+                if (params.bct == BlockChangeType.KILLS) {
+                    sender.sendMessage(ChatColor.RED + "Kills cannot be rolled back");
+                    return;
+                }
+                if (params.sum != SummarizationMode.NONE) {
+                    sender.sendMessage(ChatColor.RED + "Cannot rollback summarized changes");
+                    return;
+                }
+                params.needDate = true;
                 params.needCoords = true;
                 params.needType = true;
                 params.needData = true;
-                params.needSignText = true;
                 params.needChestAccess = true;
-                params.order = Order.DESC;
                 params.sum = SummarizationMode.NONE;
                 conn = logblock.getConnection();
                 if (conn == null) {
@@ -661,24 +757,25 @@ public class CommandsHandler implements CommandExecutor {
                 if (!checkRestrictions(sender, params)) {
                     return;
                 }
-                if (logblock.getConsumer().getQueueSize() > 0) {
-                    new CommandSaveQueue(sender, null, false);
-                }
                 if (!params.silent) {
                     sender.sendMessage(ChatColor.DARK_AQUA + "Searching " + params.getTitle() + ":");
                 }
                 rs = executeQuery(state, params.getQuery());
-                final WorldEditor editor = new WorldEditor(logblock, params.world);
-
+                final WorldEditor editor = new WorldEditor(logblock, params.world, params.forceReplace);
+                WorldEditorEditFactory editFactory = new WorldEditorEditFactory(editor, params, true);
                 while (rs.next()) {
-                    editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("replaced"), rs.getInt("type"), rs.getByte("data"), rs.getString("signtext"), rs.getShort("itemtype"), rs.getShort("itemamount"), rs.getShort("itemdata"));
+                    editFactory.processRow(rs);
                 }
+                if (params.order == Order.DESC) {
+                    editor.reverseRowOrder();
+                }
+                editor.sortRows(Order.DESC);
                 final int changes = editor.getSize();
                 if (changes > 10000) {
                     editor.setSender(sender);
                 }
                 if (!params.silent) {
-                    sender.sendMessage(ChatColor.GREEN.toString() + changes + " blocks found.");
+                    sender.sendMessage(ChatColor.GREEN.toString() + changes + " " + (params.bct == BlockChangeType.ENTITIES ? "entities" : "blocks") + " found.");
                 }
                 if (changes == 0) {
                     if (!params.silent) {
@@ -686,16 +783,18 @@ public class CommandsHandler implements CommandExecutor {
                     }
                     return;
                 }
-                if (!params.silent && askRollbacks && questioner != null && sender instanceof Player && !questioner.ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
+                if (!params.silent && askRollbacks && sender instanceof Player && !logblock.getQuestioner().ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
                     sender.sendMessage(ChatColor.RED + "Rollback aborted");
                     return;
                 }
                 editor.start();
+                if (!params.noCache) {
                     getSession(sender).lookupCache = editor.errors;
+                }
                 sender.sendMessage(ChatColor.GREEN + "Rollback finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ", " + ChatColor.RED + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
-                if (!params.silent && askClearLogAfterRollback && logblock.hasPermission(sender, "logblock.clearlog") && questioner != null && sender instanceof Player) {
+                if (!params.silent && askClearLogAfterRollback && logblock.hasPermission(sender, "logblock.clearlog") && sender instanceof Player) {
                     Thread.sleep(1000);
-                    if (questioner.ask((Player) sender, "Do you want to delete the rollbacked log?", "yes", "no").equals("yes")) {
+                    if (logblock.getQuestioner().ask((Player) sender, "Do you want to delete the rollbacked log?", "yes", "no").equals("yes")) {
                         params.silent = true;
                         new CommandClearLog(sender, params, false);
                     } else {
@@ -703,8 +802,10 @@ public class CommandsHandler implements CommandExecutor {
                     }
                 }
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[Rollback] " + params.getQuery() + ": ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[Rollback] " + params.getQuery() + ": ", ex);
+                }
             } finally {
                 close();
             }
@@ -719,12 +820,23 @@ public class CommandsHandler implements CommandExecutor {
         @Override
         public void run() {
             try {
+                if (params.bct == BlockChangeType.CHAT) {
+                    sender.sendMessage(ChatColor.RED + "Chat cannot be redone");
+                    return;
+                }
+                if (params.bct == BlockChangeType.KILLS) {
+                    sender.sendMessage(ChatColor.RED + "Kills cannot be redone");
+                    return;
+                }
+                if (params.sum != SummarizationMode.NONE) {
+                    sender.sendMessage(ChatColor.RED + "Cannot redo summarized changes");
+                    return;
+                }
+                params.needDate = true;
                 params.needCoords = true;
                 params.needType = true;
                 params.needData = true;
-                params.needSignText = true;
                 params.needChestAccess = true;
-                params.order = Order.ASC;
                 params.sum = SummarizationMode.NONE;
                 conn = logblock.getConnection();
                 if (conn == null) {
@@ -739,13 +851,18 @@ public class CommandsHandler implements CommandExecutor {
                 if (!params.silent) {
                     sender.sendMessage(ChatColor.DARK_AQUA + "Searching " + params.getTitle() + ":");
                 }
-                final WorldEditor editor = new WorldEditor(logblock, params.world);
+                final WorldEditor editor = new WorldEditor(logblock, params.world, params.forceReplace);
+                WorldEditorEditFactory editFactory = new WorldEditorEditFactory(editor, params, false);
                 while (rs.next()) {
-                    editor.queueEdit(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("type"), rs.getInt("replaced"), rs.getByte("data"), rs.getString("signtext"), rs.getShort("itemtype"), (short) -rs.getShort("itemamount"), rs.getShort("itemdata"));
+                    editFactory.processRow(rs);
                 }
+                if (params.order == Order.ASC) {
+                    editor.reverseRowOrder();
+                }
+                editor.sortRows(Order.ASC);
                 final int changes = editor.getSize();
                 if (!params.silent) {
-                    sender.sendMessage(ChatColor.GREEN.toString() + changes + " blocks found.");
+                    sender.sendMessage(ChatColor.GREEN.toString() + changes + " " + (params.bct == BlockChangeType.ENTITIES ? "entities" : "blocks") + " found.");
                 }
                 if (changes == 0) {
                     if (!params.silent) {
@@ -753,15 +870,17 @@ public class CommandsHandler implements CommandExecutor {
                     }
                     return;
                 }
-                if (!params.silent && askRedos && questioner != null && sender instanceof Player && !questioner.ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
+                if (!params.silent && askRedos && sender instanceof Player && !logblock.getQuestioner().ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
                     sender.sendMessage(ChatColor.RED + "Redo aborted");
                     return;
                 }
                 editor.start();
                 sender.sendMessage(ChatColor.GREEN + "Redo finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ", " + ChatColor.RED + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[Redo] " + params.getQuery() + ": ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[Redo] " + params.getQuery() + ": ", ex);
+                }
             } finally {
                 close();
             }
@@ -777,6 +896,7 @@ public class CommandsHandler implements CommandExecutor {
         public void run() {
             try {
                 conn = logblock.getConnection();
+                conn.setAutoCommit(true);
                 state = conn.createStatement();
                 if (conn == null) {
                     sender.sendMessage(ChatColor.RED + "MySQL connection lost");
@@ -785,69 +905,154 @@ public class CommandsHandler implements CommandExecutor {
                 if (!checkRestrictions(sender, params)) {
                     return;
                 }
+                if (params.sum != SummarizationMode.NONE) {
+                    sender.sendMessage(ChatColor.RED + "Cannot summarize on ClearLog");
+                    return;
+                }
+                String tableBase;
+                String deleteFromTables;
+                String tableName;
+                params.needId = true;
+                params.needDate = true;
+                params.needPlayerId = true;
+                if (params.bct == BlockChangeType.CHAT) {
+                    params.needMessage = true;
+                    tableBase = "lb-chat";
+                    deleteFromTables = "`lb-chat` ";
+                    tableName = "lb-chat";
+                } else if (params.bct == BlockChangeType.KILLS) {
+                    params.needWeapon = true;
+                    params.needCoords = true;
+                    tableBase = params.getTable();
+                    deleteFromTables = "`" + tableBase + "-kills` ";
+                    tableName = tableBase + "-kills";
+                } else if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
+                    params.needType = true;
+                    params.needCoords = true;
+                    params.needData = true;
+                    tableBase = params.getTable();
+                    deleteFromTables = "`" + tableBase + "-entities` ";
+                    tableName = tableBase + "-entities";
+                } else {
+                    params.needType = true;
+                    params.needCoords = true;
+                    params.needData = true;
+                    params.needChestAccess = true;
+                    tableBase = params.getTable();
+                    deleteFromTables = "`" + tableBase + "-blocks`, `" + tableBase + "-state`, `" + tableBase + "-chestdata` ";
+                    tableName = tableBase + "-blocks";
+                }
                 final File dumpFolder = new File(logblock.getDataFolder(), "dump");
                 if (!dumpFolder.exists()) {
                     dumpFolder.mkdirs();
                 }
-                final String time = new SimpleDateFormat("yyMMddHHmmss").format(System.currentTimeMillis());
-                int deleted;
-                final String table = params.getTable();
-                final String join = params.players.size() > 0 ? "INNER JOIN `lb-players` USING (playerid) " : "";
-                rs = state.executeQuery("SELECT count(*) FROM `" + table + "` " + join + params.getWhere());
-                rs.next();
-                if ((deleted = rs.getInt(1)) > 0) {
-                    if (!params.silent && askClearLogs && sender instanceof Player && questioner != null) {
+                rs = state.executeQuery("SELECT count(*) " + params.getFrom() + params.getWhere());
+                int deleted = rs.next() ? rs.getInt(1) : 0;
+                rs.close();
+                if (!params.silent && askClearLogs && sender instanceof Player) {
                     sender.sendMessage(ChatColor.DARK_AQUA + "Searching " + params.getTitle() + ":");
-                        sender.sendMessage(ChatColor.GREEN.toString() + deleted + " blocks found.");
-                        if (!questioner.ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
+                    sender.sendMessage(ChatColor.GREEN.toString() + deleted + " entries found.");
+                    if (deleted == 0 || !logblock.getQuestioner().ask((Player) sender, "Are you sure you want to continue?", "yes", "no").equals("yes")) {
                         sender.sendMessage(ChatColor.RED + "ClearLog aborted");
                         return;
                     }
                 }
-                    if (dumpDeletedLog) {
+                if (deleted > 0 && dumpDeletedLog) {
+                    final String time = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(System.currentTimeMillis());
                     try {
-                            state.execute("SELECT * FROM `" + table + "` " + join + params.getWhere() + "INTO OUTFILE '" + new File(dumpFolder, time + " " + table + " " + params.getTitle().replace(":", ".") + ".csv").getAbsolutePath().replace("\\", "\\\\") + "' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'  LINES TERMINATED BY '\n'");
+                        File outFile = new File(dumpFolder, (time + " " + tableName + " " + params.getTitle() + ".sql").replace(':', '.').replace('/', '_').replace('\\', '_'));
+                        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(outFile)), "UTF-8"));
+                        try {
+                            rs = state.executeQuery("SELECT " + params.getFields() + params.getFrom() + params.getWhere());
+                            while (rs.next()) {
+                                StringBuilder sb = new StringBuilder();
+                                if (params.bct == BlockChangeType.CHAT) {
+                                    sb.append("INSERT INTO `lb-chat` (`id`, `date`, `playerid`, `message`) VALUES (");
+                                    sb.append(rs.getLong("id")).append(", FROM_UNIXTIME(");
+                                    sb.append(rs.getTimestamp("date").getTime() / 1000).append("), ");
+                                    sb.append(rs.getInt("playerid")).append(", '");
+                                    sb.append(Utils.mysqlTextEscape(rs.getString("message")));
+                                    sb.append("');\n");
+                                } else if (params.bct == BlockChangeType.KILLS) {
+                                    sb.append("INSERT INTO `").append(tableBase).append("-kills` (`id`, `date`, `killer`, `victim`, `weapon`, `x`, `y`, `z`) VALUES (");
+                                    sb.append(rs.getLong("id")).append(", FROM_UNIXTIME(");
+                                    sb.append(rs.getTimestamp("date").getTime() / 1000).append("), ");
+                                    sb.append(rs.getInt("killerid")).append(", ");
+                                    sb.append(rs.getInt("victimid")).append(", ");
+                                    sb.append(rs.getInt("weapon")).append(", ");
+                                    sb.append(rs.getInt("x")).append(", ");
+                                    sb.append(rs.getInt("y")).append(", ");
+                                    sb.append(rs.getInt("z"));
+                                    sb.append(");\n");
+                                } else if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
+
+                                } else {
+                                    sb.append("INSERT INTO `").append(tableBase).append("-blocks` (`id`, `date`, `playerid`, `replaced`, `replacedData`, `type`, `typeData`, `x`, `y`, `z`) VALUES (");
+                                    sb.append(rs.getLong("id")).append(", FROM_UNIXTIME(");
+                                    sb.append(rs.getTimestamp("date").getTime() / 1000).append("), ");
+                                    sb.append(rs.getInt("playerid")).append(", ");
+                                    sb.append(rs.getInt("replaced")).append(", ");
+                                    sb.append(rs.getInt("replacedData")).append(", ");
+                                    sb.append(rs.getInt("type")).append(", ");
+                                    sb.append(rs.getInt("typeData")).append(", ");
+                                    sb.append(rs.getInt("x")).append(", ");
+                                    sb.append(rs.getInt("y")).append(", ");
+                                    sb.append(rs.getInt("z"));
+                                    sb.append(");\n");
+                                    byte[] replacedState = rs.getBytes("replacedState");
+                                    byte[] typeState = rs.getBytes("typeState");
+                                    if (replacedState != null || typeState != null) {
+                                        sb.append("INSERT INTO `").append(tableBase).append("-state` (`id`, `replacedState`, `typeState`) VALUES (");
+                                        sb.append(rs.getLong("id")).append(", ");
+                                        sb.append(Utils.mysqlPrepareBytesForInsertAllowNull(replacedState)).append(", ");
+                                        sb.append(Utils.mysqlPrepareBytesForInsertAllowNull(typeState));
+                                        sb.append(");\n");
+                                    }
+                                    byte[] item = rs.getBytes("item");
+                                    if (item != null) {
+                                        sb.append("INSERT INTO `").append(tableBase).append("-chestdata` (`id`, `item`, `itemremove`, `itemtype`) VALUES (");
+                                        sb.append(rs.getLong("id")).append(", ");
+                                        sb.append(Utils.mysqlPrepareBytesForInsertAllowNull(item)).append(", ");
+                                        sb.append(rs.getInt("itemremove")).append(", ");
+                                        sb.append(rs.getInt("itemtype"));
+                                        sb.append(");\n");
+                                    }
+                                }
+                                writer.write(sb.toString());
+                            }
+                            rs.close();
+                        } finally {
+                            writer.close();
+                        }
                     } catch (final SQLException ex) {
-                            sender.sendMessage(ChatColor.RED + "Error while dumping log. Make sure your MySQL user has access to the LogBlock folder, or disable clearlog.dumpDeletedLog");
-                            getLogger().log(Level.SEVERE, "[ClearLog] Exception while dumping log: ", ex);
+                        sender.sendMessage(ChatColor.RED + "Error while dumping log.");
+                        logblock.getLogger().log(Level.SEVERE, "[ClearLog] Exception while dumping log: ", ex);
                         return;
                     }
                 }
-                    state.execute("DELETE `" + table + "` FROM `" + table + "` " + join + params.getWhere());
-                    sender.sendMessage(ChatColor.GREEN + "Cleared out table " + table + ". Deleted " + deleted + " entries.");
+                if (deleted > 0) {
+                    state.executeUpdate("DELETE " + deleteFromTables + params.getFrom() + params.getWhere());
+                    if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
+                        state.executeUpdate("DELETE `" + tableBase + "-entityids` FROM `" + tableBase + "-entityids` LEFT JOIN `" + tableBase + "-entities` USING (entityid) WHERE `" + tableBase + "-entities`.entityid IS NULL");
                     }
-                rs = state.executeQuery("SELECT COUNT(*) FROM `" + table + "-sign` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL");
-                rs.next();
-                if ((deleted = rs.getInt(1)) > 0) {
-                    if (dumpDeletedLog) {
-                        state.execute("SELECT id, signtext FROM `" + table + "-sign` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL INTO OUTFILE '" + new File(dumpFolder, time + " " + table + "-sign " + params.getTitle() + ".csv").getAbsolutePath().replace("\\", "\\\\") + "' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'  LINES TERMINATED BY '\n'");
-                    }
-                    state.execute("DELETE `" + table + "-sign` FROM `" + table + "-sign` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL;");
-                    sender.sendMessage(ChatColor.GREEN + "Cleared out table " + table + "-sign. Deleted " + deleted + " entries.");
-                }
-                rs = state.executeQuery("SELECT COUNT(*) FROM `" + table + "-chest` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL");
-                rs.next();
-                if ((deleted = rs.getInt(1)) > 0) {
-                    if (dumpDeletedLog) {
-                        state.execute("SELECT id, itemtype, itemamount, itemdata FROM `" + table + "-chest` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL INTO OUTFILE '" + new File(dumpFolder, time + " " + table + "-chest " + params.getTitle() + ".csv").getAbsolutePath().replace("\\", "\\\\") + "' FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\"'  LINES TERMINATED BY '\n'");
-                    }
-                    state.execute("DELETE `" + table + "-chest` FROM `" + table + "-chest` LEFT JOIN `" + table + "` USING (id) WHERE `" + table + "`.id IS NULL;");
-                    sender.sendMessage(ChatColor.GREEN + "Cleared out table " + table + "-chest. Deleted " + deleted + " entries.");
                 }
+                sender.sendMessage(ChatColor.GREEN + "Cleared out table " + tableName + ". Deleted " + deleted + " entries.");
             } catch (final Exception ex) {
+                if (logblock.isCompletelyEnabled() || !(ex instanceof SQLException)) {
                     sender.sendMessage(ChatColor.RED + "Exception, check error log");
-                getLogger().log(Level.SEVERE, "[ClearLog] Exception: ", ex);
+                    logblock.getLogger().log(Level.SEVERE, "[ClearLog] Exception: ", ex);
+                }
             } finally {
                 close();
             }
         }
     }
 
-    private static ResultSet executeQuery(Statement state, String query) throws SQLException {
+    private ResultSet executeQuery(Statement state, String query) throws SQLException {
         if (Config.debug) {
             long startTime = System.currentTimeMillis();
             ResultSet rs = state.executeQuery(query);
-            getLogger().log(Level.INFO, "[LogBlock Debug] Time Taken: " + (System.currentTimeMillis() - startTime) + " milliseconds. Query: " + query);
+            logblock.getLogger().log(Level.INFO, "[LogBlock Debug] Time Taken: " + (System.currentTimeMillis() - startTime) + " milliseconds. Query: " + query);
             return rs;
         } else {
             return state.executeQuery(query);
@@ -855,7 +1060,7 @@ public class CommandsHandler implements CommandExecutor {
     }
 
     private static List<String> argsToList(String[] arr, int offset) {
-        final List<String> list = new ArrayList<String>(Arrays.asList(arr));
+        final List<String> list = new ArrayList<>(Arrays.asList(arr));
         for (int i = 0; i < offset; i++) {
             list.remove(0);
         }

src/main/java/de/diddiz/LogBlock/DumpedLogImporter.java

@@ -1,15 +1,16 @@
 package de.diddiz.LogBlock;
 
-import de.diddiz.util.Utils.ExtensionFilenameFilter;
+import static de.diddiz.LogBlock.util.Utils.newline;
 
+import de.diddiz.LogBlock.util.Utils.ExtensionFilenameFilter;
 import java.io.*;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.logging.Level;
-
-import static de.diddiz.util.Utils.newline;
-import static org.bukkit.Bukkit.getLogger;
+import java.util.regex.Pattern;
 
 public class DumpedLogImporter implements Runnable {
     private final LogBlock logblock;
@@ -20,9 +21,10 @@ public class DumpedLogImporter implements Runnable {
 
     @Override
     public void run() {
-        final File[] imports = new File("plugins/LogBlock/import/").listFiles(new ExtensionFilenameFilter("sql"));
+        final File[] imports = new File(logblock.getDataFolder(), "import").listFiles(new ExtensionFilenameFilter("sql"));
         if (imports != null && imports.length > 0) {
-            getLogger().info("Found " + imports.length + " imports.");
+            logblock.getLogger().info("Found " + imports.length + " imports.");
+            Arrays.sort(imports, new ImportsComparator());
             Connection conn = null;
             try {
                 conn = logblock.getConnection();
@@ -33,30 +35,65 @@ public class DumpedLogImporter implements Runnable {
                 final Statement st = conn.createStatement();
                 final BufferedWriter writer = new BufferedWriter(new FileWriter(new File(logblock.getDataFolder(), "import/failed.txt")));
                 int successes = 0, errors = 0;
+                try {
                     for (final File sqlFile : imports) {
-                    getLogger().info("Trying to import " + sqlFile.getName() + " ...");
+                        String line = null;
+                        try {
+                            logblock.getLogger().info("Trying to import " + sqlFile.getName() + " ...");
+                            // first try batch import the whole file
                             final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
-                    String line;
+                            int statements = 0;
                             while ((line = reader.readLine()) != null) {
+                                if (line.endsWith(";")) {
+                                    line = line.substring(0, line.length() - 1);
+                                }
+                                if (!line.isEmpty()) {
+                                    statements++;
+                                    st.addBatch(line);
+                                }
+                            }
+                            st.executeBatch();
+                            conn.commit();
+                            reader.close();
+                            sqlFile.delete();
+                            successes += statements;
+                            logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
+                        } catch (final Exception ignored) {
+                            // if the batch import did not work, retry line by line
+                            try {
+                                final BufferedReader reader = new BufferedReader(new FileReader(sqlFile));
+                                while ((line = reader.readLine()) != null) {
+                                    if (line.endsWith(";")) {
+                                        line = line.substring(0, line.length() - 1);
+                                    }
+                                    if (!line.isEmpty()) {
                                         try {
                                             st.execute(line);
                                             successes++;
-                        } catch (final Exception ex) {
-                            getLogger().warning("Error while importing: '" + line + "': " + ex.getMessage());
+                                        } catch (final SQLException ex) {
+                                            logblock.getLogger().severe("Error while importing: '" + line + "': " + ex.getMessage());
                                             writer.write(line + newline);
                                             errors++;
                                         }
                                     }
+                                }
                                 conn.commit();
                                 reader.close();
                                 sqlFile.delete();
-                    getLogger().info("Successfully imported " + sqlFile.getName() + ".");
-                }
-                writer.close();
-                st.close();
-                getLogger().info("Successfully imported stored queue. (" + successes + " rows imported, " + errors + " errors)");
+                                logblock.getLogger().info("Successfully imported " + sqlFile.getName() + ".");
                             } catch (final Exception ex) {
-                getLogger().log(Level.WARNING, "Error while importing: ", ex);
+                                logblock.getLogger().severe("Error while importing " + sqlFile.getName() + ": " + ex.getMessage());
+                                errors++;
+                            }
+                        }
+                    }
+                } finally {
+                    writer.close();
+                }
+                st.close();
+                logblock.getLogger().info("Successfully imported stored queue. (" + successes + " rows imported, " + errors + " errors)");
+            } catch (final Exception ex) {
+                logblock.getLogger().log(Level.WARNING, "Error while importing: ", ex);
             } finally {
                 if (conn != null) {
                     try {
@@ -67,4 +104,44 @@ public class DumpedLogImporter implements Runnable {
             }
         }
     }
+
+    private static class ImportsComparator implements Comparator<File> {
+        private final Pattern splitPattern = Pattern.compile("[\\-\\.]");
+
+        @Override
+        public int compare(File o1, File o2) {
+            String[] name1 = splitPattern.split(o1.getName());
+            String[] name2 = splitPattern.split(o2.getName());
+            if (name1.length > name2.length) {
+                return 1;
+            } else if (name1.length < name2.length) {
+                return -1;
+            }
+            for (int i = 0; i < name1.length; i++) {
+                String part1 = name1[i];
+                String part2 = name2[i];
+                if (part1.length() > 0 && part2.length() > 0) {
+                    char first1 = part1.charAt(0);
+                    char first2 = part2.charAt(0);
+                    if (first1 >= '0' && first1 <= '9' && first2 >= '0' && first2 <= '9') {
+                        try {
+                            long long1 = Long.parseLong(part1);
+                            long long2 = Long.parseLong(part2);
+                            if (long1 == long2) {
+                                continue;
+                            }
+                            return long1 > long2 ? 1 : -1;
+                        } catch (NumberFormatException e) {
+                            // fallthrough to string compare
+                        }
+                    }
+                }
+                int compareString = part1.compareTo(part2);
+                if (compareString != 0) {
+                    return compareString;
+                }
+            }
+            return 0;
+        }
+    }
 }

src/main/java/de/diddiz/LogBlock/EntityChange.java

@@ -0,0 +1,138 @@
+package de.diddiz.LogBlock;
+
+import static de.diddiz.LogBlock.util.ActionColor.CREATE;
+import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
+import static de.diddiz.LogBlock.util.ActionColor.INTERACT;
+import static de.diddiz.LogBlock.util.MessagingUtil.createTextComponentWithColor;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyEntityType;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
+
+import de.diddiz.LogBlock.util.Utils;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.inventory.ItemStack;
+
+public class EntityChange implements LookupCacheElement {
+    public static enum EntityChangeType {
+        CREATE,
+        KILL,
+        MODIFY,
+        ADDEQUIP,
+        REMOVEEQUIP,
+        GET_STUNG;
+
+        private static EntityChangeType[] values = values();
+
+        public static EntityChangeType valueOf(int ordinal) {
+            return values[ordinal];
+        }
+    }
+
+    public final long id, date;
+    public final Location loc;
+    public final Actor actor;
+    public final EntityType type;
+    public final int entityId;
+    public final UUID entityUUID;
+    public final EntityChangeType changeType;
+    public final byte[] data;
+
+    public EntityChange(long date, Location loc, Actor actor, EntityType type, UUID entityid, EntityChangeType changeType, byte[] data) {
+        id = 0;
+        this.date = date;
+        this.loc = loc;
+        this.actor = actor;
+        this.type = type;
+        this.entityId = -1;
+        this.entityUUID = entityid;
+        this.changeType = changeType;
+        this.data = data;
+    }
+
+    public EntityChange(ResultSet rs, QueryParams p) throws SQLException {
+        id = p.needId ? rs.getLong("id") : 0;
+        date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
+        loc = p.needCoords ? new Location(p.world, rs.getInt("x"), rs.getInt("y"), rs.getInt("z")) : null;
+        actor = p.needPlayer ? new Actor(rs) : null;
+        type = p.needType ? EntityTypeConverter.getEntityType(rs.getInt("entitytypeid")) : null;
+        entityId = p.needData ? rs.getInt("entityid") : 0;
+        entityUUID = p.needData ? UUID.fromString(rs.getString("entityuuid")) : null;
+        changeType = p.needType ? EntityChangeType.valueOf(rs.getInt("action")) : null;
+        data = p.needData ? rs.getBytes("data") : null;
+    }
+
+    @Override
+    public String toString() {
+        return BaseComponent.toPlainText(getLogMessage());
+    }
+
+    @Override
+    public BaseComponent[] getLogMessage(int entry) {
+        TextComponent msg = new TextComponent();
+        if (date > 0) {
+            msg.addExtra(prettyDate(date));
+            msg.addExtra(" ");
+        }
+        if (actor != null) {
+            msg.addExtra(actor.getName());
+            msg.addExtra(" ");
+        }
+        if (changeType == EntityChangeType.CREATE) {
+            msg.addExtra(createTextComponentWithColor("created ", CREATE.getColor()));
+        } else if (changeType == EntityChangeType.KILL) {
+            boolean living = type != null && LivingEntity.class.isAssignableFrom(type.getEntityClass()) && !ArmorStand.class.isAssignableFrom(type.getDeclaringClass());
+            msg.addExtra(createTextComponentWithColor(living ? "killed " : "destroyed ", DESTROY.getColor()));
+        } else if (changeType == EntityChangeType.ADDEQUIP) {
+            YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
+            ItemStack stack = conf == null ? null : conf.getItemStack("item");
+            if (stack == null) {
+                msg.addExtra(createTextComponentWithColor("added an item to ", CREATE.getColor()));
+            } else {
+                msg.addExtra(createTextComponentWithColor("added ", CREATE.getColor()));
+                msg.addExtra(prettyMaterial(stack.getType()));
+                msg.addExtra(" to ");
+            }
+        } else if (changeType == EntityChangeType.REMOVEEQUIP) {
+            YamlConfiguration conf = Utils.deserializeYamlConfiguration(data);
+            ItemStack stack = conf == null ? null : conf.getItemStack("item");
+            if (stack == null) {
+                msg.addExtra(createTextComponentWithColor("removed an item from ", DESTROY.getColor()));
+            } else {
+                msg.addExtra(createTextComponentWithColor("removed ", DESTROY.getColor()));
+                msg.addExtra(prettyMaterial(stack.getType()));
+                msg.addExtra(" from ");
+            }
+        } else if (changeType == EntityChangeType.MODIFY) {
+            msg.addExtra(createTextComponentWithColor("modified ", INTERACT.getColor()));
+        } else if (changeType == EntityChangeType.GET_STUNG) {
+            msg.addExtra(createTextComponentWithColor("got stung by ", DESTROY.getColor()));
+        } else {
+            msg.addExtra(createTextComponentWithColor("did an unknown action to ", INTERACT.getColor()));
+        }
+        if (type != null) {
+            msg.addExtra(prettyEntityType(type));
+        } else {
+            msg.addExtra(prettyMaterial("an unknown entity"));
+        }
+        if (loc != null) {
+            msg.addExtra(" at ");
+            msg.addExtra(prettyLocation(loc, entry));
+        }
+        return new BaseComponent[] { msg };
+    }
+
+    @Override
+    public Location getLocation() {
+        return loc;
+    }
+}

src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java

@@ -0,0 +1,114 @@
+package de.diddiz.LogBlock;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.logging.Level;
+
+import org.bukkit.entity.EntityType;
+
+public class EntityTypeConverter {
+    private static EntityType[] idToEntityType = new EntityType[10];
+    private static HashMap<EntityType, Integer> entityTypeToId = new HashMap<>();
+    private static int nextEntityTypeId;
+
+    public synchronized static Integer getExistingEntityTypeId(EntityType entityType) {
+        return entityType == null ? null : entityTypeToId.get(entityType);
+    }
+
+    public synchronized static int getOrAddEntityTypeId(EntityType entityType) {
+        Integer key = entityTypeToId.get(entityType);
+        int tries = 0;
+        while (key == null && tries < 10) {
+            tries++;
+            key = nextEntityTypeId;
+            Connection conn = LogBlock.getInstance().getConnection();
+            try {
+                conn.setAutoCommit(false);
+                PreparedStatement smt = conn.prepareStatement("INSERT IGNORE INTO `lb-entitytypes` (id, name) VALUES (?, ?)");
+                smt.setInt(1, key);
+                smt.setString(2, entityType.name());
+                boolean couldAdd = smt.executeUpdate() > 0;
+                conn.commit();
+                smt.close();
+                if (couldAdd) {
+                    internalAddEntityType(key, entityType);
+                } else {
+                    initializeEntityTypes(conn);
+                }
+            } catch (Exception e) {
+                LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not update lb-entitytypes", e);
+                reinitializeEntityTypesCatchException();
+                if (tries == 10) {
+                    throw new RuntimeException(e);
+                }
+            } finally {
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    // ignored
+                }
+            }
+            key = entityTypeToId.get(entityType);
+        }
+        return key.intValue();
+    }
+
+    public synchronized static EntityType getEntityType(int entityTypeId) {
+        return entityTypeId >= 0 && entityTypeId < idToEntityType.length ? idToEntityType[entityTypeId] : null;
+    }
+
+    private static void reinitializeEntityTypesCatchException() {
+        Connection conn = LogBlock.getInstance().getConnection();
+        try {
+            initializeEntityTypes(conn);
+        } catch (Exception e) {
+            LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not reinitialize lb-entitytypes", e);
+        } finally {
+            try {
+                conn.close();
+            } catch (Exception e) {
+                // ignored
+            }
+        }
+    }
+
+    protected synchronized static void initializeEntityTypes(Connection connection) throws SQLException {
+        Statement smt = connection.createStatement();
+        ResultSet rs = smt.executeQuery("SELECT id, name FROM `lb-entitytypes`");
+        while (rs.next()) {
+            int key = rs.getInt(1);
+            try {
+                EntityType entityType = EntityType.valueOf(rs.getString(2));
+                internalAddEntityType(key, entityType);
+            } catch (IllegalArgumentException ignored) {
+                // the key is used, but not available in this version
+                if (nextEntityTypeId <= key) {
+                    nextEntityTypeId = key + 1;
+                }
+            }
+        }
+        rs.close();
+        smt.close();
+        connection.close();
+    }
+
+    private static void internalAddEntityType(int key, EntityType entityType) {
+        entityTypeToId.put(entityType, key);
+        int length = idToEntityType.length;
+        while (length <= key) {
+            length = (length * 3 / 2) + 5;
+        }
+        if (length > idToEntityType.length) {
+            idToEntityType = Arrays.copyOf(idToEntityType, length);
+        }
+        idToEntityType[key] = entityType;
+        if (nextEntityTypeId <= key) {
+            nextEntityTypeId = key + 1;
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/Kill.java

@@ -1,11 +1,18 @@
 package de.diddiz.LogBlock;
 
-import de.diddiz.LogBlock.config.Config;
-import org.bukkit.Location;
-import org.bukkit.inventory.ItemStack;
+import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyDate;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyLocation;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
 
+import de.diddiz.LogBlock.util.BukkitUtils;
+import de.diddiz.LogBlock.util.MessagingUtil;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
+import org.bukkit.Material;
 
 public class Kill implements LookupCacheElement {
     final long id, date;
@@ -23,7 +30,7 @@ public class Kill implements LookupCacheElement {
     }
 
     public Kill(ResultSet rs, QueryParams p) throws SQLException {
-        id = p.needId ? rs.getInt("id") : 0;
+        id = p.needId ? rs.getLong("id") : 0;
         date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
         loc = p.needCoords ? new Location(p.world, rs.getInt("x"), rs.getInt("y"), rs.getInt("z")) : null;
         killerName = p.needKiller ? rs.getString("killer") : null;
@@ -33,17 +40,7 @@ public class Kill implements LookupCacheElement {
 
     @Override
     public String toString() {
-        final StringBuilder msg = new StringBuilder();
-        if (date > 0) {
-            msg.append(Config.formatter.format(date)).append(" ");
-        }
-        msg.append(killerName).append(" killed ").append(victimName);
-        if (loc != null) {
-            msg.append(" at ").append(loc.getBlockX()).append(":").append(loc.getBlockY()).append(":").append(loc.getBlockZ());
-        }
-        String weaponName = prettyItemName(new ItemStack(weapon));
-        msg.append(" with " + weaponName); // + ("aeiou".contains(weaponName.substring(0, 1)) ? "an " : "a " )
-        return msg.toString();
+        return BaseComponent.toPlainText(getLogMessage());
     }
 
     @Override
@@ -52,15 +49,29 @@ public class Kill implements LookupCacheElement {
     }
 
     @Override
-    public String getMessage() {
-        return toString();
+    public BaseComponent[] getLogMessage(int entry) {
+        TextComponent msg = new TextComponent();
+        if (date > 0) {
+            msg.addExtra(prettyDate(date));
+            msg.addExtra(" ");
+        }
+        msg.addExtra(MessagingUtil.createTextComponentWithColor(killerName + " killed ", DESTROY.getColor()));
+        msg.addExtra(new TextComponent(victimName));
+        if (loc != null) {
+            msg.addExtra(" at ");
+            msg.addExtra(prettyLocation(loc, entry));
+        }
+        if (weapon != 0) {
+            msg.addExtra(" with ");
+            msg.addExtra(prettyItemName(MaterialConverter.getMaterial(weapon)));
+        }
+        return new BaseComponent[] { msg };
     }
 
-    public String prettyItemName(ItemStack i) {
-        String item = i.getType().toString().replace('_', ' ').toLowerCase();
-        if (item.equals("air")) {
-            item = "fist";
+    public TextComponent prettyItemName(Material t) {
+        if (t == null || BukkitUtils.isEmpty(t)) {
+            return prettyMaterial("fist");
         }
-        return item;
+        return prettyMaterial(t.toString().replace('_', ' '));
     }
 }

src/main/java/de/diddiz/LogBlock/LogBlock.java

@@ -1,10 +1,15 @@
 package de.diddiz.LogBlock;
 
+import de.diddiz.LogBlock.addons.worldguard.WorldGuardLoggingFlagsAddon;
 import de.diddiz.LogBlock.config.Config;
 import de.diddiz.LogBlock.listeners.*;
-import de.diddiz.util.MySQLConnectionPool;
-import de.diddiz.worldedit.WorldEditLoggingHook;
+import de.diddiz.LogBlock.questioner.Questioner;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import de.diddiz.LogBlock.util.MySQLConnectionPool;
+import de.diddiz.LogBlock.worldedit.WorldEditHelper;
+import de.diddiz.LogBlock.worldedit.WorldEditLoggingHook;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,19 +17,17 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Timer;
 import java.util.logging.Level;
 
 import static de.diddiz.LogBlock.config.Config.*;
-import static de.diddiz.util.MaterialName.materialName;
 import static org.bukkit.Bukkit.getPluginManager;
 
 public class LogBlock extends JavaPlugin {
@@ -32,14 +35,22 @@ public class LogBlock extends JavaPlugin {
     private MySQLConnectionPool pool;
     private Consumer consumer = null;
     private CommandsHandler commandsHandler;
-    private Updater updater = null;
-    private Timer timer = null;
-    private boolean errorAtLoading = false, noDb = false, connected = true;
+    private boolean noDb = false, connected = true;
+    private PlayerInfoLogging playerInfoLogging;
+    private ScaffoldingLogging scaffoldingLogging;
+    private Questioner questioner;
+    private WorldGuardLoggingFlagsAddon worldGuardLoggingFlagsAddon;
+    private boolean isConfigLoaded;
+    private volatile boolean isCompletelyEnabled;
 
     public static LogBlock getInstance() {
         return logblock;
     }
 
+    public boolean isCompletelyEnabled() {
+        return isCompletelyEnabled;
+    }
+
     public Consumer getConsumer() {
         return consumer;
     }
@@ -48,109 +59,115 @@ public class LogBlock extends JavaPlugin {
         return commandsHandler;
     }
 
-    Updater getUpdater() {
-        return updater;
-    }
-
     @Override
     public void onLoad() {
         logblock = this;
+        BukkitUtils.isDoublePlant(Material.AIR); // Force static code to run
         try {
-            updater = new Updater(this);
             Config.load(this);
+            isConfigLoaded = true;
+        } catch (final Exception ex) {
+            getLogger().log(Level.SEVERE, "Could not load LogBlock config! " + ex.getMessage(), ex);
+        }
+        if (Config.worldGuardLoggingFlags) {
+            if (getServer().getPluginManager().getPlugin("WorldGuard") == null) {
+                getLogger().log(Level.SEVERE, "Invalid config! addons.worldguardLoggingFlags is set to true, but WorldGuard is not loaded.");
+            } else {
+                worldGuardLoggingFlagsAddon = new WorldGuardLoggingFlagsAddon(this);
+                worldGuardLoggingFlagsAddon.onPluginLoad();
+            }
+        }
+    }
+
+    @Override
+    public void onEnable() {
+        final PluginManager pm = getPluginManager();
+        if (!isConfigLoaded) {
+            pm.disablePlugin(this);
+            return;
+        }
+        consumer = new Consumer(this);
+        try {
             getLogger().info("Connecting to " + user + "@" + url + "...");
-            pool = new MySQLConnectionPool(url, user, password);
-            final Connection conn = getConnection();
+            try {
+                Class.forName("com.mysql.cj.jdbc.Driver");
+            } catch (ClassNotFoundException ignored) {
+                Class.forName("com.mysql.jdbc.Driver");
+            }
+            pool = new MySQLConnectionPool(url, user, password, mysqlUseSSL, mysqlRequireSSL);
+            final Connection conn = getConnection(true);
             if (conn == null) {
                 noDb = true;
                 return;
             }
             final Statement st = conn.createStatement();
+            try {
                 final ResultSet rs = st.executeQuery("SHOW CHARACTER SET where charset='utf8mb4';");
                 if (rs.next()) {
                     Config.mb4 = true;
                     // Allegedly JDBC driver since 2010 hasn't needed this. I did.
-                st.executeQuery("SET NAMES utf8mb4;");
+                    try {
+                        st.executeUpdate("SET NAMES utf8mb4;");
+                    } catch (Exception ex) {
+                        getLogger().severe("could not set names to utf8mb4: " + ex.getMessage());
+                    }
+                }
+            } catch (Exception ex) {
+                getLogger().severe("could not verify character set: " + ex.getMessage());
             }
             conn.close();
+            Updater updater = new Updater(this);
+            updater.checkTables();
+            MaterialConverter.initializeMaterials(getConnection());
+            MaterialConverter.getOrAddMaterialId(Material.AIR); // AIR must be the first entry
+            EntityTypeConverter.initializeEntityTypes(getConnection());
             if (updater.update()) {
                 load(this);
             }
-            updater.checkTables();
         } catch (final NullPointerException ex) {
             getLogger().log(Level.SEVERE, "Error while loading: ", ex);
         } catch (final Exception ex) {
-            getLogger().severe("Error while loading: " + ex.getMessage());
-            errorAtLoading = true;
-            return;
-        }
-        consumer = new Consumer(this);
-    }
-
-    @Override
-    public void onEnable() {
-        materialName(0);    // Force static code to run
-        final PluginManager pm = getPluginManager();
-        if (errorAtLoading) {
+            getLogger().log(Level.SEVERE, "Error while loading: " + ex.getMessage(), ex);
             pm.disablePlugin(this);
             return;
         }
-        if (noDb) {
-            return;
-        }
-        if (pm.getPlugin("WorldEdit") != null) {
-            if (Integer.parseInt(pm.getPlugin("WorldEdit").getDescription().getVersion().substring(0, 1)) > 5) {
+
+        if (WorldEditHelper.hasWorldEdit()) {
             new WorldEditLoggingHook(this).hook();
-            } else {
-                getLogger().warning("Failed to hook into WorldEdit. Your WorldEdit version seems to be outdated, please make sure WorldEdit is at least version 6.");
-            }
         }
         commandsHandler = new CommandsHandler(this);
         getCommand("lb").setExecutor(commandsHandler);
         if (enableAutoClearLog && autoClearLogDelay > 0) {
             getServer().getScheduler().runTaskTimerAsynchronously(this, new AutoClearLog(this), 6000, autoClearLogDelay * 60 * 20);
         }
-        getServer().getScheduler().runTaskAsynchronously(this, new DumpedLogImporter(this));
+        new DumpedLogImporter(this).run();
         registerEvents();
-        if (useBukkitScheduler) {
-            if (getServer().getScheduler().runTaskTimerAsynchronously(this, consumer, delayBetweenRuns < 20 ? 20 : delayBetweenRuns, delayBetweenRuns).getTaskId() > 0) {
-                getLogger().info("Scheduled consumer with bukkit scheduler.");
-            } else {
-                getLogger().warning("Failed to schedule consumer with bukkit scheduler. Now trying schedule with timer.");
-                timer = new Timer();
-                timer.schedule(consumer, delayBetweenRuns < 20 ? 1000 : delayBetweenRuns * 50, delayBetweenRuns * 50);
-            }
-        } else {
-            timer = new Timer();
-            timer.schedule(consumer, delayBetweenRuns < 20 ? 1000 : delayBetweenRuns * 50, delayBetweenRuns * 50);
-            getLogger().info("Scheduled consumer with timer.");
-        }
-        getServer().getScheduler().runTaskAsynchronously(this, new Updater.PlayerCountChecker(this));
+        consumer.start();
         for (final Tool tool : toolsByType.values()) {
             if (pm.getPermission("logblock.tools." + tool.name) == null) {
                 final Permission perm = new Permission("logblock.tools." + tool.name, tool.permissionDefault);
                 pm.addPermission(perm);
             }
         }
-        try {
-            Metrics metrics = new Metrics(this);
-            metrics.start();
-        } catch (IOException ex) {
-            getLogger().info("Could not start metrics: " + ex.getMessage());
+        questioner = new Questioner(this);
+        if (worldGuardLoggingFlagsAddon != null) {
+            worldGuardLoggingFlagsAddon.onPluginEnable();
         }
+        isCompletelyEnabled = true;
+        getServer().getScheduler().runTaskAsynchronously(this, new Updater.PlayerCountChecker(this));
     }
 
     private void registerEvents() {
         final PluginManager pm = getPluginManager();
         pm.registerEvents(new ToolListener(this), this);
-        pm.registerEvents(new PlayerInfoLogging(this), this);
+        pm.registerEvents(playerInfoLogging = new PlayerInfoLogging(this), this);
         if (askRollbackAfterBan) {
             pm.registerEvents(new BanListener(this), this);
         }
         if (isLogging(Logging.BLOCKPLACE)) {
             pm.registerEvents(new BlockPlaceLogging(this), this);
         }
-        if (isLogging(Logging.BLOCKPLACE) || isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) {
+        if (isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) {
             pm.registerEvents(new FluidFlowLogging(this), this);
         }
         if (isLogging(Logging.BLOCKBREAK)) {
@@ -168,6 +185,12 @@ public class LogBlock extends JavaPlugin {
         if (isLogging(Logging.SNOWFADE)) {
             pm.registerEvents(new SnowFadeLogging(this), this);
         }
+        if (isLogging(Logging.SCAFFOLDING)) {
+            pm.registerEvents(scaffoldingLogging = new ScaffoldingLogging(this), this);
+        }
+        if (isLogging(Logging.CAULDRONINTERACT)) {
+            pm.registerEvents(new CauldronLogging(this), this);
+        }
         if (isLogging(Logging.CREEPEREXPLOSION) || isLogging(Logging.TNTEXPLOSION) || isLogging(Logging.GHASTFIREBALLEXPLOSION) || isLogging(Logging.ENDERDRAGON) || isLogging(Logging.MISCEXPLOSION)) {
             pm.registerEvents(new ExplosionLogging(this), this);
         }
@@ -177,7 +200,8 @@ 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) || isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
+        if (isLogging(Logging.BLOCKBREAK) || isLogging(Logging.BLOCKPLACE) || isLogging(Logging.SWITCHINTERACT) || isLogging(Logging.DOORINTERACT) || isLogging(Logging.CAKEEAT) || isLogging(Logging.DIODEINTERACT) || isLogging(Logging.COMPARATORINTERACT) || isLogging(Logging.NOTEBLOCKINTERACT)
+                || isLogging(Logging.PRESUREPLATEINTERACT) || isLogging(Logging.TRIPWIREINTERACT) || isLogging(Logging.CROPTRAMPLE)) {
             pm.registerEvents(new InteractLogging(this), this);
         }
         if (isLogging(Logging.CREATURECROPTRAMPLE)) {
@@ -186,7 +210,7 @@ public class LogBlock extends JavaPlugin {
         if (isLogging(Logging.KILL)) {
             pm.registerEvents(new KillLogging(this), this);
         }
-        if (isLogging(Logging.CHAT)) {
+        if (isLogging(Logging.CHAT) || isLogging(Logging.PLAYER_COMMANDS) || isLogging(Logging.CONSOLE_COMMANDS) || isLogging(Logging.COMMANDBLOCK_COMMANDS)) {
             pm.registerEvents(new ChatLogging(this), this);
         }
         if (isLogging(Logging.ENDERMEN)) {
@@ -195,49 +219,53 @@ public class LogBlock extends JavaPlugin {
         if (isLogging(Logging.WITHER)) {
             pm.registerEvents(new WitherLogging(this), this);
         }
-        if (isLogging(Logging.NATURALSTRUCTUREGROW) || isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
+        if (isLogging(Logging.NATURALSTRUCTUREGROW)) {
             pm.registerEvents(new StructureGrowLogging(this), this);
         }
-        if (isLogging(Logging.GRASSGROWTH) || isLogging(Logging.MYCELIUMSPREAD) || isLogging(Logging.VINEGROWTH) || isLogging(Logging.MUSHROOMSPREAD)) {
+        if (isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
+            pm.registerEvents(new BlockFertilizeLogging(this), this);
+        }
+        if (isLogging(Logging.GRASSGROWTH) || isLogging(Logging.MYCELIUMSPREAD) || isLogging(Logging.VINEGROWTH) || isLogging(Logging.MUSHROOMSPREAD) || isLogging(Logging.BAMBOOGROWTH) || isLogging(Logging.DRIPSTONEGROWTH) || isLogging(Logging.SCULKSPREAD)) {
             pm.registerEvents(new BlockSpreadLogging(this), this);
         }
-        if (isLogging(Logging.LOCKEDCHESTDECAY)) {
-            pm.registerEvents(new LockedChestDecayLogging(this), this);
+        if (isLogging(Logging.DRAGONEGGTELEPORT)) {
+            pm.registerEvents(new DragonEggLogging(this), this);
+        }
+        if (isLogging(Logging.LECTERNBOOKCHANGE)) {
+            pm.registerEvents(new LecternLogging(this), this);
+        }
+        if (isLogging(Logging.OXIDIZATION)) {
+            pm.registerEvents(new OxidizationLogging(this), this);
+        }
+        if (Config.isLoggingAnyEntities()) {
+            if (!WorldEditHelper.hasFullWorldEdit()) {
+                getLogger().severe("No compatible WorldEdit found, entity logging will not work!");
+            } else {
+                pm.registerEvents(new AdvancedEntityLogging(this), this);
+                getLogger().info("Entity logging enabled!");
+            }
         }
     }
 
     @Override
     public void onDisable() {
-        if (timer != null) {
-            timer.cancel();
-        }
+        isCompletelyEnabled = false;
         getServer().getScheduler().cancelTasks(this);
         if (consumer != null) {
-            if (logPlayerInfo && getServer().getOnlinePlayers() != null) {
+            if (logPlayerInfo && playerInfoLogging != null) {
                 for (final Player player : getServer().getOnlinePlayers()) {
-                    consumer.queueLeave(player);
+                    playerInfoLogging.onPlayerQuit(player);
                 }
             }
             getLogger().info("Waiting for consumer ...");
-            consumer.run();
+            consumer.shutdown();
             if (consumer.getQueueSize() > 0) {
-                int tries = 9;
-                while (consumer.getQueueSize() > 0) {
-                    getLogger().info("Remaining queue size: " + consumer.getQueueSize());
-                    if (tries > 0) {
-                        getLogger().info("Remaining tries: " + tries);
-                    } else {
-                        getLogger().info("Unable to save queue to database. Trying to write to a local file.");
+                getLogger().info("Remaining queue size: " + consumer.getQueueSize() + ". Trying to write to a local file.");
                 try {
                     consumer.writeToFile();
                     getLogger().info("Successfully dumped queue.");
                 } catch (final FileNotFoundException ex) {
                     getLogger().info("Failed to write. Given up.");
-                            break;
-                        }
-                    }
-                    consumer.run();
-                    tries--;
                 }
             }
         }
@@ -259,6 +287,10 @@ public class LogBlock extends JavaPlugin {
     }
 
     public Connection getConnection() {
+        return getConnection(false);
+    }
+
+    public Connection getConnection(boolean testConnection) {
         try {
             final Connection conn = pool.getConnection();
             if (!connected) {
@@ -267,11 +299,13 @@ public class LogBlock extends JavaPlugin {
             }
             return conn;
         } catch (final Exception ex) {
-            if (connected) {
+            if (testConnection) {
+                getLogger().log(Level.SEVERE, "Could not connect to the Database! Please check your config! " + ex.getMessage());
+            } else if (connected) {
                 getLogger().log(Level.SEVERE, "Error while fetching connection: ", ex);
                 connected = false;
             } else {
-                getLogger().severe("MySQL connection lost");
+                getLogger().log(Level.SEVERE, "MySQL connection lost", ex);
             }
             return null;
         }
@@ -298,7 +332,7 @@ public class LogBlock extends JavaPlugin {
         try {
             state = conn.createStatement();
             final ResultSet rs = state.executeQuery(params.getQuery());
-            final List<BlockChange> blockchanges = new ArrayList<BlockChange>();
+            final List<BlockChange> blockchanges = new ArrayList<>();
             while (rs.next()) {
                 blockchanges.add(new BlockChange(rs, params));
             }
@@ -312,6 +346,9 @@ public class LogBlock extends JavaPlugin {
     }
 
     public int getCount(QueryParams params) throws SQLException {
+        if (params == null || params.world == null || !Config.isLogged(params.world)) {
+            throw new IllegalArgumentException("World is not logged: " + ((params == null || params.world == null) ? "null" : params.world.getName()));
+        }
         final Connection conn = getConnection();
         Statement state = null;
         if (conn == null) {
@@ -333,4 +370,17 @@ public class LogBlock extends JavaPlugin {
             conn.close();
         }
     }
+
+    @Override
+    public File getFile() {
+        return super.getFile();
+    }
+
+    public Questioner getQuestioner() {
+        return questioner;
+    }
+
+    public ScaffoldingLogging getScaffoldingLogging() {
+        return scaffoldingLogging;
+    }
 }

src/main/java/de/diddiz/LogBlock/Logging.java

@@ -1,14 +1,60 @@
 package de.diddiz.LogBlock;
 
 public enum Logging {
-    BLOCKPLACE(true), BLOCKBREAK(true), SIGNTEXT, TNTEXPLOSION(true), CREEPEREXPLOSION(true),
-    GHASTFIREBALLEXPLOSION(true), ENDERDRAGON(true), MISCEXPLOSION, FIRE(true), LEAVESDECAY,
-    LAVAFLOW, WATERFLOW, CHESTACCESS, KILL, CHAT, SNOWFORM, SNOWFADE, DOORINTERACT,
-    SWITCHINTERACT, CAKEEAT, ENDERMEN, NOTEBLOCKINTERACT, DIODEINTERACT, COMPARATORINTERACT,
-    PRESUREPLATEINTERACT, TRIPWIREINTERACT, CREATURECROPTRAMPLE, CROPTRAMPLE,
-    NATURALSTRUCTUREGROW, GRASSGROWTH, MYCELIUMSPREAD, VINEGROWTH, MUSHROOMSPREAD,
-    WITHER(true), WITHER_SKULL(true), BONEMEALSTRUCTUREGROW,
-    WORLDEDIT, TNTMINECARTEXPLOSION(true), LOCKEDCHESTDECAY;
+    BLOCKPLACE(true),
+    BLOCKBREAK(true),
+    SIGNTEXT(true),
+    TNTEXPLOSION(true),
+    CREEPEREXPLOSION(true),
+    GHASTFIREBALLEXPLOSION(true),
+    ENDERDRAGON(true),
+    MISCEXPLOSION(true),
+    FIRE(true),
+    LEAVESDECAY,
+    LAVAFLOW,
+    WATERFLOW,
+    CHESTACCESS,
+    KILL,
+    CHAT,
+    SNOWFORM,
+    SNOWFADE,
+    DOORINTERACT,
+    SWITCHINTERACT,
+    CAKEEAT,
+    ENDERMEN,
+    NOTEBLOCKINTERACT,
+    DIODEINTERACT,
+    COMPARATORINTERACT,
+    PRESUREPLATEINTERACT,
+    TRIPWIREINTERACT,
+    CAULDRONINTERACT(true),
+    CREATURECROPTRAMPLE,
+    CROPTRAMPLE,
+    NATURALSTRUCTUREGROW,
+    GRASSGROWTH,
+    MYCELIUMSPREAD,
+    VINEGROWTH,
+    DRIPSTONEGROWTH,
+    MUSHROOMSPREAD,
+    BAMBOOGROWTH,
+    WITHER(true),
+    WITHER_SKULL(true),
+    BONEMEALSTRUCTUREGROW,
+    WORLDEDIT,
+    TNTMINECARTEXPLOSION(true),
+    ENDERCRYSTALEXPLOSION(true),
+    BEDEXPLOSION(true),
+    DRAGONEGGTELEPORT(true),
+    DAYLIGHTDETECTORINTERACT,
+    LECTERNBOOKCHANGE(true),
+    SCAFFOLDING(true),
+    OXIDIZATION,
+    SCULKSPREAD(true),
+    SHULKER_BOX_CONTENT,
+    RESPAWNANCHOREXPLOSION(true),
+    PLAYER_COMMANDS,
+    COMMANDBLOCK_COMMANDS,
+    CONSOLE_COMMANDS;
 
     public static final int length = Logging.values().length;
     private final boolean defaultEnabled;

src/main/java/de/diddiz/LogBlock/LookupCacheElement.java

@@ -1,9 +1,18 @@
 package de.diddiz.LogBlock;
 
+import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Location;
 
 public interface LookupCacheElement {
     public Location getLocation();
 
-    public String getMessage();
+    public default BaseComponent[] getLogMessage() {
+        return getLogMessage(-1);
+    }
+
+    public BaseComponent[] getLogMessage(int entry);
+
+    public default int getNumChanges() {
+        return 1;
+    }
 }

src/main/java/de/diddiz/LogBlock/LookupCacheElementFactory.java

@@ -26,6 +26,12 @@ public class LookupCacheElementFactory {
                 return new SummedKills(rs, params, spaceFactor);
             }
         }
+        if (params.bct == BlockChangeType.ENTITIES || params.bct == BlockChangeType.ENTITIES_CREATED || params.bct == BlockChangeType.ENTITIES_KILLED) {
+            if (params.sum == SummarizationMode.NONE) {
+                return new EntityChange(rs, params);
+            }
+            return new SummedEntityChanges(rs, params, spaceFactor);
+        }
         if (params.sum == SummarizationMode.NONE) {
             return new BlockChange(rs, params);
         }

src/main/java/de/diddiz/LogBlock/MaterialConverter.java

@@ -0,0 +1,256 @@
+package de.diddiz.LogBlock;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.logging.Level;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+
+public class MaterialConverter {
+    private static String[] idToMaterial = new String[10];
+    private static HashMap<String, Integer> materialToID = new HashMap<>();
+    private static int nextMaterialId;
+
+    private static String[] idToBlockState = new String[10];
+    private static HashMap<String, Integer> blockStateToID = new HashMap<>();
+    private static int nextBlockStateId;
+
+    private static HashMap<String, Material> materialKeyToMaterial = new HashMap<>();
+
+    static {
+        for (Material m : Material.values()) {
+            materialKeyToMaterial.put(m.getKey().toString(), m);
+        }
+    }
+
+    public synchronized static Integer getExistingMaterialId(BlockData blockData) {
+        return blockData == null ? null : getExistingMaterialId(blockData.getMaterial());
+    }
+
+    public synchronized static Integer getExistingMaterialId(Material material) {
+        if (material == null) {
+            return null;
+        }
+        String materialString = material.getKey().toString();
+        return materialToID.get(materialString);
+    }
+
+    public synchronized static int getOrAddMaterialId(BlockData blockData) {
+        return getOrAddMaterialId(blockData == null ? Material.AIR : blockData.getMaterial());
+    }
+
+    public synchronized static int getOrAddMaterialId(Material material) {
+        if (material == null) {
+            material = Material.AIR;
+        }
+        String materialString = material.getKey().toString();
+        Integer key = materialToID.get(materialString);
+        int tries = 0;
+        while (key == null && tries < 10) {
+            tries++;
+            key = nextMaterialId;
+            Connection conn = LogBlock.getInstance().getConnection();
+            try {
+                conn.setAutoCommit(false);
+                PreparedStatement smt = conn.prepareStatement("INSERT IGNORE INTO `lb-materials` (id, name) VALUES (?, ?)");
+                smt.setInt(1, key);
+                smt.setString(2, materialString);
+                boolean couldAdd = smt.executeUpdate() > 0;
+                conn.commit();
+                smt.close();
+                if (couldAdd) {
+                    internalAddMaterial(key, materialString);
+                } else {
+                    initializeMaterials(conn);
+                }
+            } catch (Exception e) {
+                LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not update lb-materials", e);
+                reinitializeMaterialsCatchException();
+                if (tries == 10) {
+                    throw new RuntimeException(e);
+                }
+            } finally {
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    // ignored
+                }
+            }
+            key = materialToID.get(materialString);
+        }
+        return key.intValue();
+    }
+
+    public synchronized static Integer getExistingBlockStateId(BlockData blockData) {
+        if (blockData == null) {
+            return -1;
+        }
+        String blockDataString = blockData.getAsString();
+        int dataPart = blockDataString.indexOf("[");
+        if (dataPart < 0) {
+            return -1;
+        }
+        String materialString = blockDataString.substring(dataPart);
+        return blockStateToID.get(materialString);
+    }
+
+    public synchronized static int getOrAddBlockStateId(BlockData blockData) {
+        if (blockData == null) {
+            return -1;
+        }
+        String blockDataString = blockData.getAsString();
+        int dataPart = blockDataString.indexOf("[");
+        if (dataPart < 0) {
+            return -1;
+        }
+        String materialString = blockDataString.substring(dataPart);
+        Integer key = blockStateToID.get(materialString);
+        int tries = 0;
+        while (key == null && tries < 10) {
+            tries++;
+            key = nextBlockStateId;
+            Connection conn = LogBlock.getInstance().getConnection();
+            try {
+                conn.setAutoCommit(false);
+                PreparedStatement smt = conn.prepareStatement("INSERT IGNORE INTO `lb-blockstates` (id, name) VALUES (?, ?)");
+                smt.setInt(1, key);
+                smt.setString(2, materialString);
+                boolean couldAdd = smt.executeUpdate() > 0;
+                conn.commit();
+                smt.close();
+                if (couldAdd) {
+                    internalAddBlockState(key, materialString);
+                } else {
+                    initializeMaterials(conn);
+                }
+            } catch (Exception e) {
+                LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not update lb-blockstates", e);
+                reinitializeMaterialsCatchException();
+                if (tries == 10) {
+                    throw new RuntimeException(e);
+                }
+            } finally {
+                try {
+                    conn.close();
+                } catch (SQLException e) {
+                    // ignored
+                }
+            }
+            key = blockStateToID.get(materialString);
+        }
+        return key.intValue();
+    }
+
+    public synchronized static BlockData getBlockData(int materialId, int blockStateId) {
+        String material = materialId >= 0 && materialId < idToMaterial.length ? idToMaterial[materialId] : null;
+        if (material == null) {
+            return null;
+        }
+        if (blockStateId >= 0 && blockStateId < idToBlockState.length && idToBlockState[blockStateId] != null) {
+            material = material + updateBlockState(material, idToBlockState[blockStateId]);
+        }
+        try {
+            return Bukkit.createBlockData(material);
+        } catch (IllegalArgumentException ignored) {
+            // fall back to create the default block data for the material
+            try {
+                return Bukkit.createBlockData(idToMaterial[materialId]);
+            } catch (IllegalArgumentException ignored2) {
+                return null;
+            }
+        }
+    }
+
+    public synchronized static Material getMaterial(int materialId) {
+        return materialId >= 0 && materialId < idToMaterial.length ? materialKeyToMaterial.get(idToMaterial[materialId]) : null;
+    }
+
+    private static void reinitializeMaterialsCatchException() {
+        Connection conn = LogBlock.getInstance().getConnection();
+        try {
+            initializeMaterials(conn);
+        } catch (Exception e) {
+            LogBlock.getInstance().getLogger().log(Level.SEVERE, "Could not reinitialize lb-materials", e);
+        } finally {
+            try {
+                conn.close();
+            } catch (Exception e) {
+                // ignored
+            }
+        }
+    }
+
+    protected synchronized static void initializeMaterials(Connection connection) throws SQLException {
+        Statement smt = connection.createStatement();
+        ResultSet rs = smt.executeQuery("SELECT id, name FROM `lb-materials`");
+        while (rs.next()) {
+            int key = rs.getInt(1);
+            String materialString = rs.getString(2);
+            internalAddMaterial(key, materialString);
+        }
+        rs.close();
+        rs = smt.executeQuery("SELECT id, name FROM `lb-blockstates`");
+        while (rs.next()) {
+            int key = rs.getInt(1);
+            String materialString = rs.getString(2);
+            internalAddBlockState(key, materialString);
+        }
+        rs.close();
+        smt.close();
+        connection.close();
+    }
+
+    private static void internalAddMaterial(int key, String materialString) {
+        materialToID.put(materialString, key);
+        int length = idToMaterial.length;
+        while (length <= key) {
+            length = (length * 3 / 2) + 5;
+        }
+        if (length > idToMaterial.length) {
+            idToMaterial = Arrays.copyOf(idToMaterial, length);
+        }
+        idToMaterial[key] = materialString;
+        if (nextMaterialId <= key) {
+            nextMaterialId = key + 1;
+        }
+    }
+
+    private static void internalAddBlockState(int key, String materialString) {
+        blockStateToID.put(materialString, key);
+        int length = idToBlockState.length;
+        while (length <= key) {
+            length = (length * 3 / 2) + 5;
+        }
+        if (length > idToBlockState.length) {
+            idToBlockState = Arrays.copyOf(idToBlockState, length);
+        }
+        idToBlockState[key] = materialString;
+        if (nextBlockStateId <= key) {
+            nextBlockStateId = key + 1;
+        }
+    }
+
+    private static String updateBlockState(String material, String blockState) {
+        // since 1.16
+        if (material.endsWith("_wall")) {
+            if (blockState.contains("east=false") || blockState.contains("east=true")) {
+                blockState = blockState.replace("east=false", "east=none");
+                blockState = blockState.replace("west=false", "west=none");
+                blockState = blockState.replace("north=false", "north=none");
+                blockState = blockState.replace("south=false", "south=none");
+                blockState = blockState.replace("east=true", "east=low");
+                blockState = blockState.replace("west=true", "west=low");
+                blockState = blockState.replace("north=true", "north=low");
+                blockState = blockState.replace("south=true", "south=low");
+            }
+        }
+        return blockState;
+    }
+}

src/main/java/de/diddiz/LogBlock/Metrics.java

@@ -1,750 +0,0 @@
-/*
- * Copyright 2011-2013 Tyler Blair. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and contributors and should not be interpreted as representing official policies,
- * either expressed or implied, of anybody else.
- */
-package de.diddiz.LogBlock;
-
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.io.*;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-public class Metrics {
-
-    /**
-     * The current revision number
-     */
-    private final static int REVISION = 7;
-
-    /**
-     * The base url of the metrics domain
-     */
-    private static final String BASE_URL = "http://report.mcstats.org";
-
-    /**
-     * The url used to report a server's status
-     */
-    private static final String REPORT_URL = "/plugin/%s";
-
-    /**
-     * Interval of time to ping (in minutes)
-     */
-    private static final int PING_INTERVAL = 15;
-
-    /**
-     * The plugin this metrics submits for
-     */
-    private final Plugin plugin;
-
-    /**
-     * All of the custom graphs to submit to metrics
-     */
-    private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
-
-    /**
-     * The plugin configuration file
-     */
-    private final YamlConfiguration configuration;
-
-    /**
-     * The plugin configuration file
-     */
-    private final File configurationFile;
-
-    /**
-     * Unique server id
-     */
-    private final String guid;
-
-    /**
-     * Debug mode
-     */
-    private final boolean debug;
-
-    /**
-     * Lock for synchronization
-     */
-    private final Object optOutLock = new Object();
-
-    /**
-     * The scheduled task
-     */
-    private volatile BukkitTask task = null;
-
-    public Metrics(final Plugin plugin) throws IOException {
-        if (plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null");
-        }
-
-        this.plugin = plugin;
-
-        // load the config
-        configurationFile = getConfigFile();
-        configuration = YamlConfiguration.loadConfiguration(configurationFile);
-
-        // add some defaults
-        configuration.addDefault("opt-out", false);
-        configuration.addDefault("guid", UUID.randomUUID().toString());
-        configuration.addDefault("debug", false);
-
-        // Do we need to create the file?
-        if (configuration.get("guid", null) == null) {
-            configuration.options().header("http://mcstats.org").copyDefaults(true);
-            configuration.save(configurationFile);
-        }
-
-        // Load the guid then
-        guid = configuration.getString("guid");
-        debug = configuration.getBoolean("debug", false);
-    }
-
-    /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
-     * website. Plotters can be added to the graph object returned.
-     *
-     * @param name The name of the graph
-     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-     */
-    public Graph createGraph(final String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Graph name cannot be null");
-        }
-
-        // Construct the graph object
-        final Graph graph = new Graph(name);
-
-        // Now we can add our graph
-        graphs.add(graph);
-
-        // and return back
-        return graph;
-    }
-
-    /**
-     * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
-     *
-     * @param graph The name of the graph
-     */
-    public void addGraph(final Graph graph) {
-        if (graph == null) {
-            throw new IllegalArgumentException("Graph cannot be null");
-        }
-
-        graphs.add(graph);
-    }
-
-    /**
-     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
-     * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
-     * ticks.
-     *
-     * @return True if statistics measuring is running, otherwise false.
-     */
-    public boolean start() {
-        synchronized (optOutLock) {
-            // Did we opt out?
-            if (isOptOut()) {
-                return false;
-            }
-
-            // Is metrics already running?
-            if (task != null) {
-                return true;
-            }
-
-            // Begin hitting the server with glorious data
-            task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
-
-                private boolean firstPost = true;
-
-                public void run() {
-                    try {
-                        // This has to be synchronized or it can collide with the disable method.
-                        synchronized (optOutLock) {
-                            // Disable Task, if it is running and the server owner decided to opt-out
-                            if (isOptOut() && task != null) {
-                                task.cancel();
-                                task = null;
-                                // Tell all plotters to stop gathering information.
-                                for (Graph graph : graphs) {
-                                    graph.onOptOut();
-                                }
-                            }
-                        }
-
-                        // We use the inverse of firstPost because if it is the first time we are posting,
-                        // it is not a interval ping, so it evaluates to FALSE
-                        // Each time thereafter it will evaluate to TRUE, i.e PING!
-                        postPlugin(!firstPost);
-
-                        // After the first post we set firstPost to false
-                        // Each post thereafter will be a ping
-                        firstPost = false;
-                    } catch (IOException e) {
-                        if (debug) {
-                            Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
-                        }
-                    }
-                }
-            }, 0, PING_INTERVAL * 1200);
-
-            return true;
-        }
-    }
-
-    /**
-     * Has the server owner denied plugin metrics?
-     *
-     * @return true if metrics should be opted out of it
-     */
-    public boolean isOptOut() {
-        synchronized (optOutLock) {
-            try {
-                // Reload the metrics file
-                configuration.load(getConfigFile());
-            } catch (IOException ex) {
-                if (debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            } catch (InvalidConfigurationException ex) {
-                if (debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            }
-            return configuration.getBoolean("opt-out", false);
-        }
-    }
-
-    /**
-     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
-     *
-     * @throws java.io.IOException
-     */
-    public void enable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if (isOptOut()) {
-                configuration.set("opt-out", false);
-                configuration.save(configurationFile);
-            }
-
-            // Enable Task, if it is not running
-            if (task == null) {
-                start();
-            }
-        }
-    }
-
-    /**
-     * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
-     *
-     * @throws java.io.IOException
-     */
-    public void disable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if (!isOptOut()) {
-                configuration.set("opt-out", true);
-                configuration.save(configurationFile);
-            }
-
-            // Disable Task, if it is running
-            if (task != null) {
-                task.cancel();
-                task = null;
-            }
-        }
-    }
-
-    /**
-     * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
-     *
-     * @return the File object for the config file
-     */
-    public File getConfigFile() {
-        // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
-        // is to abuse the plugin object we already have
-        // plugin.getDataFolder() => base/plugins/PluginA/
-        // pluginsFolder => base/plugins/
-        // The base is not necessarily relative to the startup directory.
-        File pluginsFolder = plugin.getDataFolder().getParentFile();
-
-        // return => base/plugins/PluginMetrics/config.yml
-        return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
-    }
-
-    /**
-     * Generic method that posts a plugin to the metrics website
-     */
-    private void postPlugin(final boolean isPing) throws IOException {
-        // Server software specific section
-        PluginDescriptionFile description = plugin.getDescription();
-        String pluginName = description.getName();
-        boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-        String pluginVersion = description.getVersion();
-        String serverVersion = Bukkit.getVersion();
-        int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
-
-        // END server software specific section -- all code below does not use any code outside of this class / Java
-
-        // Construct the post data
-        StringBuilder json = new StringBuilder(1024);
-        json.append('{');
-
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        appendJSONPair(json, "guid", guid);
-        appendJSONPair(json, "plugin_version", pluginVersion);
-        appendJSONPair(json, "server_version", serverVersion);
-        appendJSONPair(json, "players_online", Integer.toString(playersOnline));
-
-        // New data as of R6
-        String osname = System.getProperty("os.name");
-        String osarch = System.getProperty("os.arch");
-        String osversion = System.getProperty("os.version");
-        String java_version = System.getProperty("java.version");
-        int coreCount = Runtime.getRuntime().availableProcessors();
-
-        // normalize os arch .. amd64 -> x86_64
-        if (osarch.equals("amd64")) {
-            osarch = "x86_64";
-        }
-
-        appendJSONPair(json, "osname", osname);
-        appendJSONPair(json, "osarch", osarch);
-        appendJSONPair(json, "osversion", osversion);
-        appendJSONPair(json, "cores", Integer.toString(coreCount));
-        appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0");
-        appendJSONPair(json, "java_version", java_version);
-
-        // If we're pinging, append it
-        if (isPing) {
-            appendJSONPair(json, "ping", "1");
-        }
-
-        if (graphs.size() > 0) {
-            synchronized (graphs) {
-                json.append(',');
-                json.append('"');
-                json.append("graphs");
-                json.append('"');
-                json.append(':');
-                json.append('{');
-
-                boolean firstGraph = true;
-
-                final Iterator<Graph> iter = graphs.iterator();
-
-                while (iter.hasNext()) {
-                    Graph graph = iter.next();
-
-                    StringBuilder graphJson = new StringBuilder();
-                    graphJson.append('{');
-
-                    for (Plotter plotter : graph.getPlotters()) {
-                        appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
-                    }
-
-                    graphJson.append('}');
-
-                    if (!firstGraph) {
-                        json.append(',');
-                    }
-
-                    json.append(escapeJSON(graph.getName()));
-                    json.append(':');
-                    json.append(graphJson);
-
-                    firstGraph = false;
-                }
-
-                json.append('}');
-            }
-        }
-
-        // close json
-        json.append('}');
-
-        // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
-
-        // Connect to the website
-        URLConnection connection;
-
-        // Mineshafter creates a socks proxy, so we can safely bypass it
-        // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
-            connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
-            connection = url.openConnection();
-        }
-
-
-        byte[] uncompressed = json.toString().getBytes();
-        byte[] compressed = gzip(json.toString());
-
-        // Headers
-        connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
-        connection.addRequestProperty("Content-Type", "application/json");
-        connection.addRequestProperty("Content-Encoding", "gzip");
-        connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
-        connection.addRequestProperty("Accept", "application/json");
-        connection.addRequestProperty("Connection", "close");
-
-        connection.setDoOutput(true);
-
-        if (debug) {
-            System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
-        }
-
-        // Write the data
-        OutputStream os = connection.getOutputStream();
-        os.write(compressed);
-        os.flush();
-
-        // Now read the response
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
-
-        // close resources
-        os.close();
-        reader.close();
-
-        if (response == null || response.startsWith("ERR") || response.startsWith("7")) {
-            if (response == null) {
-                response = "null";
-            } else if (response.startsWith("7")) {
-                response = response.substring(response.startsWith("7,") ? 2 : 1);
-            }
-
-            throw new IOException(response);
-        } else {
-            // Is this the first update this hour?
-            if (response.equals("1") || response.contains("This is your first update this hour")) {
-                synchronized (graphs) {
-                    final Iterator<Graph> iter = graphs.iterator();
-
-                    while (iter.hasNext()) {
-                        final Graph graph = iter.next();
-
-                        for (Plotter plotter : graph.getPlotters()) {
-                            plotter.reset();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * GZip compress a string of bytes
-     *
-     * @param input
-     * @return
-     */
-    public static byte[] gzip(String input) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        GZIPOutputStream gzos = null;
-
-        try {
-            gzos = new GZIPOutputStream(baos);
-            gzos.write(input.getBytes("UTF-8"));
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (gzos != null) {
-                try {
-                    gzos.close();
-                } catch (IOException ignore) {
-                }
-            }
-        }
-
-        return baos.toByteArray();
-    }
-
-    /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-     *
-     * @return true if mineshafter is installed on the server
-     */
-    private boolean isMineshafterPresent() {
-        try {
-            Class.forName("mineshafter.MineServer");
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Appends a json encoded key/value pair to the given string builder.
-     *
-     * @param json
-     * @param key
-     * @param value
-     * @throws UnsupportedEncodingException
-     */
-    private static void appendJSONPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException {
-        boolean isValueNumeric = false;
-
-        try {
-            if (value.equals("0") || !value.endsWith("0")) {
-                Double.parseDouble(value);
-                isValueNumeric = true;
-            }
-        } catch (NumberFormatException e) {
-            isValueNumeric = false;
-        }
-
-        if (json.charAt(json.length() - 1) != '{') {
-            json.append(',');
-        }
-
-        json.append(escapeJSON(key));
-        json.append(':');
-
-        if (isValueNumeric) {
-            json.append(value);
-        } else {
-            json.append(escapeJSON(value));
-        }
-    }
-
-    /**
-     * Escape a string to create a valid JSON string
-     *
-     * @param text
-     * @return
-     */
-    private static String escapeJSON(String text) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append('"');
-        for (int index = 0; index < text.length(); index++) {
-            char chr = text.charAt(index);
-
-            switch (chr) {
-                case '"':
-                case '\\':
-                    builder.append('\\');
-                    builder.append(chr);
-                    break;
-                case '\b':
-                    builder.append("\\b");
-                    break;
-                case '\t':
-                    builder.append("\\t");
-                    break;
-                case '\n':
-                    builder.append("\\n");
-                    break;
-                case '\r':
-                    builder.append("\\r");
-                    break;
-                default:
-                    if (chr < ' ') {
-                        String t = "000" + Integer.toHexString(chr);
-                        builder.append("\\u" + t.substring(t.length() - 4));
-                    } else {
-                        builder.append(chr);
-                    }
-                    break;
-            }
-        }
-        builder.append('"');
-
-        return builder.toString();
-    }
-
-    /**
-     * Encode text as UTF-8
-     *
-     * @param text the text to encode
-     * @return the encoded text, as UTF-8
-     */
-    private static String urlEncode(final String text) throws UnsupportedEncodingException {
-        return URLEncoder.encode(text, "UTF-8");
-    }
-
-    /**
-     * Represents a custom graph on the website
-     */
-    public static class Graph {
-
-        /**
-         * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
-         * rejected
-         */
-        private final String name;
-
-        /**
-         * The set of plotters that are contained within this graph
-         */
-        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-        private Graph(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Gets the graph's name
-         *
-         * @return the Graph's name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Add a plotter to the graph, which will be used to plot entries
-         *
-         * @param plotter the plotter to add to the graph
-         */
-        public void addPlotter(final Plotter plotter) {
-            plotters.add(plotter);
-        }
-
-        /**
-         * Remove a plotter from the graph
-         *
-         * @param plotter the plotter to remove from the graph
-         */
-        public void removePlotter(final Plotter plotter) {
-            plotters.remove(plotter);
-        }
-
-        /**
-         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
-         *
-         * @return an unmodifiable {@link java.util.Set} of the plotter objects
-         */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(plotters);
-        }
-
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Graph)) {
-                return false;
-            }
-
-            final Graph graph = (Graph) object;
-            return graph.name.equals(name);
-        }
-
-        /**
-         * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
-         */
-        protected void onOptOut() {
-        }
-    }
-
-    /**
-     * Interface used to collect custom data for a plugin
-     */
-    public static abstract class Plotter {
-
-        /**
-         * The plot's name
-         */
-        private final String name;
-
-        /**
-         * Construct a plotter with the default plot name
-         */
-        public Plotter() {
-            this("Default");
-        }
-
-        /**
-         * Construct a plotter with a specific plot name
-         *
-         * @param name the name of the plotter to use, which will show up on the website
-         */
-        public Plotter(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the current value for the plotted point. Since this function defers to an external function it may or may
-         * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
-         * from any thread so care should be taken when accessing resources that need to be synchronized.
-         *
-         * @return the current value for the point to be plotted.
-         */
-        public abstract int getValue();
-
-        /**
-         * Get the column name for the plotted point
-         *
-         * @return the plotted point's column name
-         */
-        public String getColumnName() {
-            return name;
-        }
-
-        /**
-         * Called after the website graphs have been updated
-         */
-        public void reset() {
-        }
-
-        @Override
-        public int hashCode() {
-            return getColumnName().hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Plotter)) {
-                return false;
-            }
-
-            final Plotter plotter = (Plotter) object;
-            return plotter.name.equals(name) && plotter.getValue() == getValue();
-        }
-    }
-}

src/main/java/de/diddiz/LogBlock/Session.java

@@ -10,14 +10,14 @@ import static de.diddiz.LogBlock.config.Config.toolsByType;
 import static org.bukkit.Bukkit.getServer;
 
 public class Session {
-    private static final Map<String, Session> sessions = new HashMap<String, Session>();
+    private static final Map<String, Session> sessions = new HashMap<>();
     public QueryParams lastQuery = null;
     public LookupCacheElement[] lookupCache = null;
     public int page = 1;
     public Map<Tool, ToolData> toolData;
 
     private Session(Player player) {
-        toolData = new HashMap<Tool, ToolData>();
+        toolData = new HashMap<>();
         final LogBlock logblock = LogBlock.getInstance();
         if (player != null) {
             for (final Tool tool : toolsByType.values()) {

src/main/java/de/diddiz/LogBlock/SummedBlockChanges.java

@@ -1,16 +1,18 @@
 package de.diddiz.LogBlock;
 
-import de.diddiz.LogBlock.QueryParams.SummarizationMode;
-import org.bukkit.Location;
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
 
+import de.diddiz.LogBlock.QueryParams.SummarizationMode;
+import de.diddiz.LogBlock.util.MessagingUtil;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import static de.diddiz.util.MaterialName.materialName;
-import static de.diddiz.util.Utils.spaces;
+import java.util.Objects;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
 
 public class SummedBlockChanges implements LookupCacheElement {
-    private final String group;
+    private final int type;
     private final int created, destroyed;
     private final float spaceFactor;
     private final Actor actor;
@@ -18,7 +20,7 @@ public class SummedBlockChanges implements LookupCacheElement {
     public SummedBlockChanges(ResultSet rs, QueryParams p, float spaceFactor) throws SQLException {
         // Actor currently useless here as we don't yet output UUID in results anywhere
         actor = p.sum == SummarizationMode.PLAYERS ? new Actor(rs) : null;
-        group = actor == null ? materialName(rs.getInt("type")) : actor.getName();
+        type = p.sum == SummarizationMode.TYPES ? rs.getInt("type") : 0;
         created = rs.getInt("created");
         destroyed = rs.getInt("destroyed");
         this.spaceFactor = spaceFactor;
@@ -30,7 +32,12 @@ public class SummedBlockChanges implements LookupCacheElement {
     }
 
     @Override
-    public String getMessage() {
-        return created + spaces((int) ((10 - String.valueOf(created).length()) / spaceFactor)) + destroyed + spaces((int) ((10 - String.valueOf(destroyed).length()) / spaceFactor)) + group;
+    public BaseComponent[] getLogMessage(int entry) {
+        return MessagingUtil.formatSummarizedChanges(created, destroyed, actor != null ? new TextComponent(actor.getName()) : prettyMaterial(Objects.toString(MaterialConverter.getMaterial(type))), 10, 10, spaceFactor);
+    }
+
+    @Override
+    public int getNumChanges() {
+        return created + destroyed;
     }
 }

src/main/java/de/diddiz/LogBlock/SummedEntityChanges.java

@@ -0,0 +1,44 @@
+package de.diddiz.LogBlock;
+
+import static de.diddiz.LogBlock.util.MessagingUtil.prettyMaterial;
+
+import de.diddiz.LogBlock.QueryParams.SummarizationMode;
+import de.diddiz.LogBlock.util.MessagingUtil;
+import org.bukkit.Location;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Objects;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+
+public class SummedEntityChanges implements LookupCacheElement {
+    private final int type;
+    private final int created, destroyed;
+    private final float spaceFactor;
+    private final Actor actor;
+
+    public SummedEntityChanges(ResultSet rs, QueryParams p, float spaceFactor) throws SQLException {
+        // Actor currently useless here as we don't yet output UUID in results anywhere
+        actor = p.sum == SummarizationMode.PLAYERS ? new Actor(rs) : null;
+        type = p.sum == SummarizationMode.TYPES ? rs.getInt("entitytypeid") : 0;
+        created = rs.getInt("created");
+        destroyed = rs.getInt("destroyed");
+        this.spaceFactor = spaceFactor;
+    }
+
+    @Override
+    public Location getLocation() {
+        return null;
+    }
+
+    @Override
+    public BaseComponent[] getLogMessage(int entry) {
+        return MessagingUtil.formatSummarizedChanges(created, destroyed, actor != null ? new TextComponent(actor.getName()) : prettyMaterial(Objects.toString(EntityTypeConverter.getEntityType(type))), 10, 10, spaceFactor);
+    }
+
+    @Override
+    public int getNumChanges() {
+        return created + destroyed;
+    }
+}

src/main/java/de/diddiz/LogBlock/SummedKills.java

@@ -1,11 +1,11 @@
 package de.diddiz.LogBlock;
 
-import org.bukkit.Location;
-
+import de.diddiz.LogBlock.util.MessagingUtil;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import static de.diddiz.util.Utils.spaces;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Location;
 
 public class SummedKills implements LookupCacheElement {
     private final Actor player;
@@ -25,7 +25,12 @@ public class SummedKills implements LookupCacheElement {
     }
 
     @Override
-    public String getMessage() {
-        return kills + spaces((int) ((6 - String.valueOf(kills).length()) / spaceFactor)) + killed + spaces((int) ((7 - String.valueOf(killed).length()) / spaceFactor)) + player.getName();
+    public BaseComponent[] getLogMessage(int entry) {
+        return MessagingUtil.formatSummarizedChanges(kills, killed, new TextComponent(player.getName()), 6, 7, spaceFactor);
+    }
+
+    @Override
+    public int getNumChanges() {
+        return kills + killed;
     }
 }

src/main/java/de/diddiz/LogBlock/Tool.java

@@ -1,5 +1,6 @@
 package de.diddiz.LogBlock;
 
+import org.bukkit.Material;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.util.List;
@@ -9,13 +10,15 @@ public class Tool {
     public final List<String> aliases;
     public final ToolBehavior leftClickBehavior, rightClickBehavior;
     public final boolean defaultEnabled;
-    public final int item;
+    public final Material item;
     public final boolean canDrop;
     public final QueryParams params;
     public final ToolMode mode;
     public final PermissionDefault permissionDefault;
+    public final boolean removeOnDisable;
+    public final boolean dropToDisable;
 
-    public Tool(String name, List<String> aliases, ToolBehavior leftClickBehavior, ToolBehavior rightClickBehavior, boolean defaultEnabled, int item, boolean canDrop, QueryParams params, ToolMode mode, PermissionDefault permissionDefault) {
+    public Tool(String name, List<String> aliases, ToolBehavior leftClickBehavior, ToolBehavior rightClickBehavior, boolean defaultEnabled, Material item, boolean canDrop, QueryParams params, ToolMode mode, PermissionDefault permissionDefault, boolean removeOnDisable, boolean dropToDisable) {
         this.name = name;
         this.aliases = aliases;
         this.leftClickBehavior = leftClickBehavior;
@@ -26,5 +29,7 @@ public class Tool {
         this.params = params;
         this.mode = mode;
         this.permissionDefault = permissionDefault;
+        this.removeOnDisable = removeOnDisable;
+        this.dropToDisable = dropToDisable;
     }
 }

src/main/java/de/diddiz/LogBlock/ToolBehavior.java

@@ -1,5 +1,7 @@
 package de.diddiz.LogBlock;
 
 public enum ToolBehavior {
-    TOOL, BLOCK, NONE
+    TOOL,
+    BLOCK,
+    NONE
 }

src/main/java/de/diddiz/LogBlock/ToolMode.java

@@ -1,7 +1,11 @@
 package de.diddiz.LogBlock;
 
 public enum ToolMode {
-    CLEARLOG("logblock.clearlog"), LOOKUP("logblock.lookup"), REDO("logblock.rollback"), ROLLBACK("logblock.rollback"), WRITELOGFILE("logblock.rollback");
+    CLEARLOG("logblock.clearlog"),
+    LOOKUP("logblock.lookup"),
+    REDO("logblock.rollback"),
+    ROLLBACK("logblock.rollback"),
+    WRITELOGFILE("logblock.rollback");
     private final String permission;
 
     private ToolMode(String permission) {

src/main/java/de/diddiz/LogBlock/WorldEditor.java

@@ -7,32 +7,52 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
-import org.bukkit.block.Sign;
+import org.bukkit.block.Container;
+import org.bukkit.block.data.Bisected.Half;
+import org.bukkit.block.data.Bisected;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Bed;
+import org.bukkit.block.data.type.Chest;
+import org.bukkit.block.data.type.Bed.Part;
+import org.bukkit.block.data.type.Piston;
+import org.bukkit.block.data.type.PistonHead;
+import org.bukkit.block.data.type.TechnicalPiston.Type;
 import org.bukkit.command.CommandSender;
-import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Bee;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Bed;
-import org.bukkit.material.PistonBaseMaterial;
-import org.bukkit.material.PistonExtensionMaterial;
 
+import de.diddiz.LogBlock.QueryParams.Order;
+import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import de.diddiz.LogBlock.util.Utils;
+import de.diddiz.LogBlock.worldedit.WorldEditHelper;
 import java.io.File;
 import java.io.PrintWriter;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.UUID;
 import java.util.logging.Level;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
 
 import static de.diddiz.LogBlock.config.Config.dontRollback;
 import static de.diddiz.LogBlock.config.Config.replaceAnyway;
-import static de.diddiz.util.BukkitUtils.*;
-import static de.diddiz.util.MaterialName.materialName;
-import static org.bukkit.Bukkit.getLogger;
+import static de.diddiz.LogBlock.util.BukkitUtils.*;
 
 public class WorldEditor implements Runnable {
     private final LogBlock logblock;
-    private final Queue<Edit> edits = new LinkedBlockingQueue<Edit>();
+    private final ArrayList<Edit> edits = new ArrayList<>();
     private final World world;
 
     /**
@@ -43,10 +63,18 @@ public class WorldEditor implements Runnable {
     private int successes = 0, blacklistCollisions = 0;
     private long elapsedTime = 0;
     public LookupCacheElement[] errors;
+    private boolean forceReplace;
+    private HashMap<Integer, UUID> uuidReplacements = new HashMap<>();
+    private boolean started = false;
 
     public WorldEditor(LogBlock logblock, World world) {
+        this(logblock, world, false);
+    }
+
+    public WorldEditor(LogBlock logblock, World world, boolean forceReplace) {
         this.logblock = logblock;
         this.world = world;
+        this.forceReplace = forceReplace;
     }
 
     public int getSize() {
@@ -65,13 +93,36 @@ public class WorldEditor implements Runnable {
         return blacklistCollisions;
     }
 
-
     public void setSender(CommandSender sender) {
         this.sender = sender;
     }
 
-    public void queueEdit(int x, int y, int z, int replaced, int type, byte data, String signtext, short itemType, short itemAmount, short itemData) {
-        edits.add(new Edit(0, new Location(world, x, y, z), null, replaced, type, data, signtext, new ChestAccess(itemType, itemAmount, itemData)));
+    public void queueBlockEdit(long time, int x, int y, int z, int replaced, int replaceData, byte[] replacedState, int type, int typeData, byte[] typeState, ChestAccess item) {
+        if (started) {
+            throw new IllegalStateException("Already started");
+        }
+        edits.add(new BlockEdit(time, new Location(world, x, y, z), null, replaced, replaceData, replacedState, type, typeData, typeState, item));
+    }
+
+    public void queueEntityEdit(ResultSet rs, QueryParams p, boolean rollback) throws SQLException {
+        if (started) {
+            throw new IllegalStateException("Already started");
+        }
+        edits.add(new EntityEdit(rs, p, rollback));
+    }
+
+    public void reverseRowOrder() {
+        if (started) {
+            throw new IllegalStateException("Already started");
+        }
+        Collections.reverse(edits);
+    }
+
+    public void sortRows(QueryParams.Order order) {
+        if (started) {
+            throw new IllegalStateException("Already started");
+        }
+        edits.sort(new EditComparator(order));
     }
 
     public long getElapsedTime() {
@@ -79,6 +130,10 @@ public class WorldEditor implements Runnable {
     }
 
     synchronized public void start() throws Exception {
+        if (started) {
+            throw new IllegalStateException("Already started");
+        }
+        started = true;
         final long start = System.currentTimeMillis();
         taskID = logblock.getServer().getScheduler().scheduleSyncRepeatingTask(logblock, this, 0, 1);
         if (taskID == -1) {
@@ -94,23 +149,25 @@ public class WorldEditor implements Runnable {
 
     @Override
     public synchronized void run() {
-        final List<WorldEditorException> errorList = new ArrayList<WorldEditorException>();
+        final List<WorldEditorException> errorList = new ArrayList<>();
         int counter = 0;
         float size = edits.size();
         while (!edits.isEmpty() && counter < 100) {
             try {
-                switch (edits.poll().perform()) {
+                switch (edits.remove(edits.size() - 1).perform()) {
                     case SUCCESS:
                         successes++;
                         break;
                     case BLACKLISTED:
                         blacklistCollisions++;
                         break;
+                    case NO_ACTION:
+                        break;
                 }
             } catch (final WorldEditorException ex) {
                 errorList.add(ex);
             } catch (final Exception ex) {
-                getLogger().log(Level.WARNING, "[WorldEditor] Exeption: ", ex);
+                logblock.getLogger().log(Level.WARNING, "[WorldEditor] Exeption: ", ex);
             }
             counter++;
             if (sender != null) {
@@ -125,11 +182,15 @@ public class WorldEditor implements Runnable {
             logblock.getServer().getScheduler().cancelTask(taskID);
             if (errorList.size() > 0) {
                 try {
-                    final File file = new File("plugins/LogBlock/error/WorldEditor-" + new SimpleDateFormat("yy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()) + ".log");
-                    file.getParentFile().mkdirs();
+                    final File errorDir = new File(logblock.getDataFolder(), "error");
+                    errorDir.mkdirs();
+                    final File file = new File(errorDir, "WorldEditor-" + new SimpleDateFormat("yy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()) + ".log");
                     final PrintWriter writer = new PrintWriter(file);
-                    for (final LookupCacheElement err : errorList) {
-                        writer.println(err.getMessage());
+                    for (final WorldEditorException err : errorList) {
+                        writer.println(BaseComponent.toPlainText(err.getLogMessage()));
+                        err.printStackTrace(writer);
+                        writer.println();
+                        writer.println();
                     }
                     writer.close();
                 } catch (final Exception ex) {
@@ -140,120 +201,278 @@ public class WorldEditor implements Runnable {
         }
     }
 
-    private static enum PerformResult {
-        SUCCESS, BLACKLISTED, NO_ACTION
+    protected UUID getReplacedUUID(int entityid, UUID unreplaced) {
+        UUID replaced = uuidReplacements.get(entityid);
+        return replaced != null ? replaced : unreplaced;
     }
 
-    private class Edit extends BlockChange {
-        public Edit(long time, Location loc, Actor actor, int replaced, int type, byte data, String signtext, ChestAccess ca) {
-            super(time, loc, actor, replaced, type, data, signtext, ca);
+    public static enum PerformResult {
+        SUCCESS,
+        BLACKLISTED,
+        NO_ACTION
     }
 
-        PerformResult perform() throws WorldEditorException {
-            if (dontRollback.contains(replaced)) {
+    public interface Edit {
+        PerformResult perform() throws WorldEditorException;
+
+        public long getTime();
+    }
+
+    public class EntityEdit extends EntityChange implements Edit {
+        private boolean rollback;
+
+        public EntityEdit(ResultSet rs, QueryParams p, boolean rollback) throws SQLException {
+            super(rs, p);
+            this.rollback = rollback;
+        }
+
+        @Override
+        public long getTime() {
+            return date;
+        }
+
+        @Override
+        public PerformResult perform() throws WorldEditorException {
+            if (type == null) {
+                throw new WorldEditorException("Unkown entity type for entity " + entityUUID, loc);
+            }
+            if (changeType == (rollback ? EntityChangeType.KILL : EntityChangeType.CREATE)) {
+                // spawn entity
+                UUID uuid = getReplacedUUID(entityId, entityUUID);
+                Entity result = null;
+                YamlConfiguration deserialized = Utils.deserializeYamlConfiguration(data);
+                double x = deserialized.getDouble("x");
+                double y = deserialized.getDouble("y");
+                double z = deserialized.getDouble("z");
+                float yaw = (float) deserialized.getDouble("yaw");
+                float pitch = (float) deserialized.getDouble("pitch");
+                Location location = new Location(world, x, y, z, yaw, pitch);
+                Entity existing = BukkitUtils.loadEntityAround(location.getChunk(), uuid);
+                if (existing != null) {
+                    return PerformResult.NO_ACTION;
+                }
+                byte[] serializedWorldEditEntity = (byte[]) deserialized.get("worldedit");
+                if (serializedWorldEditEntity != null) {
+                    result = WorldEditHelper.restoreEntity(location, type, serializedWorldEditEntity);
+                }
+                if (result == null) {
+                    throw new WorldEditorException("Could not restore " + type, location);
+                } else {
+                    if (!result.getUniqueId().equals(uuid)) {
+                        logblock.getConsumer().queueEntityUUIDChange(world, entityId, result.getUniqueId());
+                        uuidReplacements.put(entityId, result.getUniqueId());
+                    }
+                }
+                return PerformResult.SUCCESS;
+            } else if (changeType == (rollback ? EntityChangeType.CREATE : EntityChangeType.KILL)) {
+                // kill entity
+                UUID uuid = getReplacedUUID(entityId, entityUUID);
+                YamlConfiguration deserialized = Utils.deserializeYamlConfiguration(data);
+                double x = deserialized.getDouble("x");
+                double y = deserialized.getDouble("y");
+                double z = deserialized.getDouble("z");
+                float yaw = (float) deserialized.getDouble("yaw");
+                float pitch = (float) deserialized.getDouble("pitch");
+                Location location = new Location(world, x, y, z, yaw, pitch);
+                Entity existing = BukkitUtils.loadEntityAround(location.getChunk(), uuid);
+                if (existing != null) {
+                    existing.remove();
+                    return PerformResult.SUCCESS;
+                }
+                return PerformResult.NO_ACTION; // the entity is not there, so we cannot do anything
+            } else if (changeType == (rollback ? EntityChangeType.REMOVEEQUIP : EntityChangeType.ADDEQUIP)) {
+                // set equip
+                UUID uuid = getReplacedUUID(entityId, entityUUID);
+                Entity existing = BukkitUtils.loadEntityAround(loc.getChunk(), uuid);
+                if (existing != null) {
+                    YamlConfiguration deserialized = Utils.deserializeYamlConfiguration(data);
+                    ItemStack item = deserialized.getItemStack("item");
+                    if (item != null && existing instanceof ItemFrame) {
+                        ItemStack old = ((ItemFrame) existing).getItem();
+                        if (old == null || old.getType() == Material.AIR) {
+                            ((ItemFrame) existing).setItem(item);
+                            return PerformResult.SUCCESS;
+                        }
+                    } else if (item != null && existing instanceof ArmorStand) {
+                        EquipmentSlot slot = EquipmentSlot.valueOf(deserialized.getString("slot"));
+                        ArmorStand stand = (ArmorStand) existing;
+                        ItemStack old = BukkitUtils.getItemInSlot(stand, slot);
+                        if (old == null || old.getType() == Material.AIR) {
+                            BukkitUtils.setItemInSlot(stand, slot, item);
+                            return PerformResult.SUCCESS;
+                        }
+                    }
+                }
+                return PerformResult.NO_ACTION; // the entity is not there, or equip does not match
+            } else if (changeType == (rollback ? EntityChangeType.ADDEQUIP : EntityChangeType.REMOVEEQUIP)) {
+                // remove equip
+                UUID uuid = getReplacedUUID(entityId, entityUUID);
+                Entity existing = BukkitUtils.loadEntityAround(loc.getChunk(), uuid);
+                if (existing != null) {
+                    YamlConfiguration deserialized = Utils.deserializeYamlConfiguration(data);
+                    ItemStack item = deserialized.getItemStack("item");
+                    if (item != null && existing instanceof ItemFrame) {
+                        ItemStack old = ((ItemFrame) existing).getItem();
+                        if (old != null && old.isSimilar(item)) {
+                            ((ItemFrame) existing).setItem(null);
+                            return PerformResult.SUCCESS;
+                        }
+                    } else if (item != null && existing instanceof ArmorStand) {
+                        EquipmentSlot slot = EquipmentSlot.valueOf(deserialized.getString("slot"));
+                        ArmorStand stand = (ArmorStand) existing;
+                        ItemStack old = BukkitUtils.getItemInSlot(stand, slot);
+                        if (old != null && old.isSimilar(item)) {
+                            BukkitUtils.setItemInSlot(stand, slot, null);
+                            return PerformResult.SUCCESS;
+                        }
+                    }
+                }
+                return PerformResult.NO_ACTION; // the entity is not there, or equip does not match
+            } else if (changeType == EntityChangeType.GET_STUNG) {
+                UUID uuid = getReplacedUUID(entityId, entityUUID);
+                Entity existing = BukkitUtils.loadEntityAround(loc.getChunk(), uuid);
+                if (existing != null && existing instanceof Bee) {
+                    ((Bee) existing).setHasStung(!rollback);
+                }
+            }
+            return PerformResult.NO_ACTION;
+        }
+    }
+
+    public class BlockEdit extends BlockChange implements Edit {
+        public BlockEdit(long time, Location loc, Actor actor, int replaced, int replaceData, byte[] replacedState, int type, int typeData, byte[] typeState, ChestAccess ca) {
+            super(time, loc, actor, replaced, replaceData, replacedState, type, typeData, typeState, ca);
+        }
+
+        @Override
+        public long getTime() {
+            return date;
+        }
+
+        @Override
+        public PerformResult perform() throws WorldEditorException {
+            BlockData replacedBlock = getBlockReplaced();
+            BlockData setBlock = getBlockSet();
+            if (replacedBlock == null || setBlock == null) {
+                throw new WorldEditorException("Could not parse the material", loc.clone());
+            }
+            // action: set to replaced
+
+            if (dontRollback.contains(replacedBlock.getMaterial())) {
                 return PerformResult.BLACKLISTED;
             }
             final Block block = loc.getBlock();
-            if (replaced == 0 && block.getTypeId() == 0) {
+            if (BukkitUtils.isEmpty(replacedBlock.getMaterial()) && BukkitUtils.isEmpty(block.getType())) {
                 return PerformResult.NO_ACTION;
             }
-            final BlockState state = block.getState();
-            if (!world.isChunkLoaded(block.getChunk())) {
-                world.loadChunk(block.getChunk());
-            }
-            if (type == replaced) {
-                if (type == 0) {
-                    if (!block.setTypeId(0)) {
-                        throw new WorldEditorException(block.getTypeId(), 0, block.getLocation());
-                    }
-                } else if (ca != null) {
-                    if (getContainerBlocks().contains(Material.getMaterial(type))) {
+            BlockState state = block.getState();
+            if (setBlock.equals(replacedBlock)) {
+                if (ca != null) {
+                    if (state instanceof Container && state.getType() == replacedBlock.getMaterial()) {
                         int leftover;
                         try {
-                            leftover = modifyContainer(state, new ItemStack(ca.itemType, -ca.itemAmount, ca.itemData));
-                            // Special-case blocks which might be double chests
-                            if (leftover > 0 && (type == 54 || type == 146)) {
-                                for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST}) {
-                                    if (block.getRelative(face).getTypeId() == type) {
-                                        leftover = modifyContainer(block.getRelative(face).getState(), new ItemStack(ca.itemType, ca.itemAmount < 0 ? leftover : -leftover, ca.itemData));
-                                    }
-                                }
-                            }
+                            leftover = modifyContainer(state, new ItemStack(ca.itemStack), !ca.remove);
                         } catch (final Exception ex) {
                             throw new WorldEditorException(ex.getMessage(), block.getLocation());
                         }
-                        if (!state.update()) {
-                            throw new WorldEditorException("Failed to update inventory of " + materialName(block.getTypeId()), block.getLocation());
-                        }
-                        if (leftover > 0 && ca.itemAmount < 0) {
-                            throw new WorldEditorException("Not enough space left in " + materialName(block.getTypeId()), block.getLocation());
-                        }
-                    }
-                } else {
-                    return PerformResult.NO_ACTION;
+                        if (leftover > 0 && ca.remove) {
+                            throw new WorldEditorException("Not enough space left in " + block.getType(), block.getLocation());
                         }
                         return PerformResult.SUCCESS;
                     }
-            if (!(equalTypes(block.getTypeId(), type) || replaceAnyway.contains(block.getTypeId()))) {
                     return PerformResult.NO_ACTION;
                 }
-            if (state instanceof InventoryHolder) {
-                ((InventoryHolder) state).getInventory().clear();
+            }
+            if (!forceReplace && !BukkitUtils.isSimilarForRollback(setBlock.getMaterial(), block.getType()) && !block.isEmpty() && !replaceAnyway.contains(block.getType())) {
+                return PerformResult.NO_ACTION;
+            }
+            if (state instanceof Container && replacedBlock.getMaterial() != block.getType()) {
+                ((Container) state).getSnapshotInventory().clear();
                 state.update();
             }
-            if (block.getTypeId() == replaced) {
-                if (block.getData() != (type == 0 ? data : (byte) 0)) {
-                    block.setData(type == 0 ? data : (byte) 0, true);
-                } else {
-                    return PerformResult.NO_ACTION;
+            block.setBlockData(replacedBlock);
+            BlockData newData = block.getBlockData();
+            if (BlockStateCodecs.hasCodec(replacedBlock.getMaterial())) {
+                state = block.getState();
+                try {
+                    BlockStateCodecs.deserialize(state, Utils.deserializeYamlConfiguration(replacedState));
+                    state.update();
+                } catch (Exception e) {
+                    throw new WorldEditorException("Failed to restore blockstate of " + block.getType() + ": " + e, block.getLocation());
                 }
-            } else if (!block.setTypeIdAndData(replaced, type == 0 ? data : (byte) 0, true)) {
-                throw new WorldEditorException(block.getTypeId(), replaced, block.getLocation());
             }
-            final int curtype = block.getTypeId();
-            if (signtext != null && (curtype == 63 || curtype == 68)) {
-                final Sign sign = (Sign) block.getState();
-                final String[] lines = signtext.split("\0", 4);
-                if (lines.length < 4) {
-                    return PerformResult.NO_ACTION;
+
+            final Material curtype = block.getType();
+            if (newData instanceof Bed) {
+                final Bed bed = (Bed) newData;
+                final Block secBlock = bed.getPart() == Part.HEAD ? block.getRelative(bed.getFacing().getOppositeFace()) : block.getRelative(bed.getFacing());
+                if (secBlock.isEmpty()) {
+                    Bed bed2 = (Bed) bed.clone();
+                    bed2.setPart(bed.getPart() == Part.HEAD ? Part.FOOT : Part.HEAD);
+                    secBlock.setBlockData(bed2);
                 }
-                for (int i = 0; i < 4; i++) {
-                    sign.setLine(i, lines[i]);
+            } else if (curtype == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(curtype) || BukkitUtils.isDoublePlant(curtype)) {
+                final Bisected firstPart = (Bisected) newData;
+                final Block secBlock = block.getRelative(firstPart.getHalf() == Half.TOP ? BlockFace.DOWN : BlockFace.UP);
+                if (secBlock.isEmpty()) {
+                    Bisected secondPart = (Bisected) firstPart.clone();
+                    secondPart.setHalf(firstPart.getHalf() == Half.TOP ? Half.BOTTOM : Half.TOP);
+                    secBlock.setBlockData(secondPart);
                 }
-                if (!sign.update()) {
-                    throw new WorldEditorException("Failed to update signtext of " + materialName(block.getTypeId()), block.getLocation());
-                }
-            } else if (curtype == 26) {
-                final Bed bed = (Bed) block.getState().getData();
-                final Block secBlock = bed.isHeadOfBed() ? block.getRelative(bed.getFacing().getOppositeFace()) : block.getRelative(bed.getFacing());
-                if (secBlock.getTypeId() == 0 && !secBlock.setTypeIdAndData(26, (byte) (bed.getData() | 8), true)) {
-                    throw new WorldEditorException(secBlock.getTypeId(), 26, secBlock.getLocation());
-                }
-            } else if ((curtype == 29 || curtype == 33) && (block.getData() & 8) > 0) {
-                final PistonBaseMaterial piston = (PistonBaseMaterial) block.getState().getData();
+            } else if ((curtype == Material.PISTON || curtype == Material.STICKY_PISTON)) {
+                Piston piston = (Piston) newData;
+                if (piston.isExtended()) {
                     final Block secBlock = block.getRelative(piston.getFacing());
-                if (secBlock.getTypeId() == 0 && !secBlock.setTypeIdAndData(34, curtype == 29 ? (byte) (block.getData() | 8) : (byte) (block.getData() & ~8), true)) {
-                    throw new WorldEditorException(secBlock.getTypeId(), 34, secBlock.getLocation());
+                    if (secBlock.isEmpty()) {
+                        PistonHead head = (PistonHead) Material.PISTON_HEAD.createBlockData();
+                        head.setFacing(piston.getFacing());
+                        head.setType(curtype == Material.PISTON ? Type.NORMAL : Type.STICKY);
+                        secBlock.setBlockData(head);
+                    }
+                }
+            } else if (curtype == Material.PISTON_HEAD) {
+                PistonHead head = (PistonHead) newData;
+                final Block secBlock = block.getRelative(head.getFacing().getOppositeFace());
+                if (secBlock.isEmpty()) {
+                    Piston piston = (Piston) (head.getType() == Type.NORMAL ? Material.PISTON : Material.STICKY_PISTON).createBlockData();
+                    piston.setFacing(head.getFacing());
+                    piston.setExtended(true);
+                    secBlock.setBlockData(piston);
+                }
+            } else if (newData instanceof Chest) {
+                Chest chest = (Chest) newData;
+                if (chest.getType() != org.bukkit.block.data.type.Chest.Type.SINGLE) {
+                    if (getConnectedChest(block) == null) {
+                        chest.setType(org.bukkit.block.data.type.Chest.Type.SINGLE);
+                        block.setBlockData(chest);
                     }
-            } else if (curtype == 34) {
-                final PistonExtensionMaterial piston = (PistonExtensionMaterial) block.getState().getData();
-                final Block secBlock = block.getRelative(piston.getFacing().getOppositeFace());
-                if (secBlock.getTypeId() == 0 && !secBlock.setTypeIdAndData(piston.isSticky() ? 29 : 33, (byte) (block.getData() | 8), true)) {
-                    throw new WorldEditorException(secBlock.getTypeId(), piston.isSticky() ? 29 : 33, secBlock.getLocation());
                 }
-            } else if (curtype == 18 && (block.getData() & 8) > 0) {
-                block.setData((byte) (block.getData() & 0xF7));
             }
             return PerformResult.SUCCESS;
         }
     }
 
+    public static class EditComparator implements Comparator<Edit> {
+        private final int mult;
+
+        public EditComparator(QueryParams.Order order) {
+            mult = order == Order.DESC ? 1 : -1;
+        }
+
+        @Override
+        public int compare(Edit edit1, Edit edit2) {
+            long time1 = edit1.getTime();
+            long time2 = edit2.getTime();
+            return time1 > time2 ? mult : time1 < time2 ? -mult : 0;
+        }
+    }
+
     @SuppressWarnings("serial")
     public static class WorldEditorException extends Exception implements LookupCacheElement {
         private final Location loc;
 
-        public WorldEditorException(int typeBefore, int typeAfter, Location loc) {
-            this("Failed to replace " + materialName(typeBefore) + " with " + materialName(typeAfter), loc);
+        public WorldEditorException(Material typeBefore, Material typeAfter, Location loc) {
+            this("Failed to replace " + typeBefore.name() + " with " + typeAfter.name(), loc);
         }
 
         public WorldEditorException(String msg, Location loc) {
@@ -265,5 +484,10 @@ public class WorldEditor implements Runnable {
         public Location getLocation() {
             return loc;
         }
+
+        @Override
+        public BaseComponent[] getLogMessage(int entry) {
+            return TextComponent.fromLegacyText(getMessage());
+        }
     }
 }

src/main/java/de/diddiz/LogBlock/WorldEditorEditFactory.java

@@ -0,0 +1,38 @@
+package de.diddiz.LogBlock;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.bukkit.inventory.ItemStack;
+
+import de.diddiz.LogBlock.QueryParams.BlockChangeType;
+import de.diddiz.LogBlock.util.Utils;
+
+public class WorldEditorEditFactory {
+    private final WorldEditor editor;
+    private final boolean rollback;
+    private final QueryParams params;
+
+    public WorldEditorEditFactory(WorldEditor editor, QueryParams params, boolean rollback) {
+        this.editor = editor;
+        this.params = params;
+        this.rollback = rollback;
+    }
+
+    public void processRow(ResultSet rs) throws SQLException {
+        if (params.bct == BlockChangeType.ENTITIES) {
+            editor.queueEntityEdit(rs, params, rollback);
+            return;
+        }
+        ChestAccess chestaccess = null;
+        ItemStack stack = Utils.loadItemStack(rs.getBytes("item"));
+        if (stack != null) {
+            chestaccess = new ChestAccess(stack, rs.getBoolean("itemremove") == rollback, rs.getInt("itemtype"));
+        }
+        if (rollback) {
+            editor.queueBlockEdit(rs.getTimestamp("date").getTime(), rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("replaced"), rs.getInt("replacedData"), rs.getBytes("replacedState"), rs.getInt("type"), rs.getInt("typeData"), rs.getBytes("typeState"), chestaccess);
+        } else {
+            editor.queueBlockEdit(rs.getTimestamp("date").getTime(), rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("type"), rs.getInt("typeData"), rs.getBytes("typeState"), rs.getInt("replaced"), rs.getInt("replacedData"), rs.getBytes("replacedState"), chestaccess);
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/addons/worldguard/WorldGuardLoggingFlagsAddon.java

@@ -0,0 +1,80 @@
+package de.diddiz.LogBlock.addons.worldguard;
+
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.association.RegionAssociable;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.flags.registry.FlagConflictException;
+import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.events.BlockChangePreLogEvent;
+import de.diddiz.LogBlock.events.EntityChangePreLogEvent;
+import java.util.logging.Level;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class WorldGuardLoggingFlagsAddon {
+    private final StateFlag LOGBLOCK_LOG_BLOCKS = new StateFlag("logblock-log-blocks", true);
+    private final StateFlag LOGBLOCK_LOG_ENTITIES = new StateFlag("logblock-log-entities", true);
+
+    private LogBlock plugin;
+    private WorldGuardPlugin worldGuard;
+
+    public WorldGuardLoggingFlagsAddon(LogBlock plugin) {
+        this.plugin = plugin;
+    }
+
+    public void onPluginLoad() {
+        registerFlags();
+    }
+
+    public void onPluginEnable() {
+        worldGuard = (WorldGuardPlugin) plugin.getServer().getPluginManager().getPlugin("WorldGuard");
+        plugin.getServer().getPluginManager().registerEvents(new LoggingListener(), plugin);
+    }
+
+    private void registerFlags() {
+        try {
+            FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
+            registry.register(LOGBLOCK_LOG_BLOCKS);
+            registry.register(LOGBLOCK_LOG_ENTITIES);
+        } catch (FlagConflictException e) {
+            plugin.getLogger().log(Level.SEVERE, "Could not initialize Flags", e);
+        }
+    }
+
+    private class LoggingListener implements Listener {
+        @EventHandler(ignoreCancelled = true)
+        public void onBlockChangePreLog(BlockChangePreLogEvent event) {
+            RegionAssociable regionAssociable = null;
+            Location location = event.getLocation();
+            Entity actorEntity = event.getOwnerActor().getEntity();
+            if (actorEntity instanceof Player) {
+                regionAssociable = worldGuard.wrapPlayer((Player) actorEntity);
+            }
+            ApplicableRegionSet set = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(location));
+            if (!set.testState(regionAssociable, LOGBLOCK_LOG_BLOCKS)) {
+                event.setCancelled(true);
+            }
+        }
+
+        @EventHandler(ignoreCancelled = true)
+        public void onEntityChangePreLog(EntityChangePreLogEvent event) {
+            RegionAssociable regionAssociable = null;
+            Location location = event.getLocation();
+            Entity actorEntity = event.getOwnerActor().getEntity();
+            if (actorEntity instanceof Player) {
+                regionAssociable = worldGuard.wrapPlayer((Player) actorEntity);
+            }
+            ApplicableRegionSet set = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(location));
+            if (!set.testState(regionAssociable, LOGBLOCK_LOG_ENTITIES)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodec.java

@@ -0,0 +1,16 @@
+package de.diddiz.LogBlock.blockstate;
+
+import net.md_5.bungee.api.chat.BaseComponent;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public interface BlockStateCodec {
+    Material[] getApplicableMaterials();
+
+    YamlConfiguration serialize(BlockState state);
+
+    void deserialize(BlockState state, YamlConfiguration conf);
+
+    BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState);
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecBanner.java

@@ -0,0 +1,70 @@
+package de.diddiz.LogBlock.blockstate;
+
+import java.util.List;
+import net.md_5.bungee.api.chat.BaseComponent;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.block.Banner;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class BlockStateCodecBanner implements BlockStateCodec {
+    @Override
+    public Material[] getApplicableMaterials() {
+        return new Material[] { Material.WHITE_BANNER, Material.ORANGE_BANNER, Material.MAGENTA_BANNER, Material.LIGHT_BLUE_BANNER, Material.YELLOW_BANNER, Material.LIME_BANNER, Material.PINK_BANNER, Material.GRAY_BANNER, Material.LIGHT_GRAY_BANNER, Material.CYAN_BANNER, Material.PURPLE_BANNER,
+                Material.BLUE_BANNER, Material.BROWN_BANNER, Material.GREEN_BANNER, Material.RED_BANNER, Material.BLACK_BANNER, Material.WHITE_WALL_BANNER, Material.ORANGE_WALL_BANNER, Material.MAGENTA_WALL_BANNER, Material.LIGHT_BLUE_WALL_BANNER, Material.YELLOW_WALL_BANNER,
+                Material.LIME_WALL_BANNER, Material.PINK_WALL_BANNER, Material.GRAY_WALL_BANNER, Material.LIGHT_GRAY_WALL_BANNER, Material.CYAN_WALL_BANNER, Material.PURPLE_WALL_BANNER, Material.BLUE_WALL_BANNER, Material.BROWN_WALL_BANNER, Material.GREEN_WALL_BANNER, Material.RED_WALL_BANNER,
+                Material.BLACK_WALL_BANNER };
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        if (state instanceof Banner) {
+            Banner banner = (Banner) state;
+            int nr = 0;
+            List<Pattern> patterns = banner.getPatterns();
+            if (!patterns.isEmpty()) {
+                YamlConfiguration conf = new YamlConfiguration();
+                ConfigurationSection patternsSection = conf.createSection("patterns");
+                for (Pattern pattern : patterns) {
+                    ConfigurationSection section = patternsSection.createSection(Integer.toString(nr));
+                    section.set("color", pattern.getColor().name());
+                    section.set("pattern", pattern.getPattern().name());
+                    nr++;
+                }
+                return conf;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof Banner) {
+            Banner banner = (Banner) state;
+            int oldPatterns = banner.getPatterns().size();
+            for (int i = 0; i < oldPatterns; i++) {
+                banner.removePattern(0);
+            }
+            ConfigurationSection patternsSection = conf == null ? null : conf.getConfigurationSection("patterns");
+            if (patternsSection != null) {
+                for (String key : patternsSection.getKeys(false)) {
+                    ConfigurationSection section = patternsSection.getConfigurationSection(key);
+                    if (section != null) {
+                        DyeColor color = DyeColor.valueOf(section.getString("color"));
+                        PatternType type = PatternType.valueOf(section.getString("pattern"));
+                        banner.addPattern(new Pattern(color, type));
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState) {
+        return null;
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecLectern.java

@@ -0,0 +1,54 @@
+package de.diddiz.LogBlock.blockstate;
+
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Lectern;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.inventory.ItemStack;
+
+public class BlockStateCodecLectern implements BlockStateCodec {
+    @Override
+    public Material[] getApplicableMaterials() {
+        return new Material[] { Material.LECTERN };
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        if (state instanceof Lectern) {
+            Lectern lectern = (Lectern) state;
+            ItemStack book = lectern.getSnapshotInventory().getItem(0);
+            if (book != null && book.getType() != Material.AIR) {
+                YamlConfiguration conf = new YamlConfiguration();
+                conf.set("book", book);
+                return conf;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof Lectern) {
+            Lectern lectern = (Lectern) state;
+            ItemStack book = null;
+            if (conf != null) {
+                book = conf.getItemStack("book");
+            }
+            try {
+                lectern.getSnapshotInventory().setItem(0, book);
+            } catch (NullPointerException e) {
+                //ignored
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState) {
+        if (conf != null) {
+            return new TextComponent("[book]");
+        }
+        return new TextComponent("empty");
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecShulkerBox.java

@@ -0,0 +1,87 @@
+package de.diddiz.LogBlock.blockstate;
+
+import static de.diddiz.LogBlock.config.Config.getWorldConfig;
+
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.WorldConfig;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.ShulkerBox;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.inventory.ItemStack;
+
+public class BlockStateCodecShulkerBox implements BlockStateCodec {
+    @Override
+    public Material[] getApplicableMaterials() {
+        return BukkitUtils.getShulkerBoxBlocks().toArray(Material[]::new);
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        WorldConfig wcfg = getWorldConfig(state.getWorld());
+        if (wcfg == null || !wcfg.isLogging(Logging.SHULKER_BOX_CONTENT)) {
+            return null;
+        }
+        if (state instanceof ShulkerBox) {
+            ShulkerBox shulkerBox = (ShulkerBox) state;
+            ItemStack[] content = shulkerBox.getSnapshotInventory().getStorageContents();
+            YamlConfiguration conf = new YamlConfiguration();
+            boolean anySlot = false;
+            for (int i = 0; i < content.length; i++) {
+                ItemStack stack = content[i];
+                if (stack != null && stack.getType() != Material.AIR) {
+                    conf.set("slot" + i, stack);
+                    anySlot = true;
+                }
+            }
+            if (anySlot) {
+                return conf;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof ShulkerBox) {
+            ShulkerBox shulkerBox = (ShulkerBox) state;
+            if (conf != null) {
+                ItemStack[] content = shulkerBox.getSnapshotInventory().getStorageContents();
+                for (int i = 0; i < content.length; i++) {
+                    ItemStack stack = conf.getItemStack("slot" + i);
+                    if (stack != null && stack.getType() != Material.AIR) {
+                        content[i] = stack;
+                    }
+                }
+                shulkerBox.getSnapshotInventory().setContents(content);
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState) {
+        if (conf != null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("[");
+            boolean anySlot = false;
+            for (String key : conf.getKeys(false)) {
+                if (key.startsWith("slot")) {
+                    ItemStack stack = conf.getItemStack(key);
+                    if (stack != null && stack.getType() != Material.AIR) {
+                        if (anySlot) {
+                            sb.append(",");
+                        }
+                        anySlot = true;
+                        sb.append(stack.getAmount()).append("x").append(stack.getType());
+                    }
+                }
+            }
+            sb.append("]");
+            return anySlot ? new TextComponent(sb.toString()) : null;
+        }
+        return null;
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSign.java

@@ -0,0 +1,227 @@
+package de.diddiz.LogBlock.blockstate;
+
+import de.diddiz.LogBlock.util.BukkitUtils;
+import java.awt.Color;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.DyeColor;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.block.sign.Side;
+import org.bukkit.block.sign.SignSide;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class BlockStateCodecSign implements BlockStateCodec {
+    @Override
+    public Material[] getApplicableMaterials() {
+        return BukkitUtils.getAllSignMaterials().toArray(Material[]::new);
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        YamlConfiguration conf = null;
+        if (state instanceof Sign sign) {
+            boolean waxed = sign.isWaxed();
+            if (waxed) {
+                conf = new YamlConfiguration();
+                conf.set("waxed", waxed);
+            }
+            for (Side side : Side.values()) {
+                SignSide signSide = sign.getSide(side);
+                String[] lines = signSide.getLines();
+                boolean hasText = false;
+                for (int i = 0; i < lines.length; i++) {
+                    if (lines[i] != null && lines[i].length() > 0) {
+                        hasText = true;
+                        break;
+                    }
+                }
+                DyeColor signColor = signSide.getColor();
+                if (signColor == null) {
+                    signColor = DyeColor.BLACK;
+                }
+                boolean glowing = signSide.isGlowingText();
+                if (hasText || signColor != DyeColor.BLACK || glowing) {
+                    if (conf == null) {
+                        conf = new YamlConfiguration();
+                    }
+                    ConfigurationSection sideSection = side == Side.FRONT ? conf : conf.createSection(side.name().toLowerCase());
+                    if (hasText) {
+                        sideSection.set("lines", Arrays.asList(lines));
+                    }
+                    if (signColor != DyeColor.BLACK) {
+                        sideSection.set("color", signColor.name());
+                    }
+                    if (glowing) {
+                        sideSection.set("glowing", true);
+                    }
+                }
+            }
+        }
+        return conf;
+    }
+
+    /**
+     * This is required for the SignChangeEvent, because we have no updated BlockState there.
+     * @param state
+     */
+    public YamlConfiguration serialize(BlockState state, Side side, String[] lines) {
+        YamlConfiguration conf = state == null ? null : serialize(state);
+        if (lines != null) {
+            if (conf == null) {
+                conf = new YamlConfiguration();
+            }
+            ConfigurationSection sideSection = side == Side.FRONT ? conf : conf.getConfigurationSection(side.name().toLowerCase());
+            if (sideSection == null) {
+                sideSection = conf.createSection(side.name().toLowerCase());
+            }
+            sideSection.set("lines", Arrays.asList(lines));
+        }
+        return conf;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof Sign) {
+            Sign sign = (Sign) state;
+            if (conf != null) {
+                sign.setWaxed(conf.getBoolean("waxed"));
+                for (Side side : Side.values()) {
+                    ConfigurationSection sideSection = side == Side.FRONT ? conf : conf.getConfigurationSection(side.name().toLowerCase());
+                    DyeColor signColor = DyeColor.BLACK;
+                    boolean glowing = false;
+                    List<String> lines = Collections.emptyList();
+                    if (sideSection != null) {
+                        if (sideSection.contains("lines")) {
+                            lines = sideSection.getStringList("lines");
+                        }
+                        if (sideSection.contains("color")) {
+                            try {
+                                signColor = DyeColor.valueOf(sideSection.getString("color"));
+                            } catch (IllegalArgumentException | NullPointerException e) {
+                                // ignored
+                            }
+                        }
+                        glowing = sideSection.getBoolean("glowing", false);
+                    }
+                    SignSide signSide = sign.getSide(side);
+                    for (int i = 0; i < 4; i++) {
+                        String line = lines.size() > i && lines.get(i) != null ? lines.get(i) : "";
+                        signSide.setLine(i, line);
+                    }
+                    signSide.setColor(signColor);
+                    signSide.setGlowingText(glowing);
+                }
+            } else {
+                sign.setWaxed(false);
+                for (Side side : Side.values()) {
+                    SignSide signSide = sign.getSide(side);
+                    for (int i = 0; i < 4; i++) {
+                        signSide.setLine(i, "");
+                    }
+                    signSide.setColor(DyeColor.BLACK);
+                    signSide.setGlowingText(false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration state, YamlConfiguration oldState) {
+        if (state != null) {
+            TextComponent tc = new TextComponent();
+            // StringBuilder sb = new StringBuilder();
+            boolean isWaxed = state.getBoolean("waxed");
+            boolean oldWaxed = oldState != null && oldState.getBoolean("waxed");
+            if (isWaxed != oldWaxed) {
+                tc.addExtra(isWaxed ? "(waxed)" : "(not waxed)");
+            }
+            for (Side side : Side.values()) {
+                boolean sideHeaderAdded = false;
+                ConfigurationSection sideSection = side == Side.FRONT ? state : state.getConfigurationSection(side.name().toLowerCase());
+
+                List<String> lines = sideSection == null ? Collections.emptyList() : sideSection.getStringList("lines");
+                List<String> oldLines = Collections.emptyList();
+                DyeColor signColor = DyeColor.BLACK;
+                if (sideSection != null && sideSection.contains("color")) {
+                    try {
+                        signColor = DyeColor.valueOf(sideSection.getString("color"));
+                    } catch (IllegalArgumentException | NullPointerException e) {
+                        // ignored
+                    }
+                }
+                DyeColor oldSignColor = DyeColor.BLACK;
+                boolean glowing = sideSection != null && sideSection.getBoolean("glowing", false);
+                boolean oldGlowing = false;
+                if (oldState != null) {
+                    ConfigurationSection oldSideSection = side == Side.FRONT ? oldState : oldState.getConfigurationSection(side.name().toLowerCase());
+                    if (oldSideSection != null) {
+                        oldLines = oldSideSection.getStringList("lines");
+                        if (oldSideSection.contains("color")) {
+                            try {
+                                oldSignColor = DyeColor.valueOf(oldSideSection.getString("color"));
+                            } catch (IllegalArgumentException | NullPointerException e) {
+                                // ignored
+                            }
+                        }
+                        oldGlowing = oldSideSection.getBoolean("glowing", false);
+                    }
+                }
+
+                if (!lines.equals(oldLines)) {
+                    sideHeaderAdded = addSideHeaderText(tc, side, sideHeaderAdded);
+                    for (String line : lines) {
+                        if (tc.getExtra() != null && !tc.getExtra().isEmpty()) {
+                            tc.addExtra(" ");
+                        }
+                        tc.addExtra("[");
+                        if (line != null && !line.isEmpty()) {
+                            tc.addExtra(new TextComponent(TextComponent.fromLegacyText(line)));
+                        }
+                        tc.addExtra("]");
+                    }
+                }
+                if (signColor != oldSignColor) {
+                    sideHeaderAdded = addSideHeaderText(tc, side, sideHeaderAdded);
+                    if (tc.getExtra() != null && !tc.getExtra().isEmpty()) {
+                        tc.addExtra(" ");
+                    }
+                    tc.addExtra("(color: ");
+                    TextComponent colorText = new TextComponent(signColor.name().toLowerCase());
+                    colorText.setColor(ChatColor.of(new Color(signColor.getColor().asARGB())));
+                    tc.addExtra(colorText);
+                    tc.addExtra(")");
+                }
+                if (glowing != oldGlowing) {
+                    sideHeaderAdded = addSideHeaderText(tc, side, sideHeaderAdded);
+                    if (tc.getExtra() != null && !tc.getExtra().isEmpty()) {
+                        tc.addExtra(" ");
+                    }
+                    if (glowing) {
+                        tc.addExtra("(glowing)");
+                    } else {
+                        tc.addExtra("(not glowing)");
+                    }
+                }
+            }
+            return tc;
+        }
+        return null;
+    }
+
+    private static boolean addSideHeaderText(TextComponent tc, Side side, boolean wasAdded) {
+        if (!wasAdded) {
+            if (tc.getExtra() != null && !tc.getExtra().isEmpty()) {
+                tc.addExtra(" ");
+            }
+            tc.addExtra(side.name() + ":");
+        }
+        return true;
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSkull.java

@@ -0,0 +1,90 @@
+package de.diddiz.LogBlock.blockstate;
+
+import java.util.UUID;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Skull;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.profile.PlayerProfile;
+
+public class BlockStateCodecSkull implements BlockStateCodec {
+    private static final boolean HAS_PROFILE_API;
+    static {
+        boolean hasProfileApi = false;
+        try {
+            Skull.class.getMethod("getOwnerProfile");
+            hasProfileApi = true;
+        } catch (NoSuchMethodException ignored) {
+        }
+        HAS_PROFILE_API = hasProfileApi;
+    }
+
+    @Override
+    public Material[] getApplicableMaterials() {
+        return new Material[] { Material.PLAYER_WALL_HEAD, Material.PLAYER_HEAD };
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        if (state instanceof Skull) {
+            Skull skull = (Skull) state;
+            OfflinePlayer owner = skull.hasOwner() ? skull.getOwningPlayer() : null;
+            PlayerProfile profile = HAS_PROFILE_API ? skull.getOwnerProfile() : null;
+            if (owner != null || profile != null) {
+                YamlConfiguration conf = new YamlConfiguration();
+                if (profile != null) {
+                    conf.set("profile", profile);
+                } else if (owner != null) {
+                    conf.set("owner", owner.getUniqueId().toString());
+                }
+                return conf;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof Skull) {
+            Skull skull = (Skull) state;
+            PlayerProfile profile = conf == null || !HAS_PROFILE_API ? null : (PlayerProfile) conf.get("profile");
+            if (profile != null) {
+                skull.setOwnerProfile(profile);
+            } else {
+                UUID ownerId = conf == null ? null : UUID.fromString(conf.getString("owner"));
+                if (ownerId == null) {
+                    skull.setOwningPlayer(null);
+                } else {
+                    skull.setOwningPlayer(Bukkit.getOfflinePlayer(ownerId));
+                }
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState) {
+        if (HAS_PROFILE_API && conf != null) {
+            PlayerProfile profile = (PlayerProfile) conf.get("profile");
+            if (profile != null) {
+                TextComponent tc = new TextComponent("[" + (profile.getName() != null ? profile.getName() : (profile.getUniqueId() != null ? profile.getUniqueId().toString() : "~unknown~")) + "]");
+                if (profile.getName() != null && profile.getUniqueId() != null) {
+                    tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("UUID: " + profile.getUniqueId().toString())));
+                }
+                return tc;
+            }
+        }
+        String ownerIdString = conf == null ? null : conf.getString("owner");
+        UUID ownerId = ownerIdString == null ? null : UUID.fromString(ownerIdString);
+        if (ownerId != null) {
+            OfflinePlayer owner = Bukkit.getOfflinePlayer(ownerId);
+            return new TextComponent("[" + (owner.getName() != null ? owner.getName() : owner.getUniqueId().toString()) + "]");
+        }
+        return null;
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecSpawner.java

@@ -0,0 +1,74 @@
+package de.diddiz.LogBlock.blockstate;
+
+import de.diddiz.LogBlock.LogBlock;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.CreatureSpawner;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.EntityType;
+
+public class BlockStateCodecSpawner implements BlockStateCodec {
+    @Override
+    public Material[] getApplicableMaterials() {
+        return new Material[] { Material.SPAWNER };
+    }
+
+    @Override
+    public YamlConfiguration serialize(BlockState state) {
+        if (state instanceof CreatureSpawner) {
+            CreatureSpawner spawner = (CreatureSpawner) state;
+            YamlConfiguration conf = new YamlConfiguration();
+            conf.set("delay", spawner.getDelay());
+            conf.set("maxNearbyEntities", spawner.getMaxNearbyEntities());
+            conf.set("maxSpawnDelay", spawner.getMaxSpawnDelay());
+            conf.set("minSpawnDelay", spawner.getMinSpawnDelay());
+            conf.set("requiredPlayerRange", spawner.getRequiredPlayerRange());
+            conf.set("spawnCount", spawner.getSpawnCount());
+            if (spawner.getSpawnedType() != null) {
+                conf.set("spawnedType", spawner.getSpawnedType().name());
+            }
+            conf.set("spawnRange", spawner.getSpawnRange());
+            return conf;
+        }
+        return null;
+    }
+
+    @Override
+    public void deserialize(BlockState state, YamlConfiguration conf) {
+        if (state instanceof CreatureSpawner) {
+            CreatureSpawner spawner = (CreatureSpawner) state;
+            if (conf != null) {
+                spawner.setDelay(conf.getInt("delay"));
+                spawner.setMaxNearbyEntities(conf.getInt("maxNearbyEntities"));
+                spawner.setMaxSpawnDelay(conf.getInt("maxSpawnDelay"));
+                spawner.setMinSpawnDelay(conf.getInt("minSpawnDelay"));
+                spawner.setRequiredPlayerRange(conf.getInt("requiredPlayerRange"));
+                spawner.setSpawnCount(conf.getInt("spawnCount"));
+                EntityType spawnedType = null;
+                String spawnedTypeString = conf.getString("spawnedType");
+                if (spawnedTypeString != null) {
+                    try {
+                        spawnedType = EntityType.valueOf(spawnedTypeString);
+                    } catch (IllegalArgumentException ignored) {
+                        LogBlock.getInstance().getLogger().warning("Could not find spawner spawned type: " + spawnedTypeString);
+                    }
+                }
+                spawner.setSpawnedType(spawnedType);
+                spawner.setSpawnRange(conf.getInt("spawnRange"));
+            }
+        }
+    }
+
+    @Override
+    public BaseComponent getChangesAsComponent(YamlConfiguration conf, YamlConfiguration oldState) {
+        if (conf != null) {
+            EntityType entity = EntityType.valueOf(conf.getString("spawnedType"));
+            if (entity != null) {
+                return new TextComponent("[" + entity.getKey().getKey() + "]");
+            }
+        }
+        return null;
+    }
+}

src/main/java/de/diddiz/LogBlock/blockstate/BlockStateCodecs.java

@@ -0,0 +1,61 @@
+package de.diddiz.LogBlock.blockstate;
+
+import java.util.HashMap;
+import java.util.Map;
+import net.md_5.bungee.api.chat.BaseComponent;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class BlockStateCodecs {
+    private static Map<Material, BlockStateCodec> codecs = new HashMap<>();
+
+    public static void registerCodec(BlockStateCodec codec) {
+        Material[] materials = codec.getApplicableMaterials();
+        for (Material material : materials) {
+            if (codecs.containsKey(material)) {
+                throw new IllegalArgumentException("BlockStateCodec for " + material + " already registered!");
+            }
+            codecs.put(material, codec);
+        }
+    }
+
+    static {
+        registerCodec(new BlockStateCodecSign());
+        registerCodec(new BlockStateCodecSkull());
+        registerCodec(new BlockStateCodecBanner());
+        registerCodec(new BlockStateCodecSpawner());
+        registerCodec(new BlockStateCodecLectern());
+        registerCodec(new BlockStateCodecShulkerBox());
+    }
+
+    public static boolean hasCodec(Material material) {
+        return codecs.containsKey(material);
+    }
+
+    public static YamlConfiguration serialize(BlockState state) {
+        BlockStateCodec codec = codecs.get(state.getType());
+        if (codec != null) {
+            YamlConfiguration serialized = codec.serialize(state);
+            if (serialized != null && !serialized.getKeys(false).isEmpty()) {
+                return serialized;
+            }
+        }
+        return null;
+    }
+
+    public static void deserialize(BlockState block, YamlConfiguration state) {
+        BlockStateCodec codec = codecs.get(block.getType());
+        if (codec != null) {
+            codec.deserialize(block, state);
+        }
+    }
+
+    public static BaseComponent getChangesAsComponent(Material material, YamlConfiguration state, YamlConfiguration oldState) {
+        BlockStateCodec codec = codecs.get(material);
+        if (codec != null) {
+            return codec.getChangesAsComponent(state, oldState);
+        }
+        return null;
+    }
+}

src/main/java/de/diddiz/LogBlock/config/Config.java

@@ -1,9 +1,11 @@
 package de.diddiz.LogBlock.config;
 
 import de.diddiz.LogBlock.*;
+import de.diddiz.LogBlock.util.ComparableVersion;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Entity;
 import org.bukkit.permissions.PermissionDefault;
 
 import java.io.File;
@@ -14,51 +16,62 @@ import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.zip.DataFormatException;
 
-import static de.diddiz.util.BukkitUtils.friendlyWorldname;
-import static de.diddiz.util.Utils.parseTimeSpec;
+import static de.diddiz.LogBlock.util.BukkitUtils.friendlyWorldname;
+import static de.diddiz.LogBlock.util.Utils.parseTimeSpec;
 import static org.bukkit.Bukkit.*;
 
 public class Config {
     private static LoggingEnabledMapping superWorldConfig;
     private static Map<String, WorldConfig> worldConfigs;
     public static String url, user, password;
+    public static String mysqlDatabase;
+    public static boolean mysqlUseSSL;
+    public static boolean mysqlRequireSSL;
     public static int delayBetweenRuns, forceToProcessAtLeast, timePerRun;
-    public static boolean fireCustomEvents;
     public static boolean useBukkitScheduler;
     public static int queueWarningSize;
     public static boolean enableAutoClearLog;
     public static List<String> autoClearLog;
     public static int autoClearLogDelay;
     public static boolean dumpDeletedLog;
+    public static boolean logBedExplosionsAsPlayerWhoTriggeredThese;
     public static boolean logCreeperExplosionsAsPlayerWhoTriggeredThese, logPlayerInfo;
+    public static boolean logFireSpreadAsPlayerWhoCreatedIt;
+    public static boolean logFluidFlowAsPlayerWhoTriggeredIt;
     public static LogKillsLevel logKillsLevel;
-    public static Set<Integer> dontRollback, replaceAnyway;
+    public static Set<Material> dontRollback, replaceAnyway;
     public static int rollbackMaxTime, rollbackMaxArea;
     public static Map<String, Tool> toolsByName;
-    public static Map<Integer, Tool> toolsByType;
+    public static Map<Material, Tool> toolsByType;
     public static int defaultDist, defaultTime;
-    public static int linesPerPage, linesLimit;
+    public static int linesPerPage, linesLimit, hardLinesLimit;
     public static boolean askRollbacks, askRedos, askClearLogs, askClearLogAfterRollback, askRollbackAfterBan;
     public static String banPermission;
-    public static Set<Integer> hiddenBlocks;
+    public static Set<Material> hiddenBlocks;
     public static Set<String> hiddenPlayers;
-    public static Set<String> ignoredChat;
+    public static List<String> ignoredChat;
     public static SimpleDateFormat formatter;
-    public static boolean safetyIdCheck;
+    public static SimpleDateFormat formatterShort;
     public static boolean debug;
     public static boolean logEnvironmentalKills;
+    // addons
+    public static boolean worldGuardLoggingFlags;
     // Not loaded from config - checked at runtime
     public static boolean mb4 = false;
 
+    public static final String CURRENT_CONFIG_VERSION = "1.19.0";
+
     public static enum LogKillsLevel {
-        PLAYERS, MONSTERS, ANIMALS;
+        PLAYERS,
+        MONSTERS,
+        ANIMALS;
     }
 
     public static void load(LogBlock logblock) throws DataFormatException, IOException {
         final ConfigurationSection config = logblock.getConfig();
-        final Map<String, Object> def = new HashMap<String, Object>();
-        def.put("version", logblock.getDescription().getVersion());
-        final List<String> worldNames = new ArrayList<String>();
+        final Map<String, Object> def = new HashMap<>();
+        def.put("version", CURRENT_CONFIG_VERSION);
+        final List<String> worldNames = new ArrayList<>();
         for (final World world : getWorlds()) {
             worldNames.add(world.getName());
         }
@@ -68,42 +81,60 @@ public class Config {
             worldNames.add("world_the_end");
         }
         def.put("loggedWorlds", worldNames);
+        def.put("mysql.protocol", "mysql");
         def.put("mysql.host", "localhost");
         def.put("mysql.port", 3306);
         def.put("mysql.database", "minecraft");
         def.put("mysql.user", "username");
         def.put("mysql.password", "pass");
+        def.put("mysql.useSSL", true);
+        def.put("mysql.requireSSL", false);
         def.put("consumer.delayBetweenRuns", 2);
         def.put("consumer.forceToProcessAtLeast", 200);
         def.put("consumer.timePerRun", 1000);
-        def.put("consumer.fireCustomEvents", false);
         def.put("consumer.useBukkitScheduler", true);
         def.put("consumer.queueWarningSize", 1000);
         def.put("clearlog.dumpDeletedLog", false);
         def.put("clearlog.enableAutoClearLog", false);
-        def.put("clearlog.auto", Arrays.asList("world \"world\" before 365 days all", "world \"world\" player lavaflow waterflow leavesdecay before 7 days all", "world world_nether before 365 days all", "world world_nether player lavaflow before 7 days all"));
+        final List<String> autoClearlog = new ArrayList<>();
+        for (final String world : worldNames) {
+            autoClearlog.add("world \"" + world + "\" before 365 days all");
+            autoClearlog.add("world \"" + world + "\" player lavaflow waterflow leavesdecay before 7 days all");
+            autoClearlog.add("world \"" + world + "\" entities before 365 days");
+        }
+        def.put("clearlog.auto", autoClearlog);
         def.put("clearlog.autoClearLogDelay", "6h");
+        def.put("logging.logBedExplosionsAsPlayerWhoTriggeredThese", true);
         def.put("logging.logCreeperExplosionsAsPlayerWhoTriggeredThese", false);
+        def.put("logging.logFireSpreadAsPlayerWhoCreatedIt", true);
+        def.put("logging.logFluidFlowAsPlayerWhoTriggeredIt", false);
         def.put("logging.logKillsLevel", "PLAYERS");
         def.put("logging.logEnvironmentalKills", false);
         def.put("logging.logPlayerInfo", false);
         def.put("logging.hiddenPlayers", new ArrayList<String>());
-        def.put("logging.hiddenBlocks", Arrays.asList(0));
+        def.put("logging.hiddenBlocks", Arrays.asList(Material.AIR.name(), Material.CAVE_AIR.name(), Material.VOID_AIR.name()));
         def.put("logging.ignoredChat", Arrays.asList("/register", "/login"));
-        def.put("rollback.dontRollback", Arrays.asList(10, 11, 46, 51));
-        def.put("rollback.replaceAnyway", Arrays.asList(8, 9, 10, 11, 51));
+        def.put("rollback.dontRollback", Arrays.asList(Material.LAVA.name(), Material.TNT.name(), Material.FIRE.name()));
+        def.put("rollback.replaceAnyway", Arrays.asList(Material.LAVA.name(), Material.WATER.name(), Material.FIRE.name(), Material.GRASS_BLOCK.name()));
         def.put("rollback.maxTime", "2 days");
         def.put("rollback.maxArea", 50);
         def.put("lookup.defaultDist", 20);
         def.put("lookup.defaultTime", "30 minutes");
         def.put("lookup.linesPerPage", 15);
         def.put("lookup.linesLimit", 1500);
+        def.put("lookup.hardLinesLimit", 100000);
         try {
-            formatter = new SimpleDateFormat(config.getString("lookup.dateFormat", "MM-dd HH:mm:ss"));
+            formatter = new SimpleDateFormat(config.getString("lookup.dateFormat", "yyyy-MM-dd HH:mm:ss"));
         } catch (IllegalArgumentException e) {
             throw new DataFormatException("Invalid specification for  date format, please see http://docs.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html : " + e.getMessage());
         }
-        def.put("lookup.dateFormat", "MM-dd HH:mm:ss");
+        def.put("lookup.dateFormat", "yyyy-MM-dd HH:mm:ss");
+        try {
+            formatterShort = new SimpleDateFormat(config.getString("lookup.dateFormatShort", "MM-dd HH:mm"));
+        } catch (IllegalArgumentException e) {
+            throw new DataFormatException("Invalid specification for  date format, please see http://docs.oracle.com/javase/1.4.2/docs/api/java/text/SimpleDateFormat.html : " + e.getMessage());
+        }
+        def.put("lookup.dateFormatShort", "MM-dd HH:mm");
         def.put("questioner.askRollbacks", true);
         def.put("questioner.askRedos", true);
         def.put("questioner.askClearLogs", true);
@@ -114,42 +145,59 @@ public class Config {
         def.put("tools.tool.leftClickBehavior", "NONE");
         def.put("tools.tool.rightClickBehavior", "TOOL");
         def.put("tools.tool.defaultEnabled", true);
-        def.put("tools.tool.item", 270);
+        def.put("tools.tool.item", Material.WOODEN_PICKAXE.name());
         def.put("tools.tool.canDrop", true);
-        def.put("tools.tool.params", "area 0 all sum none limit 15 desc silent");
+        def.put("tools.tool.removeOnDisable", true);
+        def.put("tools.tool.dropToDisable", false);
+        def.put("tools.tool.params", "area 0 all sum none limit 15 desc since 60d silent");
         def.put("tools.tool.mode", "LOOKUP");
         def.put("tools.tool.permissionDefault", "OP");
         def.put("tools.toolblock.aliases", Arrays.asList("tb"));
         def.put("tools.toolblock.leftClickBehavior", "TOOL");
         def.put("tools.toolblock.rightClickBehavior", "BLOCK");
         def.put("tools.toolblock.defaultEnabled", true);
-        def.put("tools.toolblock.item", 7);
+        def.put("tools.toolblock.item", Material.BEDROCK.name());
         def.put("tools.toolblock.canDrop", false);
-        def.put("tools.toolblock.params", "area 0 all sum none limit 15 desc silent");
+        def.put("tools.toolblock.removeOnDisable", true);
+        def.put("tools.toolblock.dropToDisable", false);
+        def.put("tools.toolblock.params", "area 0 all sum none limit 15 desc since 60d silent");
         def.put("tools.toolblock.mode", "LOOKUP");
         def.put("tools.toolblock.permissionDefault", "OP");
         def.put("safety.id.check", true);
+        def.put("addons.worldguardLoggingFlags", false);
         def.put("debug", false);
         for (final Entry<String, Object> e : def.entrySet()) {
             if (!config.contains(e.getKey())) {
                 config.set(e.getKey(), e.getValue());
             }
         }
+        if (config.contains("consumer.fireCustomEvents")) {
+            config.set("consumer.fireCustomEvents", null);
+        }
         logblock.saveConfig();
-        url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + getStringIncludingInts(config, "mysql.database");
+
+        ComparableVersion configVersion = new ComparableVersion(config.getString("version"));
+        boolean oldConfig = configVersion.compareTo(new ComparableVersion(CURRENT_CONFIG_VERSION)) < 0;
+
+        mysqlDatabase = getStringIncludingInts(config, "mysql.database");
+        url = "jdbc:" + config.getString("mysql.protocol") + "://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + mysqlDatabase;
         user = getStringIncludingInts(config, "mysql.user");
         password = getStringIncludingInts(config, "mysql.password");
+        mysqlUseSSL = config.getBoolean("mysql.useSSL", true);
+        mysqlRequireSSL = config.getBoolean("mysql.requireSSL", false);
         delayBetweenRuns = config.getInt("consumer.delayBetweenRuns", 2);
         forceToProcessAtLeast = config.getInt("consumer.forceToProcessAtLeast", 0);
         timePerRun = config.getInt("consumer.timePerRun", 1000);
-        fireCustomEvents = config.getBoolean("consumer.fireCustomEvents", false);
         useBukkitScheduler = config.getBoolean("consumer.useBukkitScheduler", true);
         queueWarningSize = config.getInt("consumer.queueWarningSize", 1000);
         enableAutoClearLog = config.getBoolean("clearlog.enableAutoClearLog");
         autoClearLog = config.getStringList("clearlog.auto");
         dumpDeletedLog = config.getBoolean("clearlog.dumpDeletedLog", false);
         autoClearLogDelay = parseTimeSpec(config.getString("clearlog.autoClearLogDelay").split(" "));
+        logBedExplosionsAsPlayerWhoTriggeredThese = config.getBoolean("logging.logBedExplosionsAsPlayerWhoTriggeredThese", true);
         logCreeperExplosionsAsPlayerWhoTriggeredThese = config.getBoolean("logging.logCreeperExplosionsAsPlayerWhoTriggeredThese", false);
+        logFireSpreadAsPlayerWhoCreatedIt = config.getBoolean("logging.logFireSpreadAsPlayerWhoCreatedIt", true);
+        logFluidFlowAsPlayerWhoTriggeredIt = config.getBoolean("logging.logFluidFlowAsPlayerWhoTriggeredIt", false);
         logPlayerInfo = config.getBoolean("logging.logPlayerInfo", true);
         try {
             logKillsLevel = LogKillsLevel.valueOf(config.getString("logging.logKillsLevel").toUpperCase());
@@ -157,40 +205,56 @@ public class Config {
             throw new DataFormatException("logging.logKillsLevel doesn't appear to be a valid log level. Allowed are 'PLAYERS', 'MONSTERS' and 'ANIMALS'");
         }
         logEnvironmentalKills = config.getBoolean("logging.logEnvironmentalKills", false);
-        hiddenPlayers = new HashSet<String>();
+        hiddenPlayers = new HashSet<>();
         for (final String playerName : config.getStringList("logging.hiddenPlayers")) {
             hiddenPlayers.add(playerName.toLowerCase().trim());
         }
-        hiddenBlocks = new HashSet<Integer>();
-        for (final Object blocktype : config.getList("logging.hiddenBlocks")) {
-            final Material mat = Material.matchMaterial(String.valueOf(blocktype));
+        hiddenBlocks = new HashSet<>();
+        for (final String blocktype : config.getStringList("logging.hiddenBlocks")) {
+            final Material mat = Material.matchMaterial(blocktype);
             if (mat != null) {
-                hiddenBlocks.add(mat.getId());
-            } else {
-                throw new DataFormatException("Not a valid material: '" + blocktype + "'");
+                hiddenBlocks.add(mat);
+            } else if (!oldConfig) {
+                throw new DataFormatException("Not a valid material in hiddenBlocks: '" + blocktype + "'");
             }
         }
-        ignoredChat = new HashSet<String>();
+        ignoredChat = new ArrayList<>();
         for (String chatCommand : config.getStringList("logging.ignoredChat")) {
-            ignoredChat.add(chatCommand);
+            ignoredChat.add(chatCommand.toLowerCase());
+        }
+        dontRollback = new HashSet<>();
+        for (String e : config.getStringList("rollback.dontRollback")) {
+            Material mat = Material.matchMaterial(e);
+            if (mat != null) {
+                dontRollback.add(mat);
+            } else if (!oldConfig) {
+                throw new DataFormatException("Not a valid material in dontRollback: '" + e + "'");
+            }
+        }
+        replaceAnyway = new HashSet<>();
+        for (String e : config.getStringList("rollback.replaceAnyway")) {
+            Material mat = Material.matchMaterial(e);
+            if (mat != null) {
+                replaceAnyway.add(mat);
+            } else if (!oldConfig) {
+                throw new DataFormatException("Not a valid material in replaceAnyway: '" + e + "'");
+            }
         }
-        dontRollback = new HashSet<Integer>(config.getIntegerList("rollback.dontRollback"));
-        replaceAnyway = new HashSet<Integer>(config.getIntegerList("rollback.replaceAnyway"));
         rollbackMaxTime = parseTimeSpec(config.getString("rollback.maxTime").split(" "));
         rollbackMaxArea = config.getInt("rollback.maxArea", 50);
         defaultDist = config.getInt("lookup.defaultDist", 20);
         defaultTime = parseTimeSpec(config.getString("lookup.defaultTime").split(" "));
         linesPerPage = config.getInt("lookup.linesPerPage", 15);
         linesLimit = config.getInt("lookup.linesLimit", 1500);
+        hardLinesLimit = config.getInt("lookup.hardLinesLimit", 100000);
         askRollbacks = config.getBoolean("questioner.askRollbacks", true);
         askRedos = config.getBoolean("questioner.askRedos", true);
         askClearLogs = config.getBoolean("questioner.askClearLogs", true);
         askClearLogAfterRollback = config.getBoolean("questioner.askClearLogAfterRollback", true);
         askRollbackAfterBan = config.getBoolean("questioner.askRollbackAfterBan", false);
-        safetyIdCheck = config.getBoolean("safety.id.check", true);
         debug = config.getBoolean("debug", false);
         banPermission = config.getString("questioner.banPermission");
-        final List<Tool> tools = new ArrayList<Tool>();
+        final List<Tool> tools = new ArrayList<>();
         final ConfigurationSection toolsSec = config.getConfigurationSection("tools");
         for (final String toolName : toolsSec.getKeys(false)) {
             try {
@@ -199,20 +263,22 @@ public class Config {
                 final ToolBehavior leftClickBehavior = ToolBehavior.valueOf(tSec.getString("leftClickBehavior").toUpperCase());
                 final ToolBehavior rightClickBehavior = ToolBehavior.valueOf(tSec.getString("rightClickBehavior").toUpperCase());
                 final boolean defaultEnabled = tSec.getBoolean("defaultEnabled", false);
-                final int item = tSec.getInt("item", 0);
+                final Material item = Material.matchMaterial(tSec.getString("item", "OAK_LOG"));
                 final boolean canDrop = tSec.getBoolean("canDrop", false);
+                final boolean removeOnDisable = tSec.getBoolean("removeOnDisable", true);
+                final boolean dropToDisable = tSec.getBoolean("dropToDisable", false);
                 final QueryParams params = new QueryParams(logblock);
                 params.prepareToolQuery = true;
-                params.parseArgs(getConsoleSender(), Arrays.asList(tSec.getString("params").split(" ")));
+                params.parseArgs(getConsoleSender(), Arrays.asList(tSec.getString("params").split(" ")), false);
                 final ToolMode mode = ToolMode.valueOf(tSec.getString("mode").toUpperCase());
                 final PermissionDefault pdef = PermissionDefault.valueOf(tSec.getString("permissionDefault").toUpperCase());
-                tools.add(new Tool(toolName, aliases, leftClickBehavior, rightClickBehavior, defaultEnabled, item, canDrop, params, mode, pdef));
+                tools.add(new Tool(toolName, aliases, leftClickBehavior, rightClickBehavior, defaultEnabled, item, canDrop, params, mode, pdef, removeOnDisable, dropToDisable));
             } catch (final Exception ex) {
                 getLogger().log(Level.WARNING, "Error at parsing tool '" + toolName + "': ", ex);
             }
         }
-        toolsByName = new HashMap<String, Tool>();
-        toolsByType = new HashMap<Integer, Tool>();
+        toolsByName = new HashMap<>();
+        toolsByType = new HashMap<>();
         for (final Tool tool : tools) {
             toolsByType.put(tool.item, tool);
             toolsByName.put(tool.name.toLowerCase(), tool);
@@ -220,13 +286,14 @@ public class Config {
                 toolsByName.put(alias, tool);
             }
         }
+        worldGuardLoggingFlags = config.getBoolean("addons.worldguardLoggingFlags");
         final List<String> loggedWorlds = config.getStringList("loggedWorlds");
-        worldConfigs = new HashMap<String, WorldConfig>();
+        worldConfigs = new HashMap<>();
         if (loggedWorlds.isEmpty()) {
             throw new DataFormatException("No worlds configured");
         }
         for (final String world : loggedWorlds) {
-            worldConfigs.put(world, new WorldConfig(new File(logblock.getDataFolder(), friendlyWorldname(world) + ".yml")));
+            worldConfigs.put(world, new WorldConfig(world, new File(logblock.getDataFolder(), friendlyWorldname(world) + ".yml")));
         }
         superWorldConfig = new LoggingEnabledMapping();
         for (final WorldConfig wcfg : worldConfigs.values()) {
@@ -278,16 +345,39 @@ public class Config {
     public static Collection<WorldConfig> getLoggedWorlds() {
         return worldConfigs.values();
     }
+
+    public static boolean isLogging(World world, EntityLogging logging, Entity entity) {
+        final WorldConfig wcfg = worldConfigs.get(world.getName());
+        return wcfg != null && wcfg.isLogging(logging, entity);
+    }
+
+    public static boolean isLoggingAnyEntities() {
+        for (WorldConfig worldConfig : worldConfigs.values()) {
+            if (worldConfig.isLoggingAnyEntities()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isLoggingNatualSpawns(World world) {
+        final WorldConfig wcfg = worldConfigs.get(world.getName());
+        return wcfg != null && wcfg.logNaturalEntitySpawns;
+    }
 }
 
 class LoggingEnabledMapping {
-    private final boolean[] logging = new boolean[Logging.length];
+    private final EnumSet<Logging> logging = EnumSet.noneOf(Logging.class);
 
     public void setLogging(Logging l, boolean enabled) {
-        logging[l.ordinal()] = enabled;
+        if (enabled) {
+            logging.add(l);
+        } else {
+            logging.remove(l);
+        }
     }
 
     public boolean isLogging(Logging l) {
-        return logging[l.ordinal()];
+        return logging.contains(l);
     }
 }

src/main/java/de/diddiz/LogBlock/config/EntityLogging.java

@@ -0,0 +1,28 @@
+package de.diddiz.LogBlock.config;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.bukkit.entity.EntityType;
+
+public enum EntityLogging {
+    SPAWN(new String[] { EntityType.ARMOR_STAND.name(), EntityType.ITEM_FRAME.name(), EntityType.SNOWMAN.name() }),
+    DESTROY(new String[] { EntityType.ARMOR_STAND.name(), EntityType.ITEM_FRAME.name(), EntityType.VILLAGER.name(), EntityType.SNOWMAN.name(), "ANIMAL" }),
+    MODIFY(new String[] { "ALL" });
+
+    public static final int length = EntityLogging.values().length;
+    private final List<String> defaultEnabled;
+
+    private EntityLogging() {
+        this(null);
+    }
+
+    private EntityLogging(String[] defaultEnabled) {
+        this.defaultEnabled = defaultEnabled == null ? Collections.emptyList() : Collections.unmodifiableList(Arrays.asList(defaultEnabled));
+    }
+
+    public List<String> getDefaultEnabled() {
+        return defaultEnabled;
+    }
+}

src/main/java/de/diddiz/LogBlock/config/WorldConfig.java

@@ -1,19 +1,45 @@
 package de.diddiz.LogBlock.config;
 
+import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.util.BukkitUtils;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.WaterMob;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.logging.Level;
 
 public class WorldConfig extends LoggingEnabledMapping {
+    public final String world;
     public final String table;
+    public final String insertBlockStatementString;
+    public final String selectBlockActorIdStatementString;
+    public final String insertBlockStateStatementString;
+    public final String insertBlockChestDataStatementString;
+    public final String insertEntityStatementString;
+    public final String updateEntityUUIDString;
 
-    public WorldConfig(File file) throws IOException {
-        final Map<String, Object> def = new HashMap<String, Object>();
+    private final EnumMap<EntityLogging, EntityLoggingList> entityLogging = new EnumMap<>(EntityLogging.class);
+    public final boolean logNaturalEntitySpawns;
+    public final boolean logAllNamedEntityKills;
+
+    public WorldConfig(String world, File file) throws IOException {
+        this.world = world;
+        final Map<String, Object> def = new HashMap<>();
         // "Before MySQL 5.1.6, database and table names cannot contain "/", "\", ".", or characters that are not permitted in file names" - MySQL manual
         // They _can_ contain spaces, but replace them as well
         def.put("table", "lb-" + file.getName().substring(0, file.getName().length() - 4).replaceAll("[ ./\\\\]", "_"));
@@ -26,10 +52,120 @@ public class WorldConfig extends LoggingEnabledMapping {
                 config.set(e.getKey(), e.getValue());
             }
         }
+        for (EntityLogging el : EntityLogging.values()) {
+            if (!(config.get("entity." + el.name().toLowerCase()) instanceof List)) {
+                config.set("entity." + el.name().toLowerCase(), el.getDefaultEnabled());
+            }
+            entityLogging.put(el, new EntityLoggingList(el, config.getStringList("entity." + el.name().toLowerCase())));
+        }
+        if (!config.isBoolean("entity.logNaturalSpawns")) {
+            config.set("entity.logNaturalSpawns", false);
+        }
+        logNaturalEntitySpawns = config.getBoolean("entity.logNaturalSpawns");
+
+        if (!config.isBoolean("entity.logAllNamedEntityKills")) {
+            config.set("entity.logAllNamedEntityKills", true);
+        }
+        logAllNamedEntityKills = config.getBoolean("entity.logAllNamedEntityKills");
+
         config.save(file);
         table = config.getString("table");
         for (final Logging l : Logging.values()) {
             setLogging(l, config.getBoolean("logging." + l.toString()));
         }
+
+        insertBlockStatementString = "INSERT INTO `" + table + "-blocks` (date, playerid, replaced, replaceddata, type, typedata, x, y, z) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
+        selectBlockActorIdStatementString = "SELECT playerid FROM `" + table + "-blocks` WHERE x = ? AND y = ? AND z = ? ORDER BY date DESC LIMIT 1";
+        insertBlockStateStatementString = "INSERT INTO `" + table + "-state` (replacedState, typeState, id) VALUES(?, ?, ?)";
+        insertBlockChestDataStatementString = "INSERT INTO `" + table + "-chestdata` (item, itemremove, id, itemtype) values (?, ?, ?, ?)";
+        insertEntityStatementString = "INSERT INTO `" + table + "-entities` (date, playerid, entityid, entitytypeid, x, y, z, action, data) VALUES (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?)";
+        updateEntityUUIDString = "UPDATE `" + table + "-entityids` SET entityuuid = ? WHERE entityid = ?";
+    }
+
+    public boolean isLogging(EntityLogging logging, Entity entity) {
+        return entityLogging.get(logging).isLogging(entity);
+    }
+
+    public boolean isLoggingAnyEntities() {
+        for (EntityLoggingList list : entityLogging.values()) {
+            if (list.isLoggingAnyEntities()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private class EntityLoggingList {
+        private final EntityLogging entityAction;
+        private final HashSet<EntityType> logged = new HashSet<>();
+        private final boolean logAll;
+        private final boolean logAnimals;
+        private final boolean logWateranimals;
+        private final boolean logMonsters;
+        private final boolean logLiving;
+
+        public EntityLoggingList(EntityLogging entityAction, List<String> types) {
+            this.entityAction = entityAction;
+            boolean all = false;
+            boolean animals = false;
+            boolean wateranimals = false;
+            boolean monsters = false;
+            boolean living = false;
+            for (String type : types) {
+                EntityType et = BukkitUtils.matchEntityType(type);
+                if (et != null) {
+                    logged.add(et);
+                } else {
+                    if (type.equalsIgnoreCase("all")) {
+                        all = true;
+                    } else if (type.equalsIgnoreCase("animal") || type.equalsIgnoreCase("animals")) {
+                        animals = true;
+                    } else if (type.equalsIgnoreCase("wateranimal") || type.equalsIgnoreCase("wateranimals")) {
+                        wateranimals = true;
+                    } else if (type.equalsIgnoreCase("monster") || type.equalsIgnoreCase("monsters")) {
+                        monsters = true;
+                    } else if (type.equalsIgnoreCase("living")) {
+                        living = true;
+                    } else {
+                        LogBlock.getInstance().getLogger().log(Level.WARNING, "Unkown entity type in config for " + world + ": " + type);
+                    }
+                }
+            }
+            logAll = all;
+            logAnimals = animals;
+            logWateranimals = wateranimals;
+            logMonsters = monsters;
+            logLiving = living;
+        }
+
+        public boolean isLogging(Entity entity) {
+            if (entity == null || (entity instanceof Player)) {
+                return false;
+            }
+            EntityType type = entity.getType();
+            if (logAll || logged.contains(type)) {
+                return true;
+            }
+            if (logLiving && LivingEntity.class.isAssignableFrom(entity.getClass()) && !(entity instanceof ArmorStand)) {
+                return true;
+            }
+            if (logAnimals && Animals.class.isAssignableFrom(entity.getClass())) {
+                return true;
+            }
+            if (logWateranimals && WaterMob.class.isAssignableFrom(entity.getClass())) {
+                return true;
+            }
+            if (logMonsters && (Monster.class.isAssignableFrom(entity.getClass()) || entity.getType() == EntityType.SLIME || entity.getType() == EntityType.WITHER || entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.SHULKER || entity.getType() == EntityType.GHAST)) {
+                return true;
+            }
+            if (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills && entity.getCustomName() != null) {
+                return true;
+            }
+            return false;
+        }
+
+        public boolean isLoggingAnyEntities() {
+            return logAll || logAnimals || logLiving || logMonsters || !logged.isEmpty() || (entityAction == EntityLogging.DESTROY && logAllNamedEntityKills);
+        }
     }
 }

src/main/java/de/diddiz/LogBlock/events/BlockChangePreLogEvent.java

@@ -2,123 +2,93 @@ package de.diddiz.LogBlock.events;
 
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.ChestAccess;
-import org.apache.commons.lang.Validate;
+
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 
 public class BlockChangePreLogEvent extends PreLogEvent {
 
     private static final HandlerList handlers = new HandlerList();
     private Location location;
-    private int typeBefore, typeAfter;
-    private byte data;
-    private String signText;
+    private BlockData typeBefore, typeAfter;
     private ChestAccess chestAccess;
+    private YamlConfiguration stateBefore;
+    private YamlConfiguration stateAfter;
 
-    public BlockChangePreLogEvent(Actor owner, Location location, int typeBefore, int typeAfter, byte data,
-                                  String signText, ChestAccess chestAccess) {
-
+    public BlockChangePreLogEvent(Actor owner, Location location, BlockData typeBefore, BlockData typeAfter, YamlConfiguration stateBefore, YamlConfiguration stateAfter, ChestAccess chestAccess) {
         super(owner);
         this.location = location;
         this.typeBefore = typeBefore;
         this.typeAfter = typeAfter;
-        this.data = data;
-        this.signText = signText;
+        this.stateBefore = stateBefore;
+        this.stateAfter = stateAfter;
         this.chestAccess = chestAccess;
     }
 
     public Location getLocation() {
-
         return location;
     }
 
     public void setLocation(Location location) {
-
         this.location = location;
     }
 
-    public int getTypeBefore() {
-
+    public BlockData getTypeBefore() {
         return typeBefore;
     }
 
-    public void setTypeBefore(int typeBefore) {
-
+    public void setTypeBefore(BlockData typeBefore) {
+        if (typeBefore == null) {
+            typeBefore = Bukkit.createBlockData(Material.AIR);
+        }
         this.typeBefore = typeBefore;
     }
 
-    public int getTypeAfter() {
-
+    public BlockData getTypeAfter() {
         return typeAfter;
     }
 
-    public void setTypeAfter(int typeAfter) {
-
+    public void setTypeAfter(BlockData typeAfter) {
+        if (typeAfter == null) {
+            typeAfter = Bukkit.createBlockData(Material.AIR);
+        }
         this.typeAfter = typeAfter;
     }
 
-    public byte getData() {
-
-        return data;
+    public YamlConfiguration getStateBefore() {
+        return stateBefore;
     }
 
-    public void setData(byte data) {
-
-        this.data = data;
+    public YamlConfiguration getStateAfter() {
+        return stateAfter;
     }
 
-    public String getSignText() {
-
-        return signText;
+    public void setStateBefore(YamlConfiguration stateBefore) {
+        this.stateBefore = stateBefore;
     }
 
-    public void setSignText(String[] signText) {
-
-        if (signText != null) {
-            // Check for block
-            Validate.isTrue(isValidSign(), "Must be valid sign block");
-
-            // Check for problems
-            Validate.noNullElements(signText, "No null lines");
-            Validate.isTrue(signText.length == 4, "Sign text must be 4 strings");
-
-            this.signText = signText[0] + "\0" + signText[1] + "\0" + signText[2] + "\0" + signText[3];
-        } else {
-            this.signText = null;
-        }
-    }
-
-    private boolean isValidSign() {
-
-        if ((typeAfter == 63 || typeAfter == 68) && typeBefore == 0) {
-            return true;
-        }
-        if ((typeBefore == 63 || typeBefore == 68) && typeAfter == 0) {
-            return true;
-        }
-        if ((typeAfter == 63 || typeAfter == 68) && typeBefore == typeAfter) {
-            return true;
-        }
-        return false;
+    public void setStateAfter(YamlConfiguration stateAfter) {
+        this.stateAfter = stateAfter;
     }
 
     public ChestAccess getChestAccess() {
-
         return chestAccess;
     }
 
     public void setChestAccess(ChestAccess chestAccess) {
-
         this.chestAccess = chestAccess;
     }
 
+    @Override
     public HandlerList getHandlers() {
-
         return handlers;
     }
 
     public static HandlerList getHandlerList() {
-
         return handlers;
     }
 }

src/main/java/de/diddiz/LogBlock/events/EntityChangePreLogEvent.java

@@ -0,0 +1,54 @@
+package de.diddiz.LogBlock.events;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.EntityChange.EntityChangeType;
+import org.bukkit.Location;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.HandlerList;
+
+public class EntityChangePreLogEvent extends PreLogEvent {
+
+    private static final HandlerList handlers = new HandlerList();
+    private Location location;
+    private Entity entity;
+    private EntityChangeType changeType;
+    private YamlConfiguration changeData;
+
+    public EntityChangePreLogEvent(Actor owner, Location location, Entity entity, EntityChangeType changeType, YamlConfiguration changeData) {
+        super(owner);
+        this.location = location;
+        this.entity = entity;
+        this.changeType = changeType;
+        this.changeData = changeData;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    public Entity getEntity() {
+        return entity;
+    }
+
+    public EntityChangeType getChangeType() {
+        return changeType;
+    }
+
+    public YamlConfiguration getChangeData() {
+        return changeData;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

src/main/java/de/diddiz/LogBlock/events/PreLogEvent.java

@@ -10,7 +10,6 @@ public abstract class PreLogEvent extends Event implements Cancellable {
     protected Actor owner;
 
     public PreLogEvent(Actor owner) {
-
         this.owner = owner;
     }
 
@@ -21,8 +20,8 @@ public abstract class PreLogEvent extends Event implements Cancellable {
      * @deprecated {@link #getOwnerActor() } returns an object encapsulating
      * name and uuid.  Names are not guaranteed to be unique.
      */
+    @Deprecated
     public String getOwner() {
-
         return owner.getName();
     }
 
@@ -41,17 +40,16 @@ public abstract class PreLogEvent extends Event implements Cancellable {
      * @param owner The player/monster/cause who is involved in this event
      */
     public void setOwner(Actor owner) {
-
         this.owner = owner;
     }
 
+    @Override
     public boolean isCancelled() {
-
         return cancelled;
     }
 
+    @Override
     public void setCancelled(boolean cancelled) {
-
         this.cancelled = cancelled;
     }
 }

src/main/java/de/diddiz/LogBlock/events/ToolUseEvent.java

@@ -0,0 +1,59 @@
+package de.diddiz.LogBlock.events;
+
+import de.diddiz.LogBlock.QueryParams;
+import de.diddiz.LogBlock.Tool;
+import de.diddiz.LogBlock.ToolBehavior;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+/**
+ * Fired whether a tool is about to be used by a player.
+ */
+public class ToolUseEvent extends PlayerEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private boolean cancel;
+    private final Tool tool;
+    private final ToolBehavior behavior;
+    private final QueryParams params;
+
+    public ToolUseEvent(Player who, Tool tool, ToolBehavior behavior, QueryParams params) {
+        super(who);
+        this.tool = tool;
+        this.behavior = behavior;
+        this.params = params;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancel = cancel;
+    }
+
+    public Tool getTool() {
+        return tool;
+    }
+
+    public ToolBehavior getBehavior() {
+        return behavior;
+    }
+
+    public QueryParams getParams() {
+        return params;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java

@@ -0,0 +1,327 @@
+package de.diddiz.LogBlock.listeners;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Bee;
+import org.bukkit.entity.EnderCrystal;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Snowman;
+import org.bukkit.entity.Wither;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntityPlaceEvent;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
+import org.bukkit.event.hanging.HangingBreakEvent;
+import org.bukkit.event.hanging.HangingPlaceEvent;
+import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.EntityChange;
+import de.diddiz.LogBlock.EntityChange.EntityChangeType;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.config.Config;
+import de.diddiz.LogBlock.config.EntityLogging;
+import de.diddiz.LogBlock.util.LoggingUtil;
+import de.diddiz.LogBlock.worldedit.WorldEditHelper;
+import java.util.UUID;
+
+public class AdvancedEntityLogging extends LoggingListener {
+
+    private Player lastSpawner;
+    private Class<? extends Entity> lastSpawning;
+    private boolean lastSpawnerEgg;
+
+    // serialize them before the death event
+    private UUID lastEntityDamagedForDeathUUID;
+    private byte[] lastEntityDamagedForDeathSerialized;
+    private Entity lastEntityDamagedForDeathDamager;
+
+    public AdvancedEntityLogging(LogBlock lb) {
+        super(lb);
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                resetOnTick();
+            }
+        }.runTaskTimer(lb, 1, 1);
+    }
+
+    private void resetOnTick() {
+        lastSpawner = null;
+        lastSpawning = null;
+        lastSpawnerEgg = false;
+        lastEntityDamagedForDeathUUID = null;
+        lastEntityDamagedForDeathSerialized = null;
+        lastEntityDamagedForDeathDamager = null;
+    }
+
+    private void setLastSpawner(Player player, Class<? extends Entity> spawning, boolean spawnEgg) {
+        lastSpawner = player;
+        lastSpawning = spawning;
+        lastSpawnerEgg = spawnEgg;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerBlockPlace(BlockPlaceEvent event) {
+        Material placed = event.getBlock().getType();
+        if (placed == Material.WITHER_SKELETON_SKULL) {
+            setLastSpawner(event.getPlayer(), Wither.class, false);
+        } else if (placed == Material.CARVED_PUMPKIN) {
+            Material below = event.getBlock().getRelative(BlockFace.DOWN).getType();
+            if (below == Material.SNOW_BLOCK) {
+                setLastSpawner(event.getPlayer(), Snowman.class, false);
+            } else if (below == Material.IRON_BLOCK) {
+                setLastSpawner(event.getPlayer(), IronGolem.class, false);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            ItemStack inHand = event.getItem();
+            if (inHand != null) {
+                Material mat = inHand.getType();
+                if (mat == Material.ARMOR_STAND) {
+                    setLastSpawner(event.getPlayer(), ArmorStand.class, false);
+                } else if (mat.name().endsWith("_SPAWN_EGG")) {
+                    setLastSpawner(event.getPlayer(), null, true);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
+        ItemStack inHand = event.getHand() == EquipmentSlot.HAND ? event.getPlayer().getInventory().getItemInMainHand() : event.getPlayer().getInventory().getItemInOffHand();
+        if (inHand != null && inHand.getType() != Material.AIR) {
+            Material mat = inHand.getType();
+            if (mat.name().endsWith("_SPAWN_EGG")) {
+                setLastSpawner(event.getPlayer(), null, true);
+            }
+
+            Entity entity = event.getRightClicked();
+            if (entity instanceof ItemFrame) {
+                ItemStack oldItem = ((ItemFrame) entity).getItem();
+                if (oldItem == null || oldItem.getType() == Material.AIR) {
+                    if (Config.isLogging(entity.getWorld(), EntityLogging.MODIFY, entity)) {
+                        Actor actor = Actor.actorFromEntity(event.getPlayer());
+                        YamlConfiguration data = new YamlConfiguration();
+                        inHand = inHand.clone();
+                        inHand.setAmount(1);
+                        data.set("item", inHand);
+                        consumer.queueEntityModification(actor, entity, EntityChange.EntityChangeType.ADDEQUIP, data);
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntitySpawn(CreatureSpawnEvent event) {
+        if (!event.isCancelled()) {
+            if (event.getSpawnReason() == SpawnReason.CUSTOM || event.getSpawnReason() == SpawnReason.BEEHIVE) {
+                return;
+            }
+            if (event.getEntityType() == EntityType.ARMOR_STAND) {
+                resetOnTick();
+                return; // logged in the method below
+            }
+            LivingEntity entity = event.getEntity();
+            if (Config.isLogging(entity.getWorld(), EntityLogging.SPAWN, entity)) {
+                Actor actor = null;
+                if (lastSpawner != null && lastSpawner.getWorld() == entity.getWorld() && lastSpawner.getLocation().distance(entity.getLocation()) < 10) {
+                    if (lastSpawnerEgg && event.getSpawnReason() == SpawnReason.SPAWNER_EGG) {
+                        actor = Actor.actorFromEntity(lastSpawner);
+                    } else if (lastSpawning != null && lastSpawning.isAssignableFrom(entity.getClass())) {
+                        actor = Actor.actorFromEntity(lastSpawner);
+                    }
+                }
+                if (actor == null) {
+                    if (event.getSpawnReason() == SpawnReason.NATURAL && !Config.isLoggingNatualSpawns(entity.getWorld())) {
+                        return;
+                    }
+                    actor = new Actor(event.getSpawnReason().toString());
+                }
+                queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.CREATE);
+            }
+        }
+        resetOnTick();
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntityPlace(EntityPlaceEvent event) {
+        if (!event.isCancelled()) {
+            Entity entity = event.getEntity();
+            if (Config.isLogging(entity.getWorld(), EntityLogging.SPAWN, entity)) {
+                Actor actor = null;
+                if (event.getPlayer() != null) {
+                    actor = Actor.actorFromEntity(event.getPlayer());
+                }
+                if (actor == null) {
+                    actor = new Actor("UNKNOWN");
+                }
+                queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.CREATE);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onEntityDeath(EntityDeathEvent event) {
+        LivingEntity entity = event.getEntity();
+        if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) {
+            Actor actor = null;
+            EntityDamageEvent lastDamage = entity.getLastDamageCause();
+            if (lastDamage instanceof EntityDamageByEntityEvent) {
+                Entity damager = LoggingUtil.getRealDamager(((EntityDamageByEntityEvent) lastDamage).getDamager());
+                if (damager != null) {
+                    actor = Actor.actorFromEntity(damager);
+                }
+            }
+            if (actor == null && entity.getKiller() != null) {
+                actor = Actor.actorFromEntity(entity.getKiller());
+            }
+            if (actor == null) {
+                actor = new Actor(lastDamage == null ? "UNKNOWN" : lastDamage.getCause().toString());
+            }
+            queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onHangingPlace(HangingPlaceEvent event) {
+        Hanging entity = event.getEntity();
+        if (Config.isLogging(entity.getWorld(), EntityLogging.SPAWN, entity)) {
+            Actor actor = Actor.actorFromEntity(event.getPlayer());
+            queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.CREATE);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onHangingBreak(HangingBreakEvent event) {
+        Entity entity = event.getEntity();
+        if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) {
+            Actor actor;
+            if (event instanceof HangingBreakByEntityEvent) {
+                Entity damager = LoggingUtil.getRealDamager(((HangingBreakByEntityEvent) event).getRemover());
+                actor = Actor.actorFromEntity(damager);
+            } else {
+                actor = new Actor(event.getCause().toString());
+            }
+            queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onEntityDamage(EntityDamageEvent event) {
+        Entity entity = event.getEntity();
+        if (entity instanceof ItemFrame) {
+            ItemStack oldItem = ((ItemFrame) entity).getItem();
+            if (oldItem != null && oldItem.getType() != Material.AIR) {
+                if (Config.isLogging(entity.getWorld(), EntityLogging.MODIFY, entity)) {
+                    Actor actor;
+                    if (event instanceof EntityDamageByEntityEvent) {
+                        Entity damager = LoggingUtil.getRealDamager(((EntityDamageByEntityEvent) event).getDamager());
+                        actor = Actor.actorFromEntity(damager);
+                    } else {
+                        actor = new Actor(event.getCause().toString());
+                    }
+                    YamlConfiguration data = new YamlConfiguration();
+                    data.set("item", oldItem);
+                    consumer.queueEntityModification(actor, entity, EntityChange.EntityChangeType.REMOVEEQUIP, data);
+                }
+            }
+        }
+        if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) {
+            lastEntityDamagedForDeathUUID = entity.getUniqueId();
+            lastEntityDamagedForDeathSerialized = WorldEditHelper.serializeEntity(entity);
+        }
+        if (entity instanceof EnderCrystal) {
+            if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) {
+                if (event instanceof EntityDamageByEntityEvent) {
+                    Entity damager = LoggingUtil.getRealDamager(((EntityDamageByEntityEvent) event).getDamager());
+                    if (lastEntityDamagedForDeathDamager == null || !(damager instanceof EnderCrystal)) {
+                        lastEntityDamagedForDeathDamager = damager;
+                    }
+                }
+                Actor actor = lastEntityDamagedForDeathDamager != null ? Actor.actorFromEntity(lastEntityDamagedForDeathDamager) : new Actor(event.getCause().toString());
+                queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        Entity damager = event.getDamager();
+        if (damager instanceof Bee && !((Bee) damager).hasStung()) {
+            if (Config.isLogging(damager.getWorld(), EntityLogging.MODIFY, damager)) {
+                Actor actor = Actor.actorFromEntity(event.getEntity());
+                consumer.queueEntityModification(actor, damager, EntityChange.EntityChangeType.GET_STUNG, null);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerArmorStandManipulate(PlayerArmorStandManipulateEvent event) {
+        ArmorStand entity = event.getRightClicked();
+        ItemStack oldItem = event.getArmorStandItem();
+        ItemStack newItem = event.getPlayerItem();
+        boolean oldEmpty = oldItem == null || oldItem.getType() == Material.AIR;
+        boolean newEmpty = newItem == null || newItem.getType() == Material.AIR;
+        if ((!oldEmpty || !newEmpty) && Config.isLogging(entity.getWorld(), EntityLogging.MODIFY, entity)) {
+            Actor actor = Actor.actorFromEntity(event.getPlayer());
+            if (!oldEmpty && !newEmpty && newItem.getAmount() > 1) {
+                return;
+            }
+            if (!oldEmpty) {
+                YamlConfiguration data = new YamlConfiguration();
+                data.set("item", oldItem);
+                data.set("slot", event.getSlot().name());
+                consumer.queueEntityModification(actor, entity, EntityChange.EntityChangeType.REMOVEEQUIP, data);
+            }
+            if (!newEmpty) {
+                YamlConfiguration data = new YamlConfiguration();
+                data.set("item", newItem);
+                data.set("slot", event.getSlot().name());
+                consumer.queueEntityModification(actor, entity, EntityChange.EntityChangeType.ADDEQUIP, data);
+            }
+        }
+    }
+
+    protected void queueEntitySpawnOrKill(Entity entity, Actor actor, EntityChange.EntityChangeType changeType) {
+        Location location = entity.getLocation();
+        YamlConfiguration data = new YamlConfiguration();
+        data.set("x", location.getX());
+        data.set("y", location.getY());
+        data.set("z", location.getZ());
+        data.set("yaw", location.getYaw());
+        data.set("pitch", location.getPitch());
+        if (changeType == EntityChangeType.KILL && entity.getUniqueId().equals(lastEntityDamagedForDeathUUID)) {
+            data.set("worldedit", lastEntityDamagedForDeathSerialized);
+        } else {
+            data.set("worldedit", WorldEditHelper.serializeEntity(entity));
+        }
+        consumer.queueEntityModification(actor, entity, changeType, data);
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/BanListener.java

@@ -29,7 +29,7 @@ public class BanListener implements Listener {
             p.setPlayer(split[1].equalsIgnoreCase("g") ? split[2] : split[1]);
             p.since = 0;
             p.silent = false;
-            getScheduler().scheduleAsyncDelayedTask(logblock, new Runnable() {
+            getScheduler().runTaskAsynchronously(logblock, new Runnable() {
                 @Override
                 public void run() {
                     for (final World world : logblock.getServer().getWorlds()) {

src/main/java/de/diddiz/LogBlock/listeners/BlockBreakLogging.java

@@ -4,20 +4,24 @@ import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import de.diddiz.LogBlock.config.WorldConfig;
-import de.diddiz.util.BukkitUtils;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.Sign;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDropItemEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
 
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 import static de.diddiz.LogBlock.config.Config.isLogging;
-import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
-import static de.diddiz.util.LoggingUtil.smartLogFallables;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
 
 public class BlockBreakLogging extends LoggingListener {
     public BlockBreakLogging(LogBlock lb) {
@@ -34,19 +38,16 @@ public class BlockBreakLogging extends LoggingListener {
 
             final Actor actor = Actor.actorFromEntity(event.getPlayer());
             final Block origin = event.getBlock();
-            final int typeId = origin.getTypeId();
             final Material type = origin.getType();
 
-            if (wcfg.isLogging(Logging.SIGNTEXT) && (typeId == 63 || typeId == 68)) {
-                consumer.queueSignBreak(actor, (Sign) origin.getState());
-            } else if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.getContainerBlocks().contains(type)) {
+            if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.isContainerBlock(type) && !BukkitUtils.isShulkerBoxBlock(type)) {
                 consumer.queueContainerBreak(actor, origin.getState());
             } else if (type == Material.ICE) {
                 // When in creative mode ice doesn't form water
                 if (event.getPlayer().getGameMode().equals(GameMode.CREATIVE)) {
-                    consumer.queueBlockBreak(actor, origin.getState());
+                    smartLogBlockBreak(consumer, actor, origin);
                 } else {
-                    consumer.queueBlockReplace(actor, origin.getState(), 9, (byte) 0);
+                    smartLogBlockReplace(consumer, actor, origin, Bukkit.createBlockData(Material.WATER));
                 }
             } else {
                 smartLogBlockBreak(consumer, actor, origin);
@@ -58,7 +59,30 @@ public class BlockBreakLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerBucketFill(PlayerBucketFillEvent event) {
         if (isLogging(event.getBlockClicked().getWorld(), Logging.BLOCKBREAK)) {
+            BlockData clickedBlockData = event.getBlockClicked().getBlockData();
+            if (clickedBlockData instanceof Waterlogged) {
+                Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
+                if (clickedWaterlogged.isWaterlogged()) {
+                    Waterlogged clickedWaterloggedWithoutWater = (Waterlogged) clickedWaterlogged.clone();
+                    clickedWaterloggedWithoutWater.setWaterlogged(false);
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithoutWater);
+                }
+            } else {
                 consumer.queueBlockBreak(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getState());
             }
         }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockDropItem(BlockDropItemEvent event) {
+        if (isLogging(event.getBlock().getWorld(), Logging.BLOCKBREAK)) {
+            Material type = event.getBlock().getType();
+            if (type == Material.SUSPICIOUS_GRAVEL || type == Material.SUSPICIOUS_SAND) {
+                Material simplyBroken = type == Material.SUSPICIOUS_SAND ? Material.SAND : Material.GRAVEL;
+                if (event.getItems().size() != 1 || event.getItems().get(0).getItemStack().getType() != simplyBroken) {
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockState(), simplyBroken.createBlockData());
+                }
+            }
+        }
+    }
 }

src/main/java/de/diddiz/LogBlock/listeners/BlockBurnLogging.java

@@ -3,6 +3,8 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.Config;
+
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
@@ -10,11 +12,14 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
 import org.bukkit.event.player.PlayerInteractEvent;
 
 import static de.diddiz.LogBlock.config.Config.isLogging;
-import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
-import static de.diddiz.util.LoggingUtil.smartLogFallables;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockReplace;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
 
 public class BlockBurnLogging extends LoggingListener {
     public BlockBurnLogging(LogBlock lb) {
@@ -24,8 +29,31 @@ public class BlockBurnLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBurn(BlockBurnEvent event) {
         if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
-            smartLogBlockBreak(consumer, new Actor("Fire"), event.getBlock());
-            smartLogFallables(consumer, new Actor("Fire"), event.getBlock());
+            smartLogBlockReplace(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock(), Material.FIRE.createBlockData());
+            smartLogFallables(consumer, new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null), event.getBlock());
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockIgnite(BlockIgniteEvent event) {
+        Actor actor = new Actor("Fire", Config.logFireSpreadAsPlayerWhoCreatedIt ? event.getIgnitingBlock() : null);
+        if (event.getCause() == IgniteCause.FLINT_AND_STEEL) {
+            if (event.getIgnitingEntity() != null) {
+                return; // handled in block place
+            } else {
+                actor = new Actor("Dispenser");
+            }
+        } else if (event.getCause() == IgniteCause.LIGHTNING) {
+            actor = new Actor("Lightning");
+        } else if (event.getCause() == IgniteCause.EXPLOSION) {
+            actor = new Actor("Explosion");
+        } else if (event.getCause() == IgniteCause.LAVA) {
+            actor = new Actor("Lava");
+        } else if (event.getCause() == IgniteCause.ENDER_CRYSTAL) {
+            actor = new Actor("EnderCrystal");
+        }
+        if (isLogging(event.getBlock().getWorld(), Logging.FIRE)) {
+            consumer.queueBlockPlace(actor, event.getBlock().getLocation(), Material.FIRE.createBlockData());
         }
     }
 

src/main/java/de/diddiz/LogBlock/listeners/BlockFertilizeLogging.java

@@ -0,0 +1,36 @@
+package de.diddiz.LogBlock.listeners;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.WorldConfig;
+import org.bukkit.block.BlockState;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockFertilizeEvent;
+import static de.diddiz.LogBlock.config.Config.getWorldConfig;
+
+public class BlockFertilizeLogging extends LoggingListener {
+    public BlockFertilizeLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockFertilize(BlockFertilizeEvent event) {
+        final WorldConfig wcfg = getWorldConfig(event.getBlock().getLocation().getWorld());
+        if (wcfg != null) {
+            if (!wcfg.isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
+                return;
+            }
+            final Actor actor;
+            if (event.getPlayer() != null) {
+                actor = Actor.actorFromEntity(event.getPlayer());
+            } else {
+                actor = new Actor("Dispenser");
+            }
+            for (final BlockState state : event.getBlocks()) {
+                consumer.queueBlockReplace(actor, state.getBlock().getState(), state);
+            }
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/BlockPlaceLogging.java

@@ -3,18 +3,18 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
-import de.diddiz.LogBlock.config.WorldConfig;
-import de.diddiz.util.BukkitUtils;
-import org.bukkit.Location;
+import de.diddiz.LogBlock.config.Config;
+import de.diddiz.LogBlock.util.LoggingUtil;
 import org.bukkit.Material;
-import org.bukkit.block.BlockFace;
+import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 
-import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 import static de.diddiz.LogBlock.config.Config.isLogging;
 
 public class BlockPlaceLogging extends LoggingListener {
@@ -24,69 +24,44 @@ public class BlockPlaceLogging extends LoggingListener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-        final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
-        if (wcfg != null && wcfg.isLogging(Logging.BLOCKPLACE)) {
-            final Material type = event.getBlock().getType();
+        if (Config.isLogging(event.getBlock().getWorld(), Logging.BLOCKPLACE)) {
             final BlockState before = event.getBlockReplacedState();
             final BlockState after = event.getBlockPlaced().getState();
             final Actor actor = Actor.actorFromEntity(event.getPlayer());
-
-            //Handle falling blocks
-            if (BukkitUtils.getRelativeTopFallables().contains(type)) {
-
-                // Catch placed blocks overwriting something
-                if (before.getType() != Material.AIR) {
-                    consumer.queueBlockBreak(actor, before);
-                }
-
-                Location loc = event.getBlock().getLocation();
-                int x = loc.getBlockX();
-                int y = loc.getBlockY();
-                int z = loc.getBlockZ();
-                // Blocks only fall if they have a chance to start a velocity
-                if (event.getBlock().getRelative(BlockFace.DOWN).getType() == Material.AIR) {
-                    while (y > 0 && BukkitUtils.canFall(loc.getWorld(), x, (y - 1), z)) {
-                        y--;
-                    }
-                }
-                // If y is 0 then the sand block fell out of the world :(
-                if (y != 0) {
-                    Location finalLoc = new Location(loc.getWorld(), x, y, z);
-                    // Run this check to avoid false positives
-                    if (!BukkitUtils.getFallingEntityKillers().contains(finalLoc.getBlock().getType())) {
-                        if (finalLoc.getBlock().getType() == Material.AIR || finalLoc.equals(event.getBlock().getLocation())) {
-                            consumer.queueBlockPlace(actor, finalLoc, type.getId(), event.getBlock().getData());
-                        } else {
-                            consumer.queueBlockReplace(actor, finalLoc, finalLoc.getBlock().getTypeId(), finalLoc.getBlock().getData(), type.getId(), event.getBlock().getData());
-                        }
-                    }
-                }
+            if (before.getType() == Material.LECTERN && after.getType() == Material.LECTERN) {
                 return;
             }
-
-            //Sign logging is handled elsewhere
-            if (wcfg.isLogging(Logging.SIGNTEXT) && (type.getId() == 63 || type.getId() == 68)) {
-                return;
-            }
-
-            //Delay queuing by one tick to allow data to be updated
-            LogBlock.getInstance().getServer().getScheduler().scheduleSyncDelayedTask(LogBlock.getInstance(), new Runnable() {
-                @Override
-                public void run() {
-                    if (before.getTypeId() == 0) {
-                        consumer.queueBlockPlace(actor, after);
-                    } else {
-                        consumer.queueBlockReplace(actor, before, after);
-                    }
-                }
-            }, 1L);
+            LoggingUtil.smartLogBlockPlace(consumer, actor, before, after);
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
         if (isLogging(event.getPlayer().getWorld(), Logging.BLOCKPLACE)) {
-            consumer.queueBlockPlace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getRelative(event.getBlockFace()).getLocation(), event.getBucket() == Material.WATER_BUCKET ? 9 : 11, (byte) 0);
+            Material placedMaterial = event.getBucket() == Material.LAVA_BUCKET ? Material.LAVA : Material.WATER;
+            BlockData clickedBlockData = event.getBlockClicked().getBlockData();
+            if (placedMaterial == Material.WATER && clickedBlockData instanceof Waterlogged) {
+                Waterlogged clickedWaterlogged = (Waterlogged) clickedBlockData;
+                if (!clickedWaterlogged.isWaterlogged()) {
+                    Waterlogged clickedWaterloggedWithWater = (Waterlogged) clickedWaterlogged.clone();
+                    clickedWaterloggedWithWater.setWaterlogged(true);
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlockClicked().getLocation(), clickedWaterlogged, clickedWaterloggedWithWater);
+                    return;
+                }
+            }
+            Block placedAt = event.getBlockClicked().getRelative(event.getBlockFace());
+            if (placedAt.isEmpty()) {
+                consumer.queueBlockPlace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedMaterial.createBlockData());
+            } else {
+                BlockData placedAtBlock = placedAt.getBlockData();
+                if (placedAtBlock instanceof Waterlogged && !(((Waterlogged) placedAtBlock).isWaterlogged())) {
+                    Waterlogged clickedWaterloggedWithWater = (Waterlogged) placedAtBlock.clone();
+                    clickedWaterloggedWithWater.setWaterlogged(true);
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, clickedWaterloggedWithWater);
+                } else {
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), placedAt.getLocation(), placedAtBlock, placedMaterial.createBlockData());
+                }
+            }
         }
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/BlockSpreadLogging.java

@@ -5,6 +5,10 @@ import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.type.PointedDripstone;
+import org.bukkit.block.data.type.PointedDripstone.Thickness;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockSpreadEvent;
@@ -22,36 +26,73 @@ public class BlockSpreadLogging extends LoggingListener {
 
         String name;
 
-        World world = event.getBlock().getWorld();
-        Material type = event.getSource().getType();
+        World world = event.getNewState().getWorld();
+        Material type = event.getNewState().getType();
 
-        switch (type) {
-            case GRASS:
+        if (type == Material.SHORT_GRASS) {
             if (!isLogging(world, Logging.GRASSGROWTH)) {
                 return;
             }
             name = "GrassGrowth";
-                break;
-            case MYCEL:
+        } else if (type == Material.MYCELIUM) {
             if (!isLogging(world, Logging.MYCELIUMSPREAD)) {
                 return;
             }
             name = "MyceliumSpread";
-                break;
-            case VINE:
+        } else if (type == Material.VINE || type == Material.CAVE_VINES || type == Material.CAVE_VINES_PLANT || type == Material.WEEPING_VINES || type == Material.WEEPING_VINES_PLANT || type == Material.TWISTING_VINES || type == Material.TWISTING_VINES_PLANT) {
             if (!isLogging(world, Logging.VINEGROWTH)) {
                 return;
             }
             name = "VineGrowth";
-                break;
-            case RED_MUSHROOM:
-            case BROWN_MUSHROOM:
+        } else if (type == Material.RED_MUSHROOM || type == Material.BROWN_MUSHROOM) {
             if (!isLogging(world, Logging.MUSHROOMSPREAD)) {
                 return;
             }
             name = "MushroomSpread";
-                break;
-            default:
+        } else if (type == Material.BAMBOO || type == Material.BAMBOO_SAPLING) {
+            if (!isLogging(world, Logging.BAMBOOGROWTH)) {
+                return;
+            }
+            name = "BambooGrowth";
+            if (type == Material.BAMBOO_SAPLING) {
+                // bamboo sapling gets replaced by bamboo
+                consumer.queueBlockReplace(new Actor(name), event.getSource().getState(), Material.BAMBOO.createBlockData());
+            }
+        } else if (type == Material.POINTED_DRIPSTONE) {
+            if (!isLogging(world, Logging.DRIPSTONEGROWTH)) {
+                return;
+            }
+            name = "DripstoneGrowth";
+            PointedDripstone pointed = (PointedDripstone) event.getNewState().getBlockData();
+            if (pointed.getThickness() != Thickness.TIP_MERGE) {
+                BlockFace direction = pointed.getVerticalDirection();
+                Block previousPart = event.getBlock().getRelative(direction.getOppositeFace());
+                if (previousPart.getType() == Material.POINTED_DRIPSTONE) {
+                    PointedDripstone newBelow = (PointedDripstone) previousPart.getBlockData();
+                    newBelow.setThickness(Thickness.FRUSTUM);
+                    consumer.queueBlockReplace(new Actor(name), previousPart.getState(), newBelow);
+
+                    previousPart = previousPart.getRelative(direction.getOppositeFace());
+                    if (previousPart.getType() == Material.POINTED_DRIPSTONE) {
+                        Block evenMorePrevious = previousPart.getRelative(direction.getOppositeFace());
+                        newBelow = (PointedDripstone) previousPart.getBlockData();
+                        newBelow.setThickness(evenMorePrevious.getType() == Material.POINTED_DRIPSTONE ? Thickness.MIDDLE : Thickness.BASE);
+                        consumer.queueBlockReplace(new Actor(name), previousPart.getState(), newBelow);
+                    }
+                }
+            } else {
+                // special case because the old state is already changed (for one half)
+                PointedDripstone oldState = (PointedDripstone) event.getNewState().getBlockData();
+                oldState.setThickness(Thickness.TIP);
+                consumer.queueBlockReplace(new Actor(name), oldState, event.getNewState());
+                return;
+            }
+        } else if (type == Material.SCULK || type == Material.SCULK_VEIN || type == Material.SCULK_CATALYST || type == Material.SCULK_SENSOR || type == Material.SCULK_SHRIEKER) {
+            if (!isLogging(world, Logging.SCULKSPREAD)) {
+                return;
+            }
+            name = "SculkSpread";
+        } else {
             return;
         }
 

src/main/java/de/diddiz/LogBlock/listeners/CauldronLogging.java

@@ -0,0 +1,27 @@
+package de.diddiz.LogBlock.listeners;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.Config;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.CauldronLevelChangeEvent;
+
+public class CauldronLogging extends LoggingListener {
+    public CauldronLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onCauldronLevelChange(CauldronLevelChangeEvent event) {
+        if (Config.isLogging(event.getBlock().getWorld(), Logging.CAULDRONINTERACT)) {
+            Entity causingEntity = event.getEntity();
+            if (causingEntity instanceof Player) {
+                consumer.queueBlockReplace(Actor.actorFromEntity(causingEntity), event.getBlock().getBlockData(), event.getNewState());
+            }
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/ChatLogging.java

@@ -3,6 +3,9 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.minecart.CommandMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -18,7 +21,7 @@ public class ChatLogging extends LoggingListener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        if (isLogging(event.getPlayer().getWorld(), Logging.CHAT)) {
+        if (isLogging(event.getPlayer().getWorld(), Logging.PLAYER_COMMANDS)) {
             consumer.queueChat(Actor.actorFromEntity(event.getPlayer()), event.getMessage());
         }
     }
@@ -32,6 +35,24 @@ public class ChatLogging extends LoggingListener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onServerCommand(ServerCommandEvent event) {
-        consumer.queueChat(new Actor("Console"), "/" + event.getCommand());
+        CommandSender sender = event.getSender();
+        Actor actor;
+        if (sender instanceof BlockCommandSender) {
+            if (!isLogging(((BlockCommandSender) sender).getBlock().getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
+                return;
+            }
+            actor = new Actor("CommandBlock");
+        } else if (sender instanceof CommandMinecart) {
+            if (!isLogging(((CommandMinecart) sender).getWorld(), Logging.COMMANDBLOCK_COMMANDS)) {
+                return;
+            }
+            actor = new Actor("CommandMinecart");
+        } else {
+            if (!isLogging(Logging.CONSOLE_COMMANDS)) {
+                return;
+            }
+            actor = new Actor("Console");
+        }
+        consumer.queueChat(actor, "/" + event.getCommand());
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/ChestAccessLogging.java

@@ -4,24 +4,90 @@ import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
-
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import static de.diddiz.LogBlock.config.Config.isLogging;
-import static de.diddiz.util.BukkitUtils.*;
+import static de.diddiz.LogBlock.util.BukkitUtils.*;
 
 public class ChestAccessLogging extends LoggingListener {
-    private final Map<HumanEntity, ItemStack[]> containers = new HashMap<HumanEntity, ItemStack[]>();
+    private class PlayerActiveInventoryModifications {
+        private final HumanEntity actor;
+        private final Location location;
+        private final HashMap<ItemStack, Integer> modifications;
+
+        public PlayerActiveInventoryModifications(HumanEntity actor, Location location) {
+            this.actor = actor;
+            this.location = location;
+            this.modifications = new HashMap<>();
+        }
+
+        public void addModification(ItemStack stack, int amount) {
+            if (amount == 0) {
+                return;
+            }
+            // if we have other viewers, we have to flush their changes
+            ArrayList<PlayerActiveInventoryModifications> allViewers = containersByLocation.get(location);
+            if (allViewers.size() > 1) {
+                for (PlayerActiveInventoryModifications other : allViewers) {
+                    if (other != this) {
+                        other.flush();
+                    }
+                }
+            }
+
+            // consumer.getLogblock().getLogger().info("Modify container: " + stack + " change: " + amount);
+            stack = new ItemStack(stack);
+            stack.setAmount(1);
+            Integer existing = modifications.get(stack);
+            int newTotal = amount + (existing == null ? 0 : existing);
+            if (newTotal == 0) {
+                modifications.remove(stack);
+            } else {
+                modifications.put(stack, newTotal);
+            }
+        }
+
+        public void flush() {
+            if (!modifications.isEmpty()) {
+                for (Entry<ItemStack, Integer> e : modifications.entrySet()) {
+                    ItemStack stack = e.getKey();
+                    int amount = e.getValue();
+                    stack.setAmount(Math.abs(amount));
+                    // consumer.getLogblock().getLogger().info("Store container: " + stack + " take: " + (amount < 0));
+                    consumer.queueChestAccess(Actor.actorFromEntity(actor), location, location.getWorld().getBlockAt(location).getBlockData(), stack, amount < 0);
+                }
+                modifications.clear();
+            }
+        }
+
+        public HumanEntity getActor() {
+            return actor;
+        }
+
+        public Location getLocation() {
+            return location;
+        }
+    }
+
+    private final Map<HumanEntity, PlayerActiveInventoryModifications> containersByOwner = new HashMap<>();
+    private final Map<Location, ArrayList<PlayerActiveInventoryModifications>> containersByLocation = new HashMap<>();
 
     public ChestAccessLogging(LogBlock lb) {
         super(lb);
@@ -29,37 +95,207 @@ public class ChestAccessLogging extends LoggingListener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onInventoryClose(InventoryCloseEvent event) {
-
-        if (!isLogging(event.getPlayer().getWorld(), Logging.CHESTACCESS)) {
+        final HumanEntity player = event.getPlayer();
+        if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
             return;
         }
         InventoryHolder holder = event.getInventory().getHolder();
         if (holder instanceof BlockState || holder instanceof DoubleChest) {
-            final HumanEntity player = event.getPlayer();
-            final ItemStack[] before = containers.get(player);
-            if (before != null) {
-                final ItemStack[] after = compressInventory(event.getInventory().getContents());
-                final ItemStack[] diff = compareInventories(before, after);
-                final Location loc = getInventoryHolderLocation(holder);
-                for (final ItemStack item : diff) {
-                    consumer.queueChestAccess(Actor.actorFromEntity(player), loc, loc.getWorld().getBlockTypeIdAt(loc), (short) item.getTypeId(), (short) item.getAmount(), rawData(item));
+            final PlayerActiveInventoryModifications modifications = containersByOwner.remove(player);
+            if (modifications != null) {
+                final Location loc = modifications.getLocation();
+                ArrayList<PlayerActiveInventoryModifications> atLocation = containersByLocation.get(loc);
+                atLocation.remove(modifications);
+                if (atLocation.isEmpty()) {
+                    containersByLocation.remove(loc);
                 }
-                containers.remove(player);
+                modifications.flush();
             }
         }
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onInventoryOpen(InventoryOpenEvent event) {
-
-        if (!isLogging(event.getPlayer().getWorld(), Logging.CHESTACCESS)) {
+        final HumanEntity player = event.getPlayer();
+        if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
             return;
         }
         if (event.getInventory() != null) {
             InventoryHolder holder = event.getInventory().getHolder();
             if (holder instanceof BlockState || holder instanceof DoubleChest) {
-                if (getInventoryHolderType(holder) != 58) {
-                    containers.put(event.getPlayer(), compressInventory(event.getInventory().getContents()));
+                if (getInventoryHolderType(holder) != Material.CRAFTING_TABLE) {
+                    PlayerActiveInventoryModifications modifications = new PlayerActiveInventoryModifications(event.getPlayer(), getInventoryHolderLocation(holder));
+                    containersByOwner.put(modifications.getActor(), modifications);
+                    containersByLocation.compute(modifications.getLocation(), (k, v) -> {
+                        if (v == null) {
+                            v = new ArrayList<>();
+                        }
+                        v.add(modifications);
+                        return v;
+                    });
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onInventoryClick(InventoryClickEvent event) {
+        final HumanEntity player = event.getWhoClicked();
+        if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
+            return;
+        }
+        InventoryHolder holder = event.getInventory().getHolder();
+        if (holder instanceof BlockState || holder instanceof DoubleChest) {
+            final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
+            if (modifications != null) {
+                switch (event.getAction()) {
+                    case PICKUP_ONE:
+                    case DROP_ONE_SLOT:
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCurrentItem(), -1);
+                        }
+                        break;
+                    case PICKUP_HALF:
+                        // server behaviour: round up
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCurrentItem(), -(event.getCurrentItem().getAmount() + 1) / 2);
+                        }
+                        break;
+                    case PICKUP_SOME: // oversized stack - can not take all when clicking
+                        // server behaviour: leave a full stack in the slot, take everything else
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            int taken = event.getCurrentItem().getAmount() - event.getCurrentItem().getMaxStackSize();
+                            modifications.addModification(event.getCursor(), -taken);
+                        }
+                        break;
+                    case PICKUP_ALL:
+                    case DROP_ALL_SLOT:
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
+                        }
+                        break;
+                    case PLACE_ONE:
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCursor(), 1);
+                        }
+                        break;
+                    case PLACE_SOME: // not enough free place in target slot
+                        // server behaviour: place as much as possible
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            int placeable = event.getCurrentItem().getMaxStackSize() - event.getCurrentItem().getAmount();
+                            modifications.addModification(event.getCursor(), placeable);
+                        }
+                        break;
+                    case PLACE_ALL:
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCursor(), event.getCursor().getAmount());
+                        }
+                        break;
+                    case SWAP_WITH_CURSOR:
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            modifications.addModification(event.getCursor(), event.getCursor().getAmount());
+                            modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
+                        }
+                        break;
+                    case MOVE_TO_OTHER_INVENTORY: // shift + click
+                        boolean removed = event.getRawSlot() < event.getView().getTopInventory().getSize();
+                        modifications.addModification(event.getCurrentItem(), event.getCurrentItem().getAmount() * (removed ? -1 : 1));
+                        break;
+                    case COLLECT_TO_CURSOR: // double click
+                        // server behaviour: first collect all with an amount != maxstacksize, then others, starting from slot 0 (container)
+                        ItemStack cursor = event.getCursor();
+                        if (cursor == null) {
+                            return;
+                        }
+                        int toPickUp = cursor.getMaxStackSize() - cursor.getAmount();
+                        int takenFromContainer = 0;
+                        boolean takeFromFullStacks = false;
+                        Inventory top = event.getView().getTopInventory();
+                        Inventory bottom = event.getView().getBottomInventory();
+                        while (toPickUp > 0) {
+                            for (ItemStack stack : top.getStorageContents()) {
+                                if (cursor.isSimilar(stack)) {
+                                    if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
+                                        int take = Math.min(toPickUp, stack.getAmount());
+                                        toPickUp -= take;
+                                        takenFromContainer += take;
+                                        if (toPickUp <= 0) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if (toPickUp <= 0) {
+                                break;
+                            }
+                            for (ItemStack stack : bottom.getStorageContents()) {
+                                if (cursor.isSimilar(stack)) {
+                                    if (takeFromFullStacks == (stack.getAmount() == stack.getMaxStackSize())) {
+                                        int take = Math.min(toPickUp, stack.getAmount());
+                                        toPickUp -= take;
+                                        if (toPickUp <= 0) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if (takeFromFullStacks) {
+                                break;
+                            } else {
+                                takeFromFullStacks = true;
+                            }
+                        }
+                        if (takenFromContainer > 0) {
+                            modifications.addModification(event.getCursor(), -takenFromContainer);
+                        }
+                        break;
+                    case HOTBAR_SWAP: // number key or offhand key
+                    case HOTBAR_MOVE_AND_READD: // something was in the other slot
+                        if (event.getRawSlot() < event.getView().getTopInventory().getSize()) {
+                            ItemStack otherSlot = (event.getClick() == ClickType.SWAP_OFFHAND) ? event.getWhoClicked().getInventory().getItemInOffHand() : event.getWhoClicked().getInventory().getItem(event.getHotbarButton());
+                            if (event.getCurrentItem() != null && event.getCurrentItem().getType() != Material.AIR) {
+                                modifications.addModification(event.getCurrentItem(), -event.getCurrentItem().getAmount());
+                            }
+                            if (otherSlot != null && otherSlot.getType() != Material.AIR) {
+                                modifications.addModification(otherSlot, otherSlot.getAmount());
+                            }
+                        }
+                        break;
+                    case DROP_ALL_CURSOR:
+                    case DROP_ONE_CURSOR:
+                    case CLONE_STACK:
+                    case NOTHING:
+                        // only the cursor or nothing (but not the inventory) was modified
+                        break;
+                    case UNKNOWN:
+                    default:
+                        // unable to log something we don't know
+                        consumer.getLogblock().getLogger().warning("Unknown inventory action by " + event.getWhoClicked().getName() + ": " + event.getAction() + " Slot: " + event.getSlot() + " Slot type: " + event.getSlotType());
+                        break;
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onInventoryDrag(InventoryDragEvent event) {
+        final HumanEntity player = event.getWhoClicked();
+        if (!isLogging(player.getWorld(), Logging.CHESTACCESS)) {
+            return;
+        }
+        InventoryHolder holder = event.getInventory().getHolder();
+        if (holder instanceof BlockState || holder instanceof DoubleChest) {
+            final PlayerActiveInventoryModifications modifications = containersByOwner.get(player);
+            if (modifications != null) {
+                Inventory container = event.getView().getTopInventory();
+                int containerSize = container.getSize();
+                for (Entry<Integer, ItemStack> e : event.getNewItems().entrySet()) {
+                    int slot = e.getKey();
+                    if (slot < containerSize) {
+                        ItemStack old = container.getItem(slot);
+                        int oldAmount = (old == null || old.getType() == Material.AIR) ? 0 : old.getAmount();
+                        modifications.addModification(e.getValue(), e.getValue().getAmount() - oldAmount);
+                    }
                 }
             }
         }

src/main/java/de/diddiz/LogBlock/listeners/CreatureInteractLogging.java

@@ -4,12 +4,12 @@ import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import de.diddiz.LogBlock.config.WorldConfig;
-import de.diddiz.util.BukkitUtils;
+import de.diddiz.LogBlock.util.BukkitUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.entity.EntityType;
+import org.bukkit.block.data.type.TurtleEgg;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -26,34 +26,39 @@ public class CreatureInteractLogging extends LoggingListener {
     public void onEntityInteract(EntityInteractEvent event) {
         final WorldConfig wcfg = getWorldConfig(event.getEntity().getWorld());
 
-        final EntityType entityType = event.getEntityType();
-
         // Mobs only
-        if (event.getEntity() instanceof Player || entityType == null) {
+        if (event.getEntity() instanceof Player) {
             return;
         }
 
         if (wcfg != null) {
             final Block clicked = event.getBlock();
             final Material type = clicked.getType();
-            final int typeId = type.getId();
-            final byte blockData = clicked.getData();
             final Location loc = clicked.getLocation();
 
-            switch (type) {
-                case SOIL:
+            if (type == Material.FARMLAND) {
                 if (wcfg.isLogging(Logging.CREATURECROPTRAMPLE)) {
                     // 3 = Dirt ID
-                        consumer.queueBlock(Actor.actorFromEntity(entityType), loc, typeId, 3, blockData);
+                    consumer.queueBlock(new Actor("CreatureTrample"), loc, type.createBlockData(), Material.DIRT.createBlockData());
                     // Log the crop on top as being broken
                     Block trampledCrop = clicked.getRelative(BlockFace.UP);
-                        if (BukkitUtils.getCropBlocks().contains(trampledCrop.getType())) {
+                    if (BukkitUtils.isCropBlock(trampledCrop.getType())) {
                         consumer.queueBlockBreak(new Actor("CreatureTrample"), trampledCrop.getState());
                     }
                 }
-                    break;
+            } else if (type == Material.TURTLE_EGG) {
+                if (wcfg.isLogging(Logging.CREATURECROPTRAMPLE)) {
+                    TurtleEgg turtleEggData = (TurtleEgg) clicked.getBlockData();
+                    int eggs = turtleEggData.getEggs();
+                    if (eggs > 1) {
+                        TurtleEgg turtleEggData2 = (TurtleEgg) turtleEggData.clone();
+                        turtleEggData2.setEggs(eggs - 1);
+                        consumer.queueBlock(new Actor("CreatureTrample"), loc, turtleEggData, turtleEggData2);
+                    } else {
+                        consumer.queueBlock(new Actor("CreatureTrample"), loc, turtleEggData, Material.AIR.createBlockData());
+                    }
+                }
             }
         }
     }
 }
-

src/main/java/de/diddiz/LogBlock/listeners/DragonEggLogging.java

@@ -0,0 +1,73 @@
+package de.diddiz.LogBlock.listeners;
+
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.Config;
+import de.diddiz.LogBlock.util.LoggingUtil;
+
+public class DragonEggLogging extends LoggingListener {
+
+    private UUID lastDragonEggInteractionPlayer;
+    private Location lastDragonEggInteractionLocation;
+
+    public DragonEggLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasBlock() && event.getClickedBlock().getType() == Material.DRAGON_EGG) {
+            Block block = event.getClickedBlock();
+            if (!Config.isLogging(block.getWorld(), Logging.DRAGONEGGTELEPORT)) {
+                return;
+            }
+            lastDragonEggInteractionPlayer = event.getPlayer().getUniqueId();
+            lastDragonEggInteractionLocation = block.getLocation();
+            new BukkitRunnable() {
+                @Override
+                public void run() {
+                    lastDragonEggInteractionPlayer = null;
+                    lastDragonEggInteractionLocation = null;
+                }
+            }.runTask(LogBlock.getInstance());
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onDragonEggTeleport(BlockFromToEvent event) {
+        Block block = event.getBlock();
+        Player teleportCause = null;
+        if (lastDragonEggInteractionPlayer != null && lastDragonEggInteractionLocation != null && lastDragonEggInteractionLocation.equals(block.getLocation())) {
+            teleportCause = Bukkit.getPlayer(lastDragonEggInteractionPlayer);
+        }
+
+        if (block.getType() == Material.DRAGON_EGG && Config.isLogging(block.getWorld(), Logging.DRAGONEGGTELEPORT)) {
+            Actor actor = new Actor("DragonEgg");
+            if (teleportCause != null) {
+                actor = Actor.actorFromEntity(teleportCause);
+            }
+            BlockData data = block.getBlockData();
+            consumer.queueBlockBreak(actor, block.getLocation(), data);
+            BlockState finalState = event.getToBlock().getState();
+            finalState.setBlockData(data);
+            LoggingUtil.smartLogBlockPlace(consumer, actor, event.getToBlock().getState(), finalState);
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/EndermenLogging.java

@@ -18,7 +18,7 @@ public class EndermenLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityChangeBlock(EntityChangeBlockEvent event) {
         if (event.getEntity() instanceof Enderman && isLogging(event.getBlock().getWorld(), Logging.ENDERMEN)) {
-            consumer.queueBlockReplace(new Actor("Enderman"), event.getBlock().getState(), event.getTo().getId(), (byte) 0); // Figure out how to get the data of the placed block;
+            consumer.queueBlockReplace(new Actor("Enderman"), event.getBlock().getState(), event.getBlockData()); // Figure out how to get the data of the placed block;
         }
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/ExplosionLogging.java

@@ -3,22 +3,38 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.Config;
 import de.diddiz.LogBlock.config.WorldConfig;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.Sign;
+import org.bukkit.block.data.type.RespawnAnchor;
 import org.bukkit.entity.*;
 import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
+import org.bukkit.scheduler.BukkitRunnable;
 
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 import static de.diddiz.LogBlock.config.Config.logCreeperExplosionsAsPlayerWhoTriggeredThese;
-import static de.diddiz.util.BukkitUtils.getContainerBlocks;
+
+import java.util.UUID;
 
 public class ExplosionLogging extends LoggingListener {
+
+    private UUID lastBedInteractionPlayer;
+    private Location lastBedInteractionLocation;
+    private UUID lastRespawnAnchorInteractionPlayer;
+    private Location lastRespawnAnchorInteractionLocation;
+
     public ExplosionLogging(LogBlock lb) {
         super(lb);
     }
@@ -51,15 +67,27 @@ public class ExplosionLogging extends LoggingListener {
                     final Entity target = ((Creeper) source).getTarget();
                     actor = target instanceof Player ? Actor.actorFromEntity(target) : new Actor("Creeper");
                 } else {
-                    new Actor("Creeper");
+                    actor = new Actor("Creeper");
                 }
+            } else if (source instanceof Wither) {
+                if (!wcfg.isLogging(Logging.WITHER)) {
+                    return;
+                }
+                actor = Actor.actorFromEntity(source);
+            } else if (source instanceof WitherSkull) {
+                if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
+                    return;
+                }
+                actor = Actor.actorFromEntity(source);
             } else if (source instanceof Fireball) {
                 Fireball fireball = (Fireball) source;
                 ProjectileSource shooter = fireball.getShooter();
                 if (shooter == null) {
+                    if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
                         return;
                     }
-                if (shooter instanceof Ghast) {
+                    actor = Actor.actorFromEntity(source);
+                } else if (shooter instanceof Ghast) {
                     if (!wcfg.isLogging(Logging.GHASTFIREBALLEXPLOSION)) {
                         return;
                     }
@@ -75,26 +103,121 @@ public class ExplosionLogging extends LoggingListener {
                     return;
                 }
                 actor = Actor.actorFromEntity(source);
-            } else if (source instanceof Wither) {
-                if (!wcfg.isLogging(Logging.WITHER)) {
-                    return;
-                }
-                actor = Actor.actorFromEntity(source);
-            } else if (source instanceof WitherSkull) {
-                if (!wcfg.isLogging(Logging.WITHER_SKULL)) {
+            } else if (source instanceof EnderCrystal) {
+                if (!wcfg.isLogging(Logging.ENDERCRYSTALEXPLOSION)) {
                     return;
                 }
                 actor = Actor.actorFromEntity(source);
+
             } else {
                 if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
                     return;
                 }
             }
             for (final Block block : event.blockList()) {
-                final int type = block.getTypeId();
-                if (wcfg.isLogging(Logging.SIGNTEXT) & (type == 63 || type == 68)) {
-                    consumer.queueSignBreak(actor, (Sign) block.getState());
-                } else if (wcfg.isLogging(Logging.CHESTACCESS) && (getContainerBlocks().contains(Material.getMaterial(type)))) {
+                final Material type = block.getType();
+                if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.isContainerBlock(type) && !BukkitUtils.isShulkerBoxBlock(type)) {
+                    consumer.queueContainerBreak(actor, block.getState());
+                } else {
+                    consumer.queueBlockBreak(actor, block.getState());
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasBlock()) {
+            Block block = event.getClickedBlock();
+            if (BukkitUtils.isBed(block.getType()) && !block.getWorld().isBedWorks()) {
+                if (!Config.isLogging(block.getWorld(), Logging.BEDEXPLOSION)) {
+                    return;
+                }
+                lastBedInteractionPlayer = event.getPlayer().getUniqueId();
+                lastBedInteractionLocation = block.getLocation();
+                new BukkitRunnable() {
+                    @Override
+                    public void run() {
+                        lastBedInteractionPlayer = null;
+                        lastBedInteractionLocation = null;
+                    }
+                }.runTask(LogBlock.getInstance());
+            } else if (block.getType() == Material.RESPAWN_ANCHOR && block.getBlockData() instanceof RespawnAnchor data) {
+                if (!Config.isLogging(block.getWorld(), Logging.RESPAWNANCHOREXPLOSION)) {
+                    return;
+                }
+                ItemStack inHand = event.getItem();
+                int charges = data.getCharges();
+                if (charges < data.getMaximumCharges() && inHand != null && inHand.getType() == Material.GLOWSTONE) {
+                    // charge
+                    Actor actor = Actor.actorFromEntity(event.getPlayer());
+                    RespawnAnchor blockNew = (RespawnAnchor) data.clone();
+                    blockNew.setCharges(charges + 1);
+                    consumer.queueBlockReplace(actor, block.getState(), blockNew);
+                } else if (charges > 0 && !block.getWorld().isRespawnAnchorWorks()) {
+                    // explode
+                    Actor actor = Actor.actorFromEntity(event.getPlayer());
+                    consumer.queueBlockBreak(actor, block.getState());
+                    lastRespawnAnchorInteractionPlayer = event.getPlayer().getUniqueId();
+                    lastRespawnAnchorInteractionLocation = block.getLocation();
+                    new BukkitRunnable() {
+                        @Override
+                        public void run() {
+                            lastRespawnAnchorInteractionPlayer = null;
+                            lastRespawnAnchorInteractionLocation = null;
+                        }
+                    }.runTask(LogBlock.getInstance());
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        Player bedCause = null;
+        if (lastBedInteractionPlayer != null && lastBedInteractionLocation != null) {
+            Location block = event.getBlock().getLocation();
+            if (lastBedInteractionLocation.getWorld() == block.getWorld() && block.distanceSquared(lastBedInteractionLocation) <= 1) {
+                bedCause = Bukkit.getPlayer(lastBedInteractionPlayer);
+            }
+        }
+        Player respawnAnchorCause = null;
+        if (lastRespawnAnchorInteractionPlayer != null && lastRespawnAnchorInteractionLocation != null) {
+            Location block = event.getBlock().getLocation();
+            if (lastRespawnAnchorInteractionLocation.equals(block)) {
+                respawnAnchorCause = Bukkit.getPlayer(lastRespawnAnchorInteractionPlayer);
+            }
+        }
+
+        for (final Block block : event.blockList()) {
+            final WorldConfig wcfg = getWorldConfig(block.getLocation().getWorld());
+
+            if (wcfg != null) {
+                Actor actor = new Actor("Explosion");
+                if (bedCause != null) {
+                    if (!wcfg.isLogging(Logging.BEDEXPLOSION)) {
+                        return;
+                    }
+                    if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
+                        actor = Actor.actorFromEntity(bedCause);
+                    } else {
+                        actor = new Actor("BedExplosion");
+                    }
+                } else if (respawnAnchorCause != null) {
+                    if (!wcfg.isLogging(Logging.RESPAWNANCHOREXPLOSION)) {
+                        return;
+                    }
+                    if (Config.logBedExplosionsAsPlayerWhoTriggeredThese) {
+                        actor = Actor.actorFromEntity(respawnAnchorCause);
+                    } else {
+                        actor = new Actor("RespawnAnchorExplosion");
+                    }
+                } else if (!wcfg.isLogging(Logging.MISCEXPLOSION)) {
+                    return;
+                }
+
+                final Material type = block.getType();
+                if (wcfg.isLogging(Logging.CHESTACCESS) && BukkitUtils.isContainerBlock(type) && !BukkitUtils.isShulkerBoxBlock(type)) {
                     consumer.queueContainerBreak(actor, block.getState());
                 } else {
                     consumer.queueBlockBreak(actor, block.getState());

src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java

@@ -3,21 +3,23 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.Config;
 import de.diddiz.LogBlock.config.WorldConfig;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Levelled;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 
 public class FluidFlowLogging extends LoggingListener {
-    private static final Set<Integer> nonFluidProofBlocks = new HashSet<Integer>(Arrays.asList(27, 28, 31, 32, 37, 38, 39, 40, 50, 51, 55, 59, 66, 69, 70, 75, 76, 78, 93, 94, 104, 105, 106));
 
     public FluidFlowLogging(LogBlock lb) {
         super(lb);
@@ -26,44 +28,71 @@ public class FluidFlowLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockFromTo(BlockFromToEvent event) {
         final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
-        if (wcfg != null) {
+        if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
+            final BlockData blockDataFrom = event.getBlock().getBlockData();
+            Material typeFrom = blockDataFrom.getMaterial();
+            boolean fromWaterlogged = false;
+            if (blockDataFrom instanceof Waterlogged) {
+                typeFrom = Material.WATER;
+                fromWaterlogged = true;
+            }
+            if (typeFrom == Material.SEAGRASS || typeFrom == Material.KELP_PLANT || typeFrom == Material.KELP) {
+                typeFrom = Material.WATER;
+                fromWaterlogged = true;
+            }
+
+            Block source = Config.logFluidFlowAsPlayerWhoTriggeredIt ? event.getBlock() : null;
             final Block to = event.getToBlock();
-            final int typeFrom = event.getBlock().getTypeId();
-            final int typeTo = to.getTypeId();
-            final boolean canFlow = typeTo == 0 || nonFluidProofBlocks.contains(typeTo);
-            if (typeFrom == 10 || typeFrom == 11) {
-                if (canFlow && wcfg.isLogging(Logging.LAVAFLOW)) {
-                    if (isSurroundedByWater(to) && event.getBlock().getData() <= 2) {
-                        consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), 4, (byte) 0);
-                    } else if (typeTo == 0) {
-                        consumer.queueBlockPlace(new Actor("LavaFlow"), to.getLocation(), 10, (byte) (event.getBlock().getData() + 1));
+            final Material typeTo = to.getType();
+            boolean down = event.getFace() == BlockFace.DOWN;
+            final boolean canFlow = BukkitUtils.isEmpty(typeTo) || BukkitUtils.isNonFluidProofBlock(typeTo);
+            if (typeFrom == Material.LAVA && wcfg.isLogging(Logging.LAVAFLOW)) {
+                Levelled levelledFrom = (Levelled) blockDataFrom;
+                if (canFlow) {
+                    if (isSurroundedByWater(to) && levelledFrom.getLevel() <= 2) {
+                        consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
                     } else {
-                        consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), 10, (byte) (event.getBlock().getData() + 1));
-                    }
-                } else if (typeTo == 8 || typeTo == 9) {
-                    if (event.getFace() == BlockFace.DOWN) {
-                        consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), 1, (byte) 0);
+                        Levelled newBlock = (Levelled) blockDataFrom.clone();
+                        newBlock.setLevel(down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
+                        if (BukkitUtils.isEmpty(typeTo)) {
+                            consumer.queueBlockPlace(new Actor("LavaFlow", source), to.getLocation(), newBlock);
                         } else {
-                        consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), 4, (byte) 0);
+                            consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), newBlock);
                         }
                     }
-            } else if ((typeFrom == 8 || typeFrom == 9) && wcfg.isLogging(Logging.WATERFLOW)) {
-                if (typeTo == 0) {
-                    consumer.queueBlockPlace(new Actor("WaterFlow"), to.getLocation(), 8, (byte) (event.getBlock().getData() + 1));
-                } else if (nonFluidProofBlocks.contains(typeTo)) {
-                    consumer.queueBlockReplace(new Actor("WaterFlow"), to.getState(), 8, (byte) (event.getBlock().getData() + 1));
-                } else if (typeTo == 10 || typeTo == 11) {
-                    if (to.getData() == 0) {
-                        consumer.queueBlockReplace(new Actor("WaterFlow"), to.getState(), 49, (byte) 0);
+                } else if (typeTo == Material.WATER) {
+                    if (down) {
+                        consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.STONE.createBlockData());
+                    } else {
+                        consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData());
+                    }
+                }
+            } else if ((typeFrom == Material.WATER) && wcfg.isLogging(Logging.WATERFLOW)) {
+                Levelled levelledFrom = fromWaterlogged ? null : (Levelled) blockDataFrom;
+                Levelled newBlock = (Levelled) Material.WATER.createBlockData();
+                newBlock.setLevel(fromWaterlogged || down ? 1 : Math.min(levelledFrom.getLevel() + 1, levelledFrom.getMaximumLevel()));
+                if (BukkitUtils.isEmpty(typeTo)) {
+                    consumer.queueBlockPlace(new Actor("WaterFlow", source), to.getLocation(), newBlock);
+                } else if (BukkitUtils.isNonFluidProofBlock(typeTo)) {
+                    consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), newBlock);
+                } else if (typeTo == Material.LAVA) {
+                    int toLevel = ((Levelled) to.getBlockData()).getLevel();
+                    if (toLevel == 0) {
+                        consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.OBSIDIAN.createBlockData());
                     } else if (event.getFace() == BlockFace.DOWN) {
-                        consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), 1, (byte) 0);
+                        consumer.queueBlockReplace(new Actor("WaterFlow", source), to.getState(), Material.STONE.createBlockData());
                     }
                 }
-                if (typeTo == 0 || nonFluidProofBlocks.contains(typeTo)) {
-                    for (final BlockFace face : new BlockFace[]{BlockFace.DOWN, BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH}) {
+                if (BukkitUtils.isEmpty(typeTo) || BukkitUtils.isNonFluidProofBlock(typeTo)) {
+                    for (final BlockFace face : new BlockFace[] { BlockFace.DOWN, BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
                         final Block lower = to.getRelative(face);
-                        if (lower.getTypeId() == 10 || lower.getTypeId() == 11) {
-                            consumer.queueBlockReplace(new Actor("WaterFlow"), lower.getState(), lower.getData() == 0 ? 49 : 4, (byte) 0);
+                        if (lower.getType() == Material.LAVA) {
+                            int toLevel = ((Levelled) lower.getBlockData()).getLevel();
+                            if (toLevel == 0) {
+                                consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.OBSIDIAN.createBlockData());
+                            } else if (event.getFace() == BlockFace.DOWN) {
+                                consumer.queueBlockReplace(new Actor("WaterFlow", source), lower.getState(), Material.STONE.createBlockData());
+                            }
                         }
                     }
                 }
@@ -71,10 +100,25 @@ public class FluidFlowLogging extends LoggingListener {
         }
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockForm(BlockFormEvent event) {
+        final WorldConfig wcfg = getWorldConfig(event.getBlock().getWorld());
+        if (wcfg != null && (wcfg.isLogging(Logging.WATERFLOW) || wcfg.isLogging(Logging.LAVAFLOW))) {
+            if (wcfg.isLogging(Logging.LAVAFLOW) && event.getBlock().getType() == Material.WATER && event.getNewState().getType() == Material.COBBLESTONE) {
+                consumer.queueBlockReplace(new Actor("LavaFlow"), event.getBlock().getBlockData(), event.getNewState());
+            }
+            if (wcfg.isLogging(Logging.WATERFLOW) && event.getBlock().getType() == Material.LAVA) {
+                consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
+            }
+            if (wcfg.isLogging(Logging.WATERFLOW) && BukkitUtils.isConcreteBlock(event.getNewState().getType())) {
+                consumer.queueBlockReplace(new Actor("WaterFlow"), event.getBlock().getBlockData(), event.getNewState());
+            }
+        }
+    }
+
     private static boolean isSurroundedByWater(Block block) {
-        for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH}) {
-            final int type = block.getRelative(face).getTypeId();
-            if (type == 8 || type == 9) {
+        for (final BlockFace face : new BlockFace[] { BlockFace.NORTH, BlockFace.WEST, BlockFace.EAST, BlockFace.SOUTH }) {
+            if (block.getRelative(face).getType() == Material.WATER) {
                 return true;
             }
         }

src/main/java/de/diddiz/LogBlock/listeners/InteractLogging.java

@@ -4,16 +4,42 @@ import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import de.diddiz.LogBlock.config.WorldConfig;
-import de.diddiz.util.BukkitUtils;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import java.util.UUID;
+import org.bukkit.DyeColor;
+import org.bukkit.GameEvent;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Note;
+import org.bukkit.Note.Tone;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.Lightable;
+import org.bukkit.block.data.Openable;
+import org.bukkit.block.data.type.Cake;
+import org.bukkit.block.data.type.Candle;
+import org.bukkit.block.data.type.Comparator;
+import org.bukkit.block.data.type.Comparator.Mode;
+import org.bukkit.block.data.type.DaylightDetector;
+import org.bukkit.block.data.type.Door;
+import org.bukkit.block.data.type.NoteBlock;
+import org.bukkit.block.data.type.Repeater;
+import org.bukkit.block.data.type.Switch;
+import org.bukkit.block.data.type.TurtleEgg;
+import org.bukkit.block.sign.Side;
+import org.bukkit.block.sign.SignSide;
 import org.bukkit.entity.Player;
+import org.bukkit.event.Event.Result;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.world.GenericGameEvent;
+import org.bukkit.inventory.ItemStack;
 
 import static de.diddiz.LogBlock.config.Config.getWorldConfig;
 
@@ -22,6 +48,10 @@ public class InteractLogging extends LoggingListener {
         super(lb);
     }
 
+    private UUID lastInteractionPlayer;
+    private BlockData lastInteractionBlockData;
+    private Location lastInteractionLocation;
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerInteract(PlayerInteractEvent event) {
         final WorldConfig wcfg = getWorldConfig(event.getPlayer().getWorld());
@@ -30,74 +60,215 @@ public class InteractLogging extends LoggingListener {
             if (clicked == null) {
                 return;
             }
-            final Material type = clicked.getType();
-            final int typeId = type.getId();
-            final byte blockData = clicked.getData();
+            final BlockData blockData = clicked.getBlockData();
+            final Material type = blockData.getMaterial();
             final Player player = event.getPlayer();
             final Location loc = clicked.getLocation();
+            lastInteractionPlayer = player.getUniqueId();
+            lastInteractionBlockData = blockData;
+            lastInteractionLocation = loc;
 
-            switch (type) {
-                case LEVER:
-                case WOOD_BUTTON:
-                case STONE_BUTTON:
-                    if (wcfg.isLogging(Logging.SWITCHINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
-                    }
-                    break;
-                case FENCE_GATE:
-                case WOODEN_DOOR:
-                case TRAP_DOOR:
+            if (BukkitUtils.isFenceGate(type) || BukkitUtils.isWoodenTrapdoor(type)) {
                 if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
+                    Openable newBlockData = (Openable) blockData.clone();
+                    newBlockData.setOpen(!newBlockData.isOpen());
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
                 }
-                    break;
-                case CAKE_BLOCK:
-                    if (wcfg.isLogging(Logging.CAKEEAT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && player.getFoodLevel() < 20) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
-                    }
-                    break;
-                case NOTE_BLOCK:
-                    if (wcfg.isLogging(Logging.NOTEBLOCKINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
-                    }
-                    break;
-                case DIODE_BLOCK_OFF:
-                case DIODE_BLOCK_ON:
-                    if (wcfg.isLogging(Logging.DIODEINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
-                    }
-                    break;
-                case REDSTONE_COMPARATOR_OFF:
-                case REDSTONE_COMPARATOR_ON:
-                    if (wcfg.isLogging(Logging.COMPARATORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
-                    }
-                    break;
-                case WOOD_PLATE:
-                case STONE_PLATE:
-                case IRON_PLATE:
-                case GOLD_PLATE:
+            } else if (BukkitUtils.isPressurePlate(type)) {
                 if (wcfg.isLogging(Logging.PRESUREPLATEINTERACT) && event.getAction() == Action.PHYSICAL) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
                 }
-                    break;
-                case TRIPWIRE:
+            } else if (BukkitUtils.isWoodenDoor(type)) {
+                if (wcfg.isLogging(Logging.DOORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    Door newBlockData = (Door) blockData.clone();
+                    newBlockData.setOpen(!newBlockData.isOpen());
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (BukkitUtils.isButton(type) || type == Material.LEVER) {
+                if (wcfg.isLogging(Logging.SWITCHINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    Switch newBlockData = (Switch) blockData.clone();
+                    if (!newBlockData.isPowered() || type == Material.LEVER) {
+                        newBlockData.setPowered(!newBlockData.isPowered());
+                    }
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (BukkitUtils.isSign(type)) {
+                if (wcfg.isLogging(Logging.SIGNTEXT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getItem() != null) {
+                    Material itemType = event.getItem().getType();
+                    if (BukkitUtils.isDye(itemType) || itemType == Material.GLOW_INK_SAC || itemType == Material.INK_SAC || itemType == Material.HONEYCOMB) {
+                        final BlockState before = event.getClickedBlock().getState();
+                        if (before instanceof Sign signBefore) {
+                            if (!signBefore.isWaxed()) {
+                                final Sign signAfter = (Sign) event.getClickedBlock().getState();
+                                Side side = BukkitUtils.getFacingSignSide(player, clicked);
+                                SignSide signSideBefore = signBefore.getSide(side);
+                                SignSide signSideAfter = signAfter.getSide(side);
+                                if (itemType == Material.GLOW_INK_SAC) {
+                                    if (!signSideBefore.isGlowingText() && hasText(signSideBefore)) {
+                                        signSideAfter.setGlowingText(true);
+                                        consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
+                                    }
+                                } else if (itemType == Material.INK_SAC) {
+                                    if (signSideBefore.isGlowingText() && hasText(signSideBefore)) {
+                                        signSideAfter.setGlowingText(false);
+                                        consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
+                                    }
+                                } else if (itemType == Material.HONEYCOMB) {
+                                    signAfter.setWaxed(true);
+                                    consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
+                                } else if (BukkitUtils.isDye(itemType) && hasText(signSideBefore)) {
+                                    DyeColor newColor = BukkitUtils.dyeToDyeColor(itemType);
+                                    if (newColor != null && signSideBefore.getColor() != newColor) {
+                                        signSideAfter.setColor(newColor);
+                                        consumer.queueBlockReplace(Actor.actorFromEntity(player), signBefore, signAfter);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (type == Material.CAKE) {
+                if (event.hasItem() && BukkitUtils.isCandle(event.getItem().getType()) && event.useItemInHand() != Result.DENY) {
+                    BlockData newBlockData = Material.valueOf(event.getItem().getType().name() + "_CAKE").createBlockData();
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                } else if (wcfg.isLogging(Logging.CAKEEAT) && event.getAction() == Action.RIGHT_CLICK_BLOCK && player.getFoodLevel() < 20) {
+                    Cake newBlockData = (Cake) blockData.clone();
+                    if (newBlockData.getBites() < 6) {
+                        newBlockData.setBites(newBlockData.getBites() + 1);
+                        consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                    } else {
+                        consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.AIR.createBlockData());
+                    }
+                }
+            } else if (type == Material.NOTE_BLOCK) {
+                if (wcfg.isLogging(Logging.NOTEBLOCKINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    NoteBlock newBlockData = (NoteBlock) blockData.clone();
+                    if (newBlockData.getNote().getOctave() == 2) {
+                        newBlockData.setNote(new Note(0, Tone.F, true));
+                    } else {
+                        newBlockData.setNote(newBlockData.getNote().sharped());
+                    }
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (type == Material.REPEATER) {
+                if (wcfg.isLogging(Logging.DIODEINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    Repeater newBlockData = (Repeater) blockData.clone();
+                    newBlockData.setDelay((newBlockData.getDelay() % 4) + 1);
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (type == Material.COMPARATOR) {
+                if (wcfg.isLogging(Logging.COMPARATORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    Comparator newBlockData = (Comparator) blockData.clone();
+                    newBlockData.setMode(newBlockData.getMode() == Mode.COMPARE ? Mode.SUBTRACT : Mode.COMPARE);
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (type == Material.DAYLIGHT_DETECTOR) {
+                if (wcfg.isLogging(Logging.DAYLIGHTDETECTORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    DaylightDetector newBlockData = (DaylightDetector) blockData.clone();
+                    newBlockData.setInverted(!newBlockData.isInverted());
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                }
+            } else if (type == Material.TRIPWIRE) {
                 if (wcfg.isLogging(Logging.TRIPWIREINTERACT) && event.getAction() == Action.PHYSICAL) {
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, typeId, blockData);
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
                 }
-                    break;
-                case SOIL:
+            } else if (type == Material.FARMLAND) {
                 if (wcfg.isLogging(Logging.CROPTRAMPLE) && event.getAction() == Action.PHYSICAL) {
                     // 3 = Dirt ID
-                        consumer.queueBlock(Actor.actorFromEntity(player), loc, typeId, 3, blockData);
+                    consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.DIRT.createBlockData());
                     // Log the crop on top as being broken
                     Block trampledCrop = clicked.getRelative(BlockFace.UP);
-                        if (BukkitUtils.getCropBlocks().contains(trampledCrop.getType())) {
+                    if (BukkitUtils.isCropBlock(trampledCrop.getType())) {
                         consumer.queueBlockBreak(Actor.actorFromEntity(player), trampledCrop.getState());
                     }
                 }
-                    break;
+            } else if (type == Material.TURTLE_EGG) {
+                if (wcfg.isLogging(Logging.BLOCKBREAK) && event.getAction() == Action.PHYSICAL) {
+                    TurtleEgg turtleEggData = (TurtleEgg) blockData;
+                    int eggs = turtleEggData.getEggs();
+                    if (eggs > 1) {
+                        TurtleEgg turtleEggData2 = (TurtleEgg) turtleEggData.clone();
+                        turtleEggData2.setEggs(eggs - 1);
+                        consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, turtleEggData2);
+                    } else {
+                        consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, Material.AIR.createBlockData());
                     }
                 }
+            } else if (type == Material.PUMPKIN) {
+                if ((wcfg.isLogging(Logging.BLOCKBREAK) || wcfg.isLogging(Logging.BLOCKPLACE)) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+                    ItemStack inHand = event.getItem();
+                    if (inHand != null && inHand.getType() == Material.SHEARS) {
+                        BlockFace clickedFace = event.getBlockFace();
+                        Directional newBlockData = (Directional) Material.CARVED_PUMPKIN.createBlockData();
+                        if (clickedFace == BlockFace.NORTH || clickedFace == BlockFace.SOUTH || clickedFace == BlockFace.EAST || clickedFace == BlockFace.WEST) {
+                            newBlockData.setFacing(clickedFace);
+                        } else {
+                            // use player distance to calculate the facing
+                            Location playerLoc = player.getLocation();
+                            playerLoc.subtract(0.5, 0, 0.5);
+                            double dx = playerLoc.getX() - loc.getX();
+                            double dz = playerLoc.getZ() - loc.getZ();
+                            if (Math.abs(dx) > Math.abs(dz)) {
+                                newBlockData.setFacing(dx > 0 ? BlockFace.EAST : BlockFace.WEST);
+                            } else {
+                                newBlockData.setFacing(dz > 0 ? BlockFace.SOUTH : BlockFace.NORTH);
+                            }
+                        }
+                        consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
+                    }
+                }
+            }
+        }
+    }
+
+    private boolean hasText(SignSide signSide) {
+        for (int i = 0; i < 4; i++) {
+            if (!signSide.getLine(i).isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onGenericGameEvent(GenericGameEvent event) {
+        if (lastInteractionPlayer != null && event.getEntity() != null && event.getEntity().getUniqueId().equals(lastInteractionPlayer) && lastInteractionLocation != null && event.getLocation().equals(lastInteractionLocation)) {
+            if (lastInteractionBlockData instanceof Candle) {
+                Candle previousCandle = (Candle) lastInteractionBlockData;
+                if (previousCandle.isLit()) {
+                    BlockData newData = lastInteractionLocation.getBlock().getBlockData();
+                    if (newData instanceof Candle) {
+                        Candle newCandle = (Candle) newData;
+                        if (!newCandle.isLit() && !newCandle.isWaterlogged()) {
+                            // log candle extinguish
+                            consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
+                        }
+                    }
+                }
+            } else if (lastInteractionBlockData instanceof Lightable && BukkitUtils.isCandleCake(lastInteractionBlockData.getMaterial())) {
+                Lightable previousLightable = (Lightable) lastInteractionBlockData;
+                BlockData newData = lastInteractionLocation.getBlock().getBlockData();
+                if (event.getEvent().equals(GameEvent.EAT)) {
+                    final WorldConfig wcfg = getWorldConfig(event.getLocation().getWorld());
+                    if (wcfg.isLogging(Logging.CAKEEAT)) {
+                        // nom nom (don't know why newData is incorrect here)
+                        newData = Material.CAKE.createBlockData();
+                        ((Cake) newData).setBites(1);
+                        consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
+                    }
+                } else if (previousLightable.isLit()) {
+                    if (newData instanceof Lightable) {
+                        Lightable newLightable = (Lightable) newData;
+                        if (!newLightable.isLit()) {
+                            // log cake extinguish
+                            consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), lastInteractionLocation, lastInteractionBlockData, newData);
+                        }
+                    }
+                }
+            }
+        }
+        lastInteractionPlayer = null;
+        lastInteractionBlockData = null;
+        lastInteractionLocation = null;
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java

@@ -16,7 +16,6 @@ import org.bukkit.event.entity.EntityDeathEvent;
 
 import static de.diddiz.LogBlock.config.Config.*;
 
-
 public class KillLogging extends LoggingListener {
 
     public KillLogging(LogBlock lb) {
@@ -37,6 +36,8 @@ public class KillLogging extends LoggingListener {
                     return;
                 }
                 consumer.queueKill(killer, victim);
+            } else if (deathEvent.getEntity().getKiller() != null) {
+                consumer.queueKill(deathEvent.getEntity().getKiller(), victim);
             } else if (logEnvironmentalKills) {
                 if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player)) {
                     return;

src/main/java/de/diddiz/LogBlock/listeners/LeavesDecayLogging.java

@@ -8,8 +8,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.LeavesDecayEvent;
 
 import static de.diddiz.LogBlock.config.Config.isLogging;
-import static de.diddiz.util.LoggingUtil.smartLogBlockBreak;
-import static de.diddiz.util.LoggingUtil.smartLogFallables;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogBlockBreak;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
 
 public class LeavesDecayLogging extends LoggingListener {
     public LeavesDecayLogging(LogBlock lb) {

src/main/java/de/diddiz/LogBlock/listeners/LecternLogging.java

@@ -0,0 +1,67 @@
+package de.diddiz.LogBlock.listeners;
+
+import static de.diddiz.LogBlock.config.Config.getWorldConfig;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.WorldConfig;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Lectern;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.player.PlayerTakeLecternBookEvent;
+import org.bukkit.inventory.ItemStack;
+
+public class LecternLogging extends LoggingListener {
+    public LecternLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockPlace(BlockPlaceEvent event) {
+        final WorldConfig wcfg = getWorldConfig(event.getPlayer().getWorld());
+        if (wcfg != null && wcfg.isLogging(Logging.LECTERNBOOKCHANGE)) {
+            final BlockState before = event.getBlockReplacedState();
+            final BlockState after = event.getBlockPlaced().getState();
+            if (before.getType() == Material.LECTERN && after.getType() == Material.LECTERN) {
+                Lectern lecternBefore = (Lectern) before.getBlock().getState();
+                ItemStack book = lecternBefore.getSnapshotInventory().getItem(0);
+                try {
+                    lecternBefore.getSnapshotInventory().setItem(0, null);
+                } catch (NullPointerException e) {
+                    //ignored
+                }
+                lecternBefore.setBlockData(before.getBlockData());
+                consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), lecternBefore, after);
+                try {
+                    lecternBefore.getSnapshotInventory().setItem(0, book);
+                } catch (NullPointerException e) {
+                    //ignored
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerTakeLecternBook(PlayerTakeLecternBookEvent event) {
+        final WorldConfig wcfg = getWorldConfig(event.getPlayer().getWorld());
+        if (wcfg != null && wcfg.isLogging(Logging.LECTERNBOOKCHANGE)) {
+            Lectern oldState = event.getLectern();
+            Lectern newState = (Lectern) oldState.getBlock().getState();
+            try {
+                newState.getSnapshotInventory().setItem(0, null);
+            } catch (NullPointerException e) {
+                //ignored
+            }
+            org.bukkit.block.data.type.Lectern oldBlockData = (org.bukkit.block.data.type.Lectern) oldState.getBlockData();
+            org.bukkit.block.data.type.Lectern blockData = (org.bukkit.block.data.type.Lectern) Material.LECTERN.createBlockData();
+            blockData.setFacing(oldBlockData.getFacing());
+            blockData.setPowered(oldBlockData.isPowered());
+            newState.setBlockData(blockData);
+            consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), oldState, newState);
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/LockedChestDecayLogging.java

@@ -1,26 +0,0 @@
-package de.diddiz.LogBlock.listeners;
-
-import de.diddiz.LogBlock.Actor;
-import de.diddiz.LogBlock.LogBlock;
-import de.diddiz.LogBlock.Logging;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockFadeEvent;
-
-import static de.diddiz.LogBlock.config.Config.isLogging;
-
-public class LockedChestDecayLogging extends LoggingListener {
-    public LockedChestDecayLogging(LogBlock lb) {
-        super(lb);
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockFade(BlockFadeEvent event) {
-        if (isLogging(event.getBlock().getWorld(), Logging.LOCKEDCHESTDECAY)) {
-            final int type = event.getBlock().getTypeId();
-            if (type == 95) {
-                consumer.queueBlockReplace(new Actor("LockedChestDecay"), event.getBlock().getState(), event.getNewState());
-            }
-        }
-    }
-}

src/main/java/de/diddiz/LogBlock/listeners/OxidizationLogging.java

@@ -0,0 +1,28 @@
+package de.diddiz.LogBlock.listeners;
+
+import static de.diddiz.LogBlock.config.Config.isLogging;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockFormEvent;
+
+public class OxidizationLogging extends LoggingListener {
+    public OxidizationLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockPhysics(BlockFormEvent event) {
+        if (isLogging(event.getBlock().getWorld(), Logging.OXIDIZATION)) {
+            final Material type = event.getNewState().getType();
+            if (type.name().contains("COPPER")) {
+                consumer.queueBlockReplace(new Actor("NaturalOxidization"), event.getBlock().getState(), event.getNewState());
+            }
+        }
+    }
+
+}

src/main/java/de/diddiz/LogBlock/listeners/PlayerInfoLogging.java

@@ -1,23 +1,43 @@
 package de.diddiz.LogBlock.listeners;
 
 import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.config.Config;
+
+import java.util.HashMap;
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class PlayerInfoLogging extends LoggingListener {
+
+    private final HashMap<UUID, Long> playerLogins = new HashMap<>();
+
     public PlayerInfoLogging(LogBlock lb) {
         super(lb);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
+        playerLogins.put(event.getPlayer().getUniqueId(), System.currentTimeMillis());
         consumer.queueJoin(event.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(PlayerQuitEvent event) {
-        consumer.queueLeave(event.getPlayer());
+        onPlayerQuit(event.getPlayer());
+    }
+
+    public void onPlayerQuit(Player player) {
+        Long joinTime = playerLogins.remove(player.getUniqueId());
+        if (Config.logPlayerInfo && joinTime != null) {
+            long onlineTime = (System.currentTimeMillis() - joinTime) / 1000;
+            if (onlineTime > 0) {
+                consumer.queueLeave(player, onlineTime);
+            }
+        }
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/ScaffoldingLogging.java

@@ -0,0 +1,171 @@
+package de.diddiz.LogBlock.listeners;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import java.util.ArrayDeque;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+import static de.diddiz.LogBlock.config.Config.isLogging;
+import static de.diddiz.LogBlock.util.LoggingUtil.smartLogFallables;
+
+public class ScaffoldingLogging extends LoggingListener {
+    private final static long MAX_SCAFFOLDING_LOG_TIME_MS = 2000;
+    private final static EnumSet<BlockFace> NEIGHBOURS_SIDES_AND_UP = EnumSet.of(BlockFace.UP, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST);
+    private final static EnumSet<BlockFace> NEIGHBOURS_SIDES_AND_BELOW = EnumSet.of(BlockFace.DOWN, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST);
+
+    private final ArrayDeque<ScaffoldingBreaker> scaffoldingBreakersList = new ArrayDeque<>();
+    private final HashMap<Location, ScaffoldingBreaker> scaffoldingBreakersByLocation = new HashMap<>();
+    private final HashMap<Location, Actor> scaffoldingPlacersByLocation = new HashMap<>();
+
+    public ScaffoldingLogging(LogBlock lb) {
+        super(lb);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockFade(BlockFadeEvent event) {
+        Block block = event.getBlock();
+        if (isLogging(block.getWorld(), Logging.SCAFFOLDING)) {
+            final Material type = block.getType();
+            if (type == Material.SCAFFOLDING) {
+                Actor actor = scaffoldingPlacersByLocation.get(block.getLocation()); // get placer before cleanupScaffoldingBreakers
+                cleanupScaffoldingBreakers();
+                if (actor == null) {
+                    actor = getScaffoldingBreaker(block);
+                    if (actor != null) {
+                        for (BlockFace dir : NEIGHBOURS_SIDES_AND_UP) {
+                            Block otherBlock = block.getRelative(dir);
+                            if (otherBlock.getType() == Material.SCAFFOLDING) {
+                                addScaffoldingBreaker(actor, otherBlock);
+                            }
+                        }
+                    } else {
+                        actor = new Actor("ScaffoldingFall");
+                    }
+                }
+                consumer.queueBlockReplace(actor, block.getState(), event.getNewState());
+                smartLogFallables(consumer, actor, block);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockBreak(BlockBreakEvent event) {
+        Block block = event.getBlock();
+        if (isLogging(block.getWorld(), Logging.SCAFFOLDING)) {
+            cleanupScaffoldingBreakers();
+            Block otherBlock;
+            if (block.getType() == Material.SCAFFOLDING) {
+                for (BlockFace dir : NEIGHBOURS_SIDES_AND_UP) {
+                    otherBlock = block.getRelative(dir);
+                    if (otherBlock.getType() == Material.SCAFFOLDING) {
+                        addScaffoldingBreaker(Actor.actorFromEntity(event.getPlayer()), otherBlock);
+                    }
+                }
+            } else if ((otherBlock = block.getRelative(BlockFace.UP)).getType() == Material.SCAFFOLDING) {
+                addScaffoldingBreaker(Actor.actorFromEntity(event.getPlayer()), otherBlock);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block block = event.getBlock();
+        if (isLogging(block.getWorld(), Logging.SCAFFOLDING)) {
+            cleanupScaffoldingBreakers();
+            if (block.getType() == Material.SCAFFOLDING) {
+                scaffoldingPlacersByLocation.put(block.getLocation(), Actor.actorFromEntity(event.getPlayer()));
+            }
+        }
+    }
+
+    public void addScaffoldingBreaker(Actor actor, Block block) {
+        ScaffoldingBreaker breaker = new ScaffoldingBreaker(actor, block.getLocation());
+        scaffoldingBreakersList.addLast(breaker);
+        scaffoldingBreakersByLocation.put(breaker.getLocation(), breaker);
+
+    }
+
+    private void cleanupScaffoldingBreakers() {
+        if (!scaffoldingPlacersByLocation.isEmpty()) {
+            scaffoldingPlacersByLocation.clear();
+        }
+        if (!scaffoldingBreakersList.isEmpty()) {
+            long time = System.currentTimeMillis() - MAX_SCAFFOLDING_LOG_TIME_MS;
+            while (!scaffoldingBreakersList.isEmpty() && scaffoldingBreakersList.getFirst().getTime() < time) {
+                ScaffoldingBreaker breaker = scaffoldingBreakersList.removeFirst();
+                scaffoldingBreakersByLocation.remove(breaker.getLocation(), breaker);
+            }
+        }
+    }
+
+    private Actor getScaffoldingBreaker(Block block) {
+        if (scaffoldingBreakersList.isEmpty()) {
+            return null;
+        }
+
+        ScaffoldingBreaker breaker = scaffoldingBreakersByLocation.get(block.getLocation());
+        if (breaker != null) {
+            return breaker.getActor();
+        }
+
+        // Search all connected scaffoldings
+        ArrayDeque<Block> front = new ArrayDeque<>();
+        HashSet<Block> frontAndDone = new HashSet<>();
+        front.addLast(block);
+        frontAndDone.add(block);
+        while (!front.isEmpty()) {
+            Block current = front.removeFirst();
+            Location loc = current.getLocation();
+
+            breaker = scaffoldingBreakersByLocation.get(loc);
+            if (breaker != null) {
+                return breaker.getActor();
+            }
+
+            for (BlockFace dir : NEIGHBOURS_SIDES_AND_BELOW) {
+                Block otherBlock = current.getRelative(dir);
+                if (!frontAndDone.contains(otherBlock) && otherBlock.getType() == Material.SCAFFOLDING) {
+                    front.addLast(otherBlock);
+                    frontAndDone.add(otherBlock);
+                }
+            }
+        }
+        return null;
+    }
+
+    class ScaffoldingBreaker {
+        protected final Actor actor;
+        protected final long time;
+        protected final Location location;
+
+        public ScaffoldingBreaker(Actor actor, Location location) {
+            this.actor = actor;
+            this.location = location;
+            this.time = System.currentTimeMillis();
+        }
+
+        public Actor getActor() {
+            return actor;
+        }
+
+        public Location getLocation() {
+            return location;
+        }
+
+        public long getTime() {
+            return time;
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/listeners/SignChangeLogging.java

@@ -3,6 +3,10 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+import java.util.Objects;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.block.sign.SignSide;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.SignChangeEvent;
@@ -17,7 +21,20 @@ public class SignChangeLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onSignChange(SignChangeEvent event) {
         if (isLogging(event.getBlock().getWorld(), Logging.SIGNTEXT)) {
-            consumer.queueSignPlace(Actor.actorFromEntity(event.getPlayer()), event.getBlock().getLocation(), event.getBlock().getTypeId(), event.getBlock().getData(), event.getLines());
+            BlockState newState = event.getBlock().getState();
+            if (newState instanceof Sign sign) {
+                SignSide signSide = sign.getSide(event.getSide());
+                boolean changed = false;
+                for (int i = 0; i < 4; i++) {
+                    if (!Objects.equals(signSide.getLine(i), event.getLine(i))) {
+                        signSide.setLine(i, event.getLine(i));
+                        changed = true;
+                    }
+                }
+                if (changed) {
+                    consumer.queueBlockReplace(Actor.actorFromEntity(event.getPlayer()), event.getBlock().getState(), newState);
+                }
+            }
         }
     }
 }

src/main/java/de/diddiz/LogBlock/listeners/SnowFadeLogging.java

@@ -3,6 +3,8 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockFadeEvent;
@@ -17,8 +19,8 @@ public class SnowFadeLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockFade(BlockFadeEvent event) {
         if (isLogging(event.getBlock().getWorld(), Logging.SNOWFADE)) {
-            final int type = event.getBlock().getTypeId();
-            if (type == 78 || type == 79) {
+            final Material type = event.getBlock().getType();
+            if (type == Material.SNOW || type == Material.ICE) {
                 consumer.queueBlockReplace(new Actor("SnowFade"), event.getBlock().getState(), event.getNewState());
             }
         }

src/main/java/de/diddiz/LogBlock/listeners/SnowFormLogging.java

@@ -3,6 +3,8 @@ package de.diddiz.LogBlock.listeners;
 import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
+
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockFormEvent;
@@ -14,17 +16,11 @@ public class SnowFormLogging extends LoggingListener {
         super(lb);
     }
 
-//	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-//	public void onLeavesDecay(LeavesDecayEvent event) {
-//		if (isLogging(event.getBlock().getWorld(), Logging.SNOWFORM))
-//			consumer.queueBlockBreak("LeavesDecay", event.getBlock().getState());
-//	}
-
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockForm(BlockFormEvent event) {
         if (isLogging(event.getBlock().getWorld(), Logging.SNOWFORM)) {
-            final int type = event.getNewState().getTypeId();
-            if (type == 78 || type == 79) {
+            final Material type = event.getNewState().getType();
+            if (type == Material.SNOW || type == Material.ICE) {
                 consumer.queueBlockReplace(new Actor("SnowForm"), event.getBlock().getState(), event.getNewState());
             }
         }

src/main/java/de/diddiz/LogBlock/listeners/StructureGrowLogging.java

@@ -20,21 +20,15 @@ public class StructureGrowLogging extends LoggingListener {
     public void onStructureGrow(StructureGrowEvent event) {
         final WorldConfig wcfg = getWorldConfig(event.getWorld());
         if (wcfg != null) {
-            final Actor actor;
-            if (event.getPlayer() != null) {
-                if (!wcfg.isLogging(Logging.BONEMEALSTRUCTUREGROW)) {
-                    return;
-                }
-                actor = Actor.actorFromEntity(event.getPlayer());
-            } else {
             if (!wcfg.isLogging(Logging.NATURALSTRUCTUREGROW)) {
                 return;
             }
-                actor = new Actor("NaturalGrow");
-            }
+            if (!event.isFromBonemeal()) {
+                final Actor actor = new Actor("NaturalGrow");
                 for (final BlockState state : event.getBlocks()) {
                     consumer.queueBlockReplace(actor, state.getBlock().getState(), state);
                 }
             }
         }
+    }
 }

src/main/java/de/diddiz/LogBlock/listeners/ToolListener.java

@@ -1,10 +1,12 @@
 package de.diddiz.LogBlock.listeners;
 
 import de.diddiz.LogBlock.*;
-import de.diddiz.worldedit.RegionContainer;
+import de.diddiz.LogBlock.events.ToolUseEvent;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import de.diddiz.LogBlock.util.CuboidRegion;
 import org.bukkit.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -30,11 +32,11 @@ public class ToolListener implements Listener {
         handler = logblock.getCommandsHandler();
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (event.getMaterial() != null) {
             final Action action = event.getAction();
-            final int type = event.getMaterial().getId();
+            final Material type = event.getMaterial();
             final Tool tool = toolsByType.get(type);
             final Player player = event.getPlayer();
             if (tool != null && (action == Action.RIGHT_CLICK_BLOCK || action == Action.LEFT_CLICK_BLOCK) && logblock.hasPermission(player, "logblock.tools." + tool.name)) {
@@ -47,27 +49,26 @@ public class ToolListener implements Listener {
                         return;
                     }
                     final Block block = event.getClickedBlock();
-                    final QueryParams params = toolData.params;
+                    final QueryParams params = toolData.params.clone();
                     params.loc = null;
                     params.sel = null;
                     if (behavior == ToolBehavior.BLOCK) {
                         params.setLocation(block.getRelative(event.getBlockFace()).getLocation());
-                    } else if ((block.getTypeId() != 54 && block.getTypeId() != 146) || tool.params.radius != 0) {
+                    } else if (tool.params.radius != 0) {
                         params.setLocation(block.getLocation());
                     } else {
-                        if (logblock.getServer().getPluginManager().isPluginEnabled("WorldEdit")) {
-                            for (final BlockFace face : new BlockFace[]{BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST}) {
-                                if (block.getRelative(face).getTypeId() == block.getTypeId()) {
-                                    params.setSelection(RegionContainer.fromCorners(event.getPlayer().getWorld(),
-                                            block.getLocation(), block.getRelative(face).getLocation()));
-                                }
-                            }
-                        }
-                        if (params.sel == null) {
+                        Block otherHalfChest = BukkitUtils.getConnectedChest(block);
+                        if (otherHalfChest == null) {
                             params.setLocation(block.getLocation());
+                        } else {
+                            params.setSelection(CuboidRegion.fromCorners(block.getLocation().getWorld(), block.getLocation(), otherHalfChest.getLocation()));
                         }
                     }
                     try {
+                        params.validate();
+                        if (this.callToolUseEvent(new ToolUseEvent(player, tool, behavior, params))) {
+                            return;
+                        }
                         if (toolData.mode == ToolMode.ROLLBACK) {
                             handler.new CommandRollback(player, params, true);
                         } else if (toolData.mode == ToolMode.REDO) {
@@ -88,6 +89,11 @@ public class ToolListener implements Listener {
         }
     }
 
+    private boolean callToolUseEvent(ToolUseEvent event) {
+        this.logblock.getServer().getPluginManager().callEvent(event);
+        return event.isCancelled();
+    }
+
     @EventHandler
     public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
         final Player player = event.getPlayer();
@@ -98,7 +104,9 @@ public class ToolListener implements Listener {
                 final ToolData toolData = entry.getValue();
                 if (toolData.enabled && !logblock.hasPermission(player, "logblock.tools." + tool.name)) {
                     toolData.enabled = false;
+                    if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
                         player.getInventory().removeItem(new ItemStack(tool.item, 1));
+                    }
                     player.sendMessage(ChatColor.GREEN + "Tool disabled.");
                 }
             }
@@ -113,12 +121,31 @@ public class ToolListener implements Listener {
             for (final Entry<Tool, ToolData> entry : session.toolData.entrySet()) {
                 final Tool tool = entry.getKey();
                 final ToolData toolData = entry.getValue();
-                final int item = event.getItemDrop().getItemStack().getTypeId();
-                if (item == tool.item && toolData.enabled && !tool.canDrop) {
+                final Material item = event.getItemDrop().getItemStack().getType();
+                if (item == tool.item && toolData.enabled) {
+                    if (tool.dropToDisable) {
+                        toolData.enabled = false;
+                        ItemStack stack = event.getItemDrop().getItemStack();
+                        if (tool.removeOnDisable && logblock.hasPermission(player, "logblock.spawnTools")) {
+                            if (stack.isSimilar(new ItemStack(item))) {
+                                if (stack.getAmount() > 1) {
+                                    stack.setAmount(stack.getAmount() - 1);
+                                    event.getItemDrop().setItemStack(stack);
+                                } else {
+                                    event.getItemDrop().remove();
+                                }
+                            }
+                        }
+                        if (BukkitUtils.hasInventoryStorageSpaceFor(player.getInventory(), stack)) {
+                            event.setCancelled(true);
+                        }
+                        player.sendMessage(ChatColor.GREEN + "Tool disabled.");
+                    } else if (!tool.canDrop) {
                         player.sendMessage(ChatColor.RED + "You cannot drop this tool.");
                         event.setCancelled(true);
                     }
                 }
             }
         }
+    }
 }

src/main/java/de/diddiz/LogBlock/listeners/WitherLogging.java

@@ -18,7 +18,7 @@ public class WitherLogging extends LoggingListener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityChangeBlock(EntityChangeBlockEvent event) {
         if (event.getEntity() instanceof Wither && isLogging(event.getBlock().getWorld(), Logging.WITHER)) {
-            consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), event.getBlock().getState(), event.getTo().getId(), event.getData()); // Wither walked through a block.
+            consumer.queueBlockReplace(Actor.actorFromEntity(event.getEntity()), event.getBlock().getState(), event.getBlockData()); // Wither walked through a block.
         }
     }
 }

src/main/java/de/diddiz/LogBlock/questioner/Question.java

@@ -0,0 +1,73 @@
+package de.diddiz.LogBlock.questioner;
+
+import org.bukkit.entity.Player;
+
+public class Question {
+    private String answer;
+    private final String[] answers;
+    private final String questionMessage;
+    private final Player respondent;
+    private final long start;
+
+    public Question(Player respondent, String questionMessage, String[] answers) {
+        this.start = System.currentTimeMillis();
+        this.respondent = respondent;
+        this.questionMessage = questionMessage;
+        this.answers = answers;
+    }
+
+    public synchronized String ask() {
+        StringBuilder options = new StringBuilder();
+        for (String ans : this.answers) {
+            options.append("/" + ans + ", ");
+        }
+        options.delete(options.length() - 2, options.length());
+        this.respondent.sendMessage(this.questionMessage);
+        this.respondent.sendMessage("- " + options + "?");
+        while (answer == null) {
+            try {
+                wait();
+            } catch (InterruptedException ex) {
+                if (answer == null) {
+                    answer = "interrupted";
+                }
+            }
+        }
+        return this.answer;
+    }
+
+    public synchronized boolean isExpired(boolean forceExpire) {
+        if (forceExpire || System.currentTimeMillis() - this.start > 120000L || this.answer != null) {
+            if (answer == null) {
+                answer = "timed out";
+            }
+            notifyAll();
+            return true;
+        }
+        return false;
+    }
+
+    public boolean returnAnswer(String answer) {
+        return returnAnswer(answer, false);
+    }
+
+    public synchronized boolean returnAnswer(String answer, boolean forceReturn) {
+        if (forceReturn) {
+            if (this.answer == null) {
+                this.answer = answer;
+            }
+            notifyAll();
+            return true;
+        }
+        for (String s : answers) {
+            if (s.equalsIgnoreCase(answer)) {
+                if (this.answer == null) {
+                    this.answer = s;
+                }
+                notifyAll();
+                return true;
+            }
+        }
+        return false;
+    }
+}

src/main/java/de/diddiz/LogBlock/questioner/Questioner.java

@@ -0,0 +1,76 @@
+package de.diddiz.LogBlock.questioner;
+
+import java.util.Iterator;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map.Entry;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import de.diddiz.LogBlock.LogBlock;
+
+public class Questioner {
+    private final LogBlock logBlock;
+    private final ConcurrentHashMap<UUID, Question> questions = new ConcurrentHashMap<>();
+
+    public Questioner(LogBlock logBlock) {
+        this.logBlock = logBlock;
+        logBlock.getServer().getPluginManager().registerEvents(new QuestionerListener(), logBlock);
+        logBlock.getServer().getScheduler().scheduleSyncRepeatingTask(logBlock, new QuestionsReaper(), 600, 600);
+    }
+
+    public String ask(Player respondent, String questionMessage, String... answers) {
+        if (Bukkit.isPrimaryThread()) {
+            throw new IllegalStateException("This method may not be called from the primary thread");
+        }
+        Question question = new Question(respondent, questionMessage, answers);
+        Question oldQuestion = this.questions.put(respondent.getUniqueId(), question);
+        if (oldQuestion != null) {
+            oldQuestion.returnAnswer("no", true);
+            // wait a little time to let the other thread continue
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        return question.ask();
+    }
+
+    private class QuestionsReaper implements Runnable {
+        @Override
+        public void run() {
+            if (questions.isEmpty()) {
+                return;
+            }
+            Iterator<Entry<UUID, Question>> it = questions.entrySet().iterator();
+            while (it.hasNext()) {
+                Entry<UUID, Question> e = it.next();
+                Question question = e.getValue();
+                if (question.isExpired(logBlock.getServer().getPlayer(e.getKey()) == null)) {
+                    it.remove();
+                }
+            }
+        }
+    }
+
+    private class QuestionerListener implements Listener {
+        @EventHandler(ignoreCancelled = true)
+        public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+            UUID player = event.getPlayer().getUniqueId();
+            Question question;
+            question = questions.get(player);
+            if (question != null) {
+                String answer = event.getMessage().substring(1).toLowerCase();
+                if (question.returnAnswer(answer)) {
+                    questions.remove(player, question);
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/util/ActionColor.java

@@ -0,0 +1,24 @@
+package de.diddiz.LogBlock.util;
+
+import net.md_5.bungee.api.ChatColor;
+
+public enum ActionColor {
+    DESTROY(ChatColor.RED),
+    CREATE(ChatColor.DARK_GREEN),
+    INTERACT(ChatColor.GRAY);
+
+    private final ChatColor color;
+
+    ActionColor(ChatColor color) {
+        this.color = color;
+    }
+
+    public ChatColor getColor() {
+        return color;
+    }
+
+    @Override
+    public String toString() {
+        return color.toString();
+    }
+}

src/main/java/de/diddiz/LogBlock/util/ComparableVersion.java

@@ -0,0 +1,424 @@
+package de.diddiz.LogBlock.util;
+
+// Taken from maven-artifact at
+// http://grepcode.com/file_/repo1.maven.org/maven2/org.apache.maven/maven-artifact/3.2.3/org/apache/maven/artifact/versioning/ComparableVersion.java/?v=source
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Stack;
+
+/**
+ * Generic implementation of version comparison.
+ *
+ * <p>Features:
+ * <ul>
+ * <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
+ * <li>transition between characters and digits also constitutes a separator:
+ *     <code>1.0alpha1 =&gt; [1, 0, alpha, 1]</code></li>
+ * <li>unlimited number of version components,</li>
+ * <li>version components in the text can be digits or strings,</li>
+ * <li>strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering.
+ *     Well-known qualifiers (case insensitive) are:<ul>
+ *     <li><code>alpha</code> or <code>a</code></li>
+ *     <li><code>beta</code> or <code>b</code></li>
+ *     <li><code>milestone</code> or <code>m</code></li>
+ *     <li><code>rc</code> or <code>cr</code></li>
+ *     <li><code>snapshot</code></li>
+ *     <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
+ *     <li><code>sp</code></li>
+ *     </ul>
+ *     Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
+ *   </li>
+ * <li>a dash usually precedes a qualifier, and is always less important than something preceded with a dot.</li>
+ * </ul></p>
+ *
+ * @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
+ * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
+ * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
+ */
+public class ComparableVersion implements Comparable<ComparableVersion> {
+    private String value;
+
+    private String canonical;
+
+    private ListItem items;
+
+    private interface Item {
+        int INTEGER_ITEM = 0;
+        int STRING_ITEM = 1;
+        int LIST_ITEM = 2;
+
+        int compareTo(Item item);
+
+        int getType();
+
+        boolean isNull();
+    }
+
+    /**
+     * Represents a numeric item in the version item list.
+     */
+    private static class IntegerItem implements Item {
+        private static final BigInteger BIG_INTEGER_ZERO = new BigInteger("0");
+
+        private final BigInteger value;
+
+        public static final IntegerItem ZERO = new IntegerItem();
+
+        private IntegerItem() {
+            this.value = BIG_INTEGER_ZERO;
+        }
+
+        public IntegerItem(String str) {
+            this.value = new BigInteger(str);
+        }
+
+        @Override
+        public int getType() {
+            return INTEGER_ITEM;
+        }
+
+        @Override
+        public boolean isNull() {
+            return BIG_INTEGER_ZERO.equals(value);
+        }
+
+        @Override
+        public int compareTo(Item item) {
+            if (item == null) {
+                return BIG_INTEGER_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+            }
+
+            switch (item.getType()) {
+                case INTEGER_ITEM:
+                    return value.compareTo(((IntegerItem) item).value);
+
+                case STRING_ITEM:
+                    return 1; // 1.1 > 1-sp
+
+                case LIST_ITEM:
+                    return 1; // 1.1 > 1-1
+
+                default:
+                    throw new RuntimeException("invalid item: " + item.getClass());
+            }
+        }
+
+        @Override
+        public String toString() {
+            return value.toString();
+        }
+    }
+
+    /**
+     * Represents a string in the version item list, usually a qualifier.
+     */
+    private static class StringItem implements Item {
+        private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
+
+        private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
+
+        private static final Properties ALIASES = new Properties();
+        static {
+            ALIASES.put("ga", "");
+            ALIASES.put("final", "");
+            ALIASES.put("cr", "rc");
+        }
+
+        /**
+         * A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
+         * the version older than one without a qualifier, or more recent.
+         */
+        private static final String RELEASE_VERSION_INDEX = String.valueOf(_QUALIFIERS.indexOf(""));
+
+        private String value;
+
+        public StringItem(String value, boolean followedByDigit) {
+            if (followedByDigit && value.length() == 1) {
+                // a1 = alpha-1, b1 = beta-1, m1 = milestone-1
+                switch (value.charAt(0)) {
+                    case 'a':
+                        value = "alpha";
+                        break;
+                    case 'b':
+                        value = "beta";
+                        break;
+                    case 'm':
+                        value = "milestone";
+                        break;
+                }
+            }
+            this.value = ALIASES.getProperty(value, value);
+        }
+
+        @Override
+        public int getType() {
+            return STRING_ITEM;
+        }
+
+        @Override
+        public boolean isNull() {
+            return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
+        }
+
+        /**
+         * Returns a comparable value for a qualifier.
+         *
+         * This method takes into account the ordering of known qualifiers then unknown qualifiers with lexical ordering.
+         *
+         * just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
+         * or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
+         * so this is still fast. If more characters are needed then it requires a lexical sort anyway.
+         *
+         * @param qualifier
+         * @return an equivalent value that can be used with lexical comparison
+         */
+        public static String comparableQualifier(String qualifier) {
+            int i = _QUALIFIERS.indexOf(qualifier);
+
+            return i == -1 ? (_QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
+        }
+
+        @Override
+        public int compareTo(Item item) {
+            if (item == null) {
+                // 1-rc < 1, 1-ga > 1
+                return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
+            }
+            switch (item.getType()) {
+                case INTEGER_ITEM:
+                    return -1; // 1.any < 1.1 ?
+
+                case STRING_ITEM:
+                    return comparableQualifier(value).compareTo(comparableQualifier(((StringItem) item).value));
+
+                case LIST_ITEM:
+                    return -1; // 1.any < 1-1
+
+                default:
+                    throw new RuntimeException("invalid item: " + item.getClass());
+            }
+        }
+
+        @Override
+        public String toString() {
+            return value;
+        }
+    }
+
+    /**
+     * Represents a version list item. This class is used both for the global item list and for sub-lists (which start
+     * with '-(number)' in the version specification).
+     */
+    private static class ListItem extends ArrayList<Item> implements Item {
+        private static final long serialVersionUID = 5914575811857700009L;
+
+        @Override
+        public int getType() {
+            return LIST_ITEM;
+        }
+
+        @Override
+        public boolean isNull() {
+            return (size() == 0);
+        }
+
+        void normalize() {
+            for (ListIterator<Item> iterator = listIterator(size()); iterator.hasPrevious();) {
+                Item item = iterator.previous();
+                if (item.isNull()) {
+                    iterator.remove(); // remove null trailing items: 0, "", empty list
+                } else {
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public int compareTo(Item item) {
+            if (item == null) {
+                if (size() == 0) {
+                    return 0; // 1-0 = 1- (normalize) = 1
+                }
+                Item first = get(0);
+                return first.compareTo(null);
+            }
+            switch (item.getType()) {
+                case INTEGER_ITEM:
+                    return -1; // 1-1 < 1.0.x
+
+                case STRING_ITEM:
+                    return 1; // 1-1 > 1-sp
+
+                case LIST_ITEM:
+                    Iterator<Item> left = iterator();
+                    Iterator<Item> right = ((ListItem) item).iterator();
+
+                    while (left.hasNext() || right.hasNext()) {
+                        Item l = left.hasNext() ? left.next() : null;
+                        Item r = right.hasNext() ? right.next() : null;
+
+                        // if this is shorter, then invert the compare and mul with -1
+                        int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r);
+
+                        if (result != 0) {
+                            return result;
+                        }
+                    }
+
+                    return 0;
+
+                default:
+                    throw new RuntimeException("invalid item: " + item.getClass());
+            }
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder buffer = new StringBuilder("(");
+            for (Iterator<Item> iter = iterator(); iter.hasNext();) {
+                buffer.append(iter.next());
+                if (iter.hasNext()) {
+                    buffer.append(',');
+                }
+            }
+            buffer.append(')');
+            return buffer.toString();
+        }
+    }
+
+    public ComparableVersion(String version) {
+        parseVersion(version);
+    }
+
+    public final void parseVersion(String version) {
+        this.value = version;
+
+        items = new ListItem();
+
+        version = version.toLowerCase(Locale.ENGLISH);
+
+        ListItem list = items;
+
+        Stack<Item> stack = new Stack<>();
+        stack.push(list);
+
+        boolean isDigit = false;
+
+        int startIndex = 0;
+
+        for (int i = 0; i < version.length(); i++) {
+            char c = version.charAt(i);
+
+            if (c == '.') {
+                if (i == startIndex) {
+                    list.add(IntegerItem.ZERO);
+                } else {
+                    list.add(parseItem(isDigit, version.substring(startIndex, i)));
+                }
+                startIndex = i + 1;
+            } else if (c == '-') {
+                if (i == startIndex) {
+                    list.add(IntegerItem.ZERO);
+                } else {
+                    list.add(parseItem(isDigit, version.substring(startIndex, i)));
+                }
+                startIndex = i + 1;
+
+                if (isDigit) {
+                    list.normalize(); // 1.0-* = 1-*
+
+                    if ((i + 1 < version.length()) && Character.isDigit(version.charAt(i + 1))) {
+                        // new ListItem only if previous were digits and new char is a digit,
+                        // ie need to differentiate only 1.1 from 1-1
+                        list.add(list = new ListItem());
+
+                        stack.push(list);
+                    }
+                }
+            } else if (Character.isDigit(c)) {
+                if (!isDigit && i > startIndex) {
+                    list.add(new StringItem(version.substring(startIndex, i), true));
+                    startIndex = i;
+                }
+
+                isDigit = true;
+            } else {
+                if (isDigit && i > startIndex) {
+                    list.add(parseItem(true, version.substring(startIndex, i)));
+                    startIndex = i;
+                }
+
+                isDigit = false;
+            }
+        }
+
+        if (version.length() > startIndex) {
+            list.add(parseItem(isDigit, version.substring(startIndex)));
+        }
+
+        while (!stack.isEmpty()) {
+            list = (ListItem) stack.pop();
+            list.normalize();
+        }
+
+        canonical = items.toString();
+    }
+
+    private static Item parseItem(boolean isDigit, String buf) {
+        return isDigit ? new IntegerItem(buf) : new StringItem(buf, false);
+    }
+
+    @Override
+    public int compareTo(ComparableVersion o) {
+        return items.compareTo(o.items);
+    }
+
+    public int compareTo(String version) {
+        return compareTo(new ComparableVersion(version));
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    public String toCanonicalString() {
+        return canonical;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return (o instanceof ComparableVersion) && canonical.equals(((ComparableVersion) o).canonical);
+    }
+
+    @Override
+    public int hashCode() {
+        return canonical.hashCode();
+    }
+}

src/main/java/de/diddiz/LogBlock/util/CuboidRegion.java

@@ -0,0 +1,58 @@
+package de.diddiz.LogBlock.util;
+
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.util.BlockVector;
+
+public class CuboidRegion implements Cloneable {
+
+    private World world;
+    private BlockVector min = new BlockVector();
+    private BlockVector max = new BlockVector();
+
+    public CuboidRegion(World world, BlockVector first, BlockVector second) {
+        this.world = world;
+        this.min.setX(Math.min(first.getBlockX(), second.getBlockX()));
+        this.min.setY(Math.min(first.getBlockY(), second.getBlockY()));
+        this.min.setZ(Math.min(first.getBlockZ(), second.getBlockZ()));
+        this.max.setX(Math.max(first.getBlockX(), second.getBlockX()));
+        this.max.setY(Math.max(first.getBlockY(), second.getBlockY()));
+        this.max.setZ(Math.max(first.getBlockZ(), second.getBlockZ()));
+    }
+
+    public static CuboidRegion fromCorners(World world, Location first, Location second) {
+        return new CuboidRegion(world, new BlockVector(first.getBlockX(), first.getBlockY(), first.getBlockZ()), new BlockVector(second.getBlockX(), second.getBlockY(), second.getBlockZ()));
+    }
+
+    public World getWorld() {
+        return world;
+    }
+
+    public BlockVector getMinimumPoint() {
+        return min;
+    }
+
+    public BlockVector getMaximumPoint() {
+        return max;
+    }
+
+    public int getSizeX() {
+        return max.getBlockX() - min.getBlockX() + 1;
+    }
+
+    public int getSizeZ() {
+        return max.getBlockZ() - min.getBlockZ() + 1;
+    }
+
+    @Override
+    public CuboidRegion clone() {
+        try {
+            CuboidRegion clone = (CuboidRegion) super.clone();
+            clone.min = min.clone();
+            clone.max = max.clone();
+            return clone;
+        } catch (final CloneNotSupportedException ex) {
+            throw new Error("CuboidRegion should be cloneable", ex);
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/util/LoggingUtil.java

@@ -0,0 +1,361 @@
+package de.diddiz.LogBlock.util;
+
+import de.diddiz.LogBlock.Actor;
+import de.diddiz.LogBlock.Consumer;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.config.WorldConfig;
+import org.bukkit.Location;
+import org.bukkit.Material;
+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.block.data.type.Bell;
+import org.bukkit.block.data.type.Bell.Attachment;
+import org.bukkit.block.data.type.Lantern;
+import org.bukkit.block.data.type.PointedDripstone;
+import org.bukkit.block.data.type.PointedDripstone.Thickness;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.projectiles.ProjectileSource;
+import java.util.List;
+
+import static de.diddiz.LogBlock.config.Config.getWorldConfig;
+import static de.diddiz.LogBlock.config.Config.mb4;
+
+public class LoggingUtil {
+
+    public static void smartLogBlockPlace(Consumer consumer, Actor actor, BlockState replaced, BlockState placed) {
+        Location loc = replaced.getLocation();
+        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 {
+                consumer.queueBlockReplace(actor, replaced, placed);
+            }
+            return;
+        }
+        int x = loc.getBlockX();
+        int initialy = loc.getBlockY();
+        int y = initialy;
+        int z = loc.getBlockZ();
+        while (y > loc.getWorld().getMinHeight() && BukkitUtils.canFallIn(loc.getWorld(), x, (y - 1), z)) {
+            y--;
+        }
+        if (initialy != y && !BukkitUtils.isEmpty(replaced.getType())) {
+            // this is not the final location but the block got removed (vines etc)
+            consumer.queueBlockBreak(actor, replaced);
+        }
+        // If y is minHeight then the block fell out of the world :(
+        if (y > loc.getWorld().getMinHeight()) {
+            // Run this check to avoid false positives
+            Location finalLoc = new Location(loc.getWorld(), x, y, z);
+            if (y == initialy || !BukkitUtils.isFallingEntityKiller(finalLoc.getBlock().getType())) {
+                if (BukkitUtils.isEmpty(finalLoc.getBlock().getType())) {
+                    consumer.queueBlockPlace(actor, finalLoc, placed.getBlockData());
+                } else {
+                    consumer.queueBlockReplace(actor, finalLoc.getBlock().getState(), placed.getBlockData());
+                }
+            }
+        }
+    }
+
+    public static void smartLogFallables(Consumer consumer, Actor actor, Block origin) {
+
+        WorldConfig wcfg = getWorldConfig(origin.getWorld());
+        if (wcfg == null) {
+            return;
+        }
+
+        //Handle falling blocks
+        Block checkBlock = origin.getRelative(BlockFace.UP);
+        int up = 0;
+        final int highestBlock = checkBlock.getWorld().getHighestBlockYAt(checkBlock.getLocation());
+        while (checkBlock.getType().hasGravity()) {
+
+            // Record this block as falling
+            consumer.queueBlockBreak(actor, checkBlock.getState());
+
+            // Guess where the block is going (This could be thrown of by explosions, but it is better than nothing)
+            Location loc = origin.getLocation();
+            int x = loc.getBlockX();
+            int y = loc.getBlockY();
+            int z = loc.getBlockZ();
+            while (y > loc.getWorld().getMinHeight() && BukkitUtils.canFallIn(loc.getWorld(), x, (y - 1), z)) {
+                y--;
+            }
+            // If y is minHeight then the sand block fell out of the world :(
+            if (y > loc.getWorld().getMinHeight()) {
+                Location finalLoc = new Location(loc.getWorld(), x, y, z);
+                // Run this check to avoid false positives
+                if (!BukkitUtils.isFallingEntityKiller(finalLoc.getBlock().getType())) {
+                    finalLoc.add(0, up, 0); // Add this here after checking for block breakers
+                    if (BukkitUtils.isEmpty(finalLoc.getBlock().getType())) {
+                        consumer.queueBlockPlace(actor, finalLoc, checkBlock.getBlockData());
+                    } else {
+                        consumer.queueBlockReplace(actor, finalLoc, finalLoc.getBlock().getBlockData(), checkBlock.getBlockData());
+                    }
+                    up++;
+                }
+            }
+            if (checkBlock.getY() >= highestBlock) {
+                break;
+            }
+            checkBlock = checkBlock.getRelative(BlockFace.UP);
+        }
+        if (wcfg.isLogging(Logging.SCAFFOLDING) && checkBlock.getType() == Material.SCAFFOLDING && consumer.getLogblock().getScaffoldingLogging() != null) {
+            consumer.getLogblock().getScaffoldingLogging().addScaffoldingBreaker(actor, checkBlock);
+        }
+    }
+
+    public static void smartLogBlockBreak(Consumer consumer, Actor actor, Block origin) {
+        smartLogBlockReplace(consumer, actor, origin, null);
+    }
+
+    public static void smartLogBlockReplace(Consumer consumer, Actor actor, Block origin, BlockData replacedWith) {
+
+        WorldConfig wcfg = getWorldConfig(origin.getWorld());
+        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());
+            }
+        }
+        if (replacedType == Material.CAVE_VINES || replacedType == Material.CAVE_VINES_PLANT) {
+            Block above = origin.getRelative(BlockFace.UP);
+            if (above.getType() == Material.CAVE_VINES_PLANT) {
+                consumer.queueBlockReplace(actor, above.getState(), Material.CAVE_VINES.createBlockData());
+            }
+        }
+
+        Block checkBlock = origin.getRelative(BlockFace.UP);
+        Material typeAbove = checkBlock.getType();
+        if (BukkitUtils.isRelativeTopBreakable(typeAbove)) {
+            if (typeAbove == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(typeAbove)) {
+                Block doorBlock = checkBlock;
+                // If the doorBlock is the top half a door the player simply punched a door
+                // this will be handled later.
+                if (!BukkitUtils.isTop(doorBlock.getBlockData())) {
+                    doorBlock = doorBlock.getRelative(BlockFace.UP);
+                    // Fall back check just in case the top half wasn't a door
+                    if (doorBlock.getType() == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(doorBlock.getType())) {
+                        consumer.queueBlockBreak(actor, doorBlock.getState());
+                    }
+                    consumer.queueBlockBreak(actor, checkBlock.getState());
+                }
+            } else if (BukkitUtils.isDoublePlant(typeAbove)) {
+                Block plantBlock = checkBlock;
+                // If the plantBlock is the top half of a double plant the player simply
+                // punched the plant this will be handled later.
+                if (!BukkitUtils.isTop(plantBlock.getBlockData())) {
+                    plantBlock = plantBlock.getRelative(BlockFace.UP);
+                    // Fall back check just in case the top half wasn't a plant
+                    if (BukkitUtils.isDoublePlant(plantBlock.getType())) {
+                        consumer.queueBlockBreak(actor, plantBlock.getState());
+                    }
+                    consumer.queueBlockBreak(actor, checkBlock.getState());
+                }
+            } else {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+                // check next blocks above
+                checkBlock = checkBlock.getRelative(BlockFace.UP);
+                typeAbove = checkBlock.getType();
+                while (BukkitUtils.isRelativeTopBreakable(typeAbove)) {
+                    consumer.queueBlockBreak(actor, checkBlock.getState());
+                    checkBlock = checkBlock.getRelative(BlockFace.UP);
+                    typeAbove = checkBlock.getType();
+                }
+            }
+        } else if (typeAbove == Material.LANTERN) {
+            Lantern lantern = (Lantern) checkBlock.getBlockData();
+            if (!lantern.isHanging()) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+            }
+        } else if (typeAbove == Material.BELL) {
+            Bell bell = (Bell) checkBlock.getBlockData();
+            if (bell.getAttachment() == Attachment.FLOOR) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+            }
+        } else if (typeAbove == Material.POINTED_DRIPSTONE) {
+            Block dripStoneBlock = checkBlock;
+            while (true) {
+                if (dripStoneBlock.getType() != Material.POINTED_DRIPSTONE) {
+                    break;
+                }
+                PointedDripstone dripstone = (PointedDripstone) dripStoneBlock.getBlockData();
+                if (dripstone.getVerticalDirection() != BlockFace.UP) {
+                    if (dripstone.getThickness() == Thickness.TIP_MERGE) {
+                        PointedDripstone newDripstone = (PointedDripstone) dripstone.clone();
+                        newDripstone.setThickness(Thickness.TIP);
+                        consumer.queueBlockReplace(actor, dripStoneBlock.getState(), newDripstone);
+                    }
+                    break;
+                }
+                consumer.queueBlockBreak(actor, dripStoneBlock.getState());
+                dripStoneBlock = dripStoneBlock.getRelative(BlockFace.UP);
+            }
+        }
+
+        checkBlock = origin.getRelative(BlockFace.DOWN);
+        Material typeBelow = checkBlock.getType();
+        if (typeBelow == Material.LANTERN) {
+            Lantern lantern = (Lantern) checkBlock.getBlockData();
+            if (lantern.isHanging()) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+            }
+        } else if (BukkitUtils.isHangingSign(typeBelow)) {
+            consumer.queueBlockBreak(actor, checkBlock.getState());
+        } else if (typeBelow == Material.BELL) {
+            Bell bell = (Bell) checkBlock.getBlockData();
+            if (bell.getAttachment() == Attachment.CEILING) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+            }
+        } else if (typeBelow == Material.WEEPING_VINES || typeBelow == Material.WEEPING_VINES_PLANT || typeBelow == Material.CAVE_VINES || typeBelow == Material.CAVE_VINES_PLANT) {
+            consumer.queueBlockBreak(actor, checkBlock.getState());
+            // check next blocks below
+            checkBlock = checkBlock.getRelative(BlockFace.DOWN);
+            typeBelow = checkBlock.getType();
+            while (typeBelow == Material.WEEPING_VINES || typeBelow == Material.WEEPING_VINES_PLANT || typeBelow == Material.CAVE_VINES || typeBelow == Material.CAVE_VINES_PLANT) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+                checkBlock = checkBlock.getRelative(BlockFace.DOWN);
+                typeBelow = checkBlock.getType();
+            }
+        } else if ((replacedType == Material.BIG_DRIPLEAF || replacedType == Material.BIG_DRIPLEAF_STEM) && (typeBelow == Material.BIG_DRIPLEAF || typeBelow == Material.BIG_DRIPLEAF_STEM)) {
+            consumer.queueBlockBreak(actor, checkBlock.getState());
+            // check next blocks below
+            checkBlock = checkBlock.getRelative(BlockFace.DOWN);
+            typeBelow = checkBlock.getType();
+            while (typeBelow == Material.BIG_DRIPLEAF || typeBelow == Material.BIG_DRIPLEAF_STEM) {
+                consumer.queueBlockBreak(actor, checkBlock.getState());
+                checkBlock = checkBlock.getRelative(BlockFace.DOWN);
+                typeBelow = checkBlock.getType();
+            }
+        } else if (typeBelow == Material.POINTED_DRIPSTONE) {
+            Block dripStoneBlock = checkBlock;
+            while (true) {
+                if (dripStoneBlock.getType() != Material.POINTED_DRIPSTONE) {
+                    break;
+                }
+                PointedDripstone dripstone = (PointedDripstone) dripStoneBlock.getBlockData();
+                if (dripstone.getVerticalDirection() != BlockFace.DOWN) {
+                    if (dripstone.getThickness() == Thickness.TIP_MERGE) {
+                        PointedDripstone newDripstone = (PointedDripstone) dripstone.clone();
+                        newDripstone.setThickness(Thickness.TIP);
+                        consumer.queueBlockReplace(actor, dripStoneBlock.getState(), newDripstone);
+                    }
+                    break;
+                }
+                consumer.queueBlockBreak(actor, dripStoneBlock.getState());
+                dripStoneBlock = dripStoneBlock.getRelative(BlockFace.DOWN);
+            }
+        }
+
+        List<Location> relativeBreakables = BukkitUtils.getBlocksNearby(origin, BukkitUtils.getRelativeBreakables());
+        if (!relativeBreakables.isEmpty()) {
+            for (Location location : relativeBreakables) {
+                Block block = location.getBlock();
+                BlockData blockData = block.getBlockData();
+                if (blockData instanceof Directional) {
+                    if (blockData.getMaterial() == Material.BELL) {
+                        if (((Bell) blockData).getAttachment() == Attachment.SINGLE_WALL) {
+                            if (block.getRelative(((Bell) blockData).getFacing()).equals(origin)) {
+                                consumer.queueBlockBreak(actor, block.getState());
+                            }
+                        }
+                    } else {
+                        if (block.getRelative(((Directional) blockData).getFacing().getOppositeFace()).equals(origin)) {
+                            consumer.queueBlockBreak(actor, block.getState());
+                        }
+                    }
+                }
+            }
+        }
+
+        // Special door check
+        if (replacedType == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(replacedType)) {
+            Block doorBlock = origin;
+
+            // Up or down?
+            if (!BukkitUtils.isTop(doorBlock.getBlockData())) {
+                doorBlock = doorBlock.getRelative(BlockFace.UP);
+            } else {
+                doorBlock = doorBlock.getRelative(BlockFace.DOWN);
+            }
+
+            if (doorBlock.getType() == Material.IRON_DOOR || BukkitUtils.isWoodenDoor(doorBlock.getType())) {
+                consumer.queueBlockBreak(actor, doorBlock.getState());
+            }
+        } else if (BukkitUtils.isDoublePlant(replacedType)) { // Special double plant check
+            Block plantBlock = origin;
+
+            // Up or down?
+            if (!BukkitUtils.isTop(origin.getBlockData())) {
+                plantBlock = plantBlock.getRelative(BlockFace.UP);
+            } else {
+                plantBlock = plantBlock.getRelative(BlockFace.DOWN);
+            }
+
+            if (BukkitUtils.isDoublePlant(plantBlock.getType())) {
+                consumer.queueBlockBreak(actor, plantBlock.getState());
+            }
+        }
+
+        // Do this down here so that the block is added after blocks sitting on it
+        if (replacedWith == null) {
+            consumer.queueBlockBreak(actor, origin.getState());
+        } else {
+            consumer.queueBlockReplace(actor, origin.getState(), replacedWith);
+        }
+    }
+
+    public static String checkText(String text) {
+        if (text == null) {
+            return text;
+        }
+        if (mb4) {
+            return text;
+        }
+        return text.replaceAll("[^\\u0000-\\uFFFF]", "?");
+    }
+
+    public static Entity getRealDamager(Entity damager) {
+        if (damager instanceof Projectile) {
+            ProjectileSource realDamager = ((Projectile) damager).getShooter();
+            if (realDamager instanceof Entity) {
+                damager = (Entity) realDamager;
+            }
+        }
+        if (damager instanceof TNTPrimed) {
+            Entity realRemover = ((TNTPrimed) damager).getSource();
+            if (realRemover != null) {
+                damager = realRemover;
+            }
+        }
+        return damager;
+    }
+}

src/main/java/de/diddiz/LogBlock/util/MessagingUtil.java

@@ -0,0 +1,132 @@
+package de.diddiz.LogBlock.util;
+
+import static de.diddiz.LogBlock.util.ActionColor.CREATE;
+import static de.diddiz.LogBlock.util.ActionColor.DESTROY;
+import static de.diddiz.LogBlock.util.TypeColor.DEFAULT;
+import static de.diddiz.LogBlock.util.Utils.spaces;
+
+import de.diddiz.LogBlock.config.Config;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.EntityType;
+
+public class MessagingUtil {
+    public static BaseComponent[] formatSummarizedChanges(int created, int destroyed, BaseComponent actor, int createdWidth, int destroyedWidth, float spaceFactor) {
+        TextComponent textCreated = createTextComponentWithColor(created + spaces((int) ((10 - String.valueOf(created).length()) / spaceFactor)), CREATE.getColor());
+        TextComponent textDestroyed = createTextComponentWithColor(destroyed + spaces((int) ((10 - String.valueOf(destroyed).length()) / spaceFactor)), DESTROY.getColor());
+        return new BaseComponent[] { textCreated, textDestroyed, actor };
+    }
+
+    public static TextComponent createTextComponentWithColor(String text, ChatColor color) {
+        TextComponent tc = new TextComponent(text);
+        tc.setColor(color);
+        return tc;
+    }
+
+    public static TextComponent brackets(BracketType type, BaseComponent... content) {
+        TextComponent tc = createTextComponentWithColor(type.getStarting(), TypeColor.BRACKETS.getColor());
+        for (BaseComponent c : content) {
+            tc.addExtra(c);
+        }
+        tc.addExtra(new TextComponent(type.getEnding()));
+        return tc;
+    }
+
+    public static TextComponent prettyDate(long date) {
+        TextComponent tc = brackets(BracketType.STANDARD, createTextComponentWithColor(Config.formatterShort.format(date), TypeColor.DATE.getColor()));
+        tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(Config.formatter.format(date))));
+        return tc;
+    }
+
+    public static TextComponent prettyState(String stateName) {
+        return createTextComponentWithColor(stateName, TypeColor.STATE.getColor());
+    }
+
+    public static TextComponent prettyState(BaseComponent stateName) {
+        TextComponent tc = new TextComponent();
+        tc.setColor(TypeColor.STATE.getColor());
+        if (stateName != null) {
+            tc.addExtra(stateName);
+        }
+        return tc;
+    }
+
+    public static TextComponent prettyState(int stateValue) {
+        return prettyState(Integer.toString(stateValue));
+    }
+
+    public static <E extends Enum<E>> TextComponent prettyState(E enumerator) {
+        return prettyState(enumerator.toString());
+    }
+
+    public static TextComponent prettyMaterial(String materialName) {
+        return createTextComponentWithColor(materialName.toUpperCase(), TypeColor.MATERIAL.getColor());
+    }
+
+    public static TextComponent prettyMaterial(Material material) {
+        return prettyMaterial(material.name());
+    }
+
+    public static TextComponent prettyMaterial(BlockData material) {
+        TextComponent tc = prettyMaterial(material.getMaterial());
+        String bdString = material.getAsString();
+        int bracket = bdString.indexOf("[");
+        if (bracket >= 0) {
+            int bracket2 = bdString.indexOf("]", bracket);
+            if (bracket2 >= 0) {
+                String state = bdString.substring(bracket + 1, bracket2).replace(',', '\n');
+                tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(state)));
+            }
+        }
+        return tc;
+    }
+
+    public static TextComponent prettyEntityType(EntityType type) {
+        return prettyMaterial(type.name());
+    }
+
+    public static TextComponent prettyLocation(Location loc, int entryId) {
+        return prettyLocation(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), entryId);
+    }
+
+    public static TextComponent prettyLocation(int x, int y, int z, int entryId) {
+        TextComponent tc = createTextComponentWithColor("", DEFAULT.getColor());
+        tc.addExtra(createTextComponentWithColor(Integer.toString(x), TypeColor.COORDINATE.getColor()));
+        tc.addExtra(createTextComponentWithColor(", ", DEFAULT.getColor()));
+        tc.addExtra(createTextComponentWithColor(Integer.toString(y), TypeColor.COORDINATE.getColor()));
+        tc.addExtra(createTextComponentWithColor(", ", DEFAULT.getColor()));
+        tc.addExtra(createTextComponentWithColor(Integer.toString(z), TypeColor.COORDINATE.getColor()));
+        if (entryId > 0) {
+            tc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/lb tp " + entryId));
+            tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("Teleport here")));
+        }
+        return tc;
+    }
+
+    public enum BracketType {
+        STANDARD("[", "]"),
+        ANGLE("<", ">");
+
+        private String starting, ending;
+
+        BracketType(String starting, String ending) {
+            this.starting = starting;
+            this.ending = ending;
+        }
+
+        public String getStarting() {
+            return starting;
+        }
+
+        public String getEnding() {
+            return ending;
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/util/MySQLConnectionPool.java

@@ -1,4 +1,4 @@
-package de.diddiz.util;
+package de.diddiz.LogBlock.util;
 
 import com.zaxxer.hikari.HikariDataSource;
 import de.diddiz.LogBlock.config.Config;
@@ -11,13 +11,14 @@ public class MySQLConnectionPool implements Closeable {
 
     private final HikariDataSource ds;
 
-    public MySQLConnectionPool(String url, String user, String password) throws ClassNotFoundException {
+    public MySQLConnectionPool(String url, String user, String password, boolean useSSL, boolean requireSSL) {
         this.ds = new HikariDataSource();
         ds.setJdbcUrl(url);
         ds.setUsername(user);
         ds.setPassword(password);
 
         ds.setMinimumIdle(2);
+        ds.setMaximumPoolSize(15);
         ds.setPoolName("LogBlock-Connection-Pool");
 
         ds.addDataSourceProperty("useUnicode", "true");
@@ -27,6 +28,11 @@ public class MySQLConnectionPool implements Closeable {
         ds.addDataSourceProperty("cachePrepStmts", "true");
         ds.addDataSourceProperty("prepStmtCacheSize", "250");
         ds.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+        ds.addDataSourceProperty("useServerPrepStmts", "true");
+
+        ds.addDataSourceProperty("useSSL", Boolean.toString(useSSL));
+        ds.addDataSourceProperty("requireSSL", Boolean.toString(requireSSL));
+        ds.addDataSourceProperty("verifyServerCertificate", "false");
     }
 
     @Override
@@ -37,7 +43,7 @@ public class MySQLConnectionPool implements Closeable {
     public Connection getConnection() throws SQLException {
         Connection connection = ds.getConnection();
         if (Config.mb4) {
-            connection.createStatement().executeQuery("SET NAMES utf8mb4");
+            connection.createStatement().executeUpdate("SET NAMES utf8mb4");
         }
         return connection;
     }

src/main/java/de/diddiz/LogBlock/util/ReflectionUtil.java

@@ -0,0 +1,27 @@
+package de.diddiz.LogBlock.util;
+
+import org.bukkit.Bukkit;
+
+public class ReflectionUtil {
+
+    private static String versionString;
+
+    public static String getVersion() {
+        if (versionString == null) {
+            String name = Bukkit.getServer().getClass().getPackage().getName();
+            versionString = name.substring(name.lastIndexOf('.') + 1);
+        }
+
+        return versionString;
+    }
+
+    public static Class<?> getMinecraftClass(String minecraftClassName) throws ClassNotFoundException {
+        String clazzName = "net.minecraft." + minecraftClassName;
+        return Class.forName(clazzName);
+    }
+
+    public static Class<?> getCraftBukkitClass(String craftBukkitClassName) throws ClassNotFoundException {
+        String clazzName = "org.bukkit.craftbukkit." + getVersion() + "." + craftBukkitClassName;
+        return Class.forName(clazzName);
+    }
+}

src/main/java/de/diddiz/LogBlock/util/SqlUtil.java

@@ -0,0 +1,24 @@
+package de.diddiz.LogBlock.util;
+
+public class SqlUtil {
+    public static String escapeString(String s) {
+        return escapeString(s, false);
+    }
+
+    public static String escapeString(String s, boolean escapeMatcher) {
+        s = s.replace("\u0000", "\\0");
+        s = s.replace("\u0026", "\\Z");
+        s = s.replace("\\", "\\\\");
+        s = s.replace("'", "\\'");
+        s = s.replace("\"", "\\\"");
+        s = s.replace("\b", "\\b");
+        s = s.replace("\n", "\\n");
+        s = s.replace("\r", "\\r");
+        s = s.replace("\t", "\\t");
+        if (escapeMatcher) {
+            s = s.replace("%", "\\%");
+            s = s.replace("_", "\\_");
+        }
+        return s;
+    }
+}

src/main/java/de/diddiz/LogBlock/util/TypeColor.java

@@ -0,0 +1,29 @@
+package de.diddiz.LogBlock.util;
+
+import net.md_5.bungee.api.ChatColor;
+
+public enum TypeColor {
+    DEFAULT(ChatColor.YELLOW),
+    MATERIAL(ChatColor.BLUE),
+    STATE(ChatColor.BLUE),
+    DATE(ChatColor.DARK_AQUA),
+    BRACKETS(ChatColor.DARK_GRAY),
+    COORDINATE(ChatColor.WHITE),
+    HEADER(ChatColor.GOLD),
+    ERROR(ChatColor.RED);
+
+    private final ChatColor color;
+
+    TypeColor(ChatColor color) {
+        this.color = color;
+    }
+
+    public ChatColor getColor() {
+        return color;
+    }
+
+    @Override
+    public String toString() {
+        return color.toString();
+    }
+}

src/main/java/de/diddiz/LogBlock/util/UUIDFetcher.java

@@ -1,14 +1,14 @@
-package de.diddiz.util;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
+package de.diddiz.LogBlock.util;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,19 +19,19 @@ import java.util.UUID;
 public class UUIDFetcher {
 
     private static final String PROFILE_URL = "https://api.mojang.com/profiles/minecraft";
-    private static final JSONParser jsonParser = new JSONParser();
+    private static final Gson gson = new GsonBuilder().setLenient().create();
 
     public static Map<String, UUID> getUUIDs(List<String> names) throws Exception {
-        Map<String, UUID> uuidMap = new HashMap<String, UUID>();
+        Map<String, UUID> uuidMap = new HashMap<>();
         HttpURLConnection connection = createConnection();
-        String body = JSONArray.toJSONString(names);
+        String body = gson.toJson(names);
         writeBody(connection, body);
-        JSONArray array = (JSONArray) jsonParser.parse(new InputStreamReader(connection.getInputStream()));
-        for (Object profile : array) {
-            JSONObject jsonProfile = (JSONObject) profile;
-            String id = (String) jsonProfile.get("id");
-            String name = (String) jsonProfile.get("name");
-            UUID uuid = UUIDFetcher.getUUID(id);
+        JsonArray array = gson.fromJson(new InputStreamReader(connection.getInputStream()), JsonArray.class);
+        for (JsonElement profile : array) {
+            JsonObject jsonProfile = (JsonObject) profile;
+            String id = jsonProfile.get("id").getAsString();
+            String name = jsonProfile.get("name").getAsString();
+            UUID uuid = getUUID(id);
             uuidMap.put(name, uuid);
         }
         return uuidMap;
@@ -58,22 +58,4 @@ public class UUIDFetcher {
     private static UUID getUUID(String id) {
         return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" + id.substring(20, 32));
     }
-
-    public static byte[] toBytes(UUID uuid) {
-        ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[16]);
-        byteBuffer.putLong(uuid.getMostSignificantBits());
-        byteBuffer.putLong(uuid.getLeastSignificantBits());
-        return byteBuffer.array();
-    }
-
-    public static UUID fromBytes(byte[] array) {
-        if (array.length != 16) {
-            throw new IllegalArgumentException("Illegal byte array length: " + array.length);
-        }
-        ByteBuffer byteBuffer = ByteBuffer.wrap(array);
-        long mostSignificant = byteBuffer.getLong();
-        long leastSignificant = byteBuffer.getLong();
-        return new UUID(mostSignificant, leastSignificant);
-    }
-
 }

src/main/java/de/diddiz/LogBlock/util/Utils.java

@@ -1,13 +1,27 @@
-package de.diddiz.util;
+package de.diddiz.LogBlock.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.ZipException;
+
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.inventory.ItemStack;
+
+import de.diddiz.LogBlock.LogBlock;
 
 public class Utils {
     public static String newline = System.getProperty("line.separator");
@@ -167,7 +181,7 @@ public class Utils {
      * @return A new list with the quoted arguments parsed to single values
      */
     public static List<String> parseQuotes(List<String> args) {
-        List<String> newArguments = new ArrayList<String>();
+        List<String> newArguments = new ArrayList<>();
         String subjectString = join(args.toArray(new String[args.size()]), " ");
 
         Pattern regex = Pattern.compile("[^\\s\"']+|\"[^\"]*\"|'[^']*'");
@@ -183,7 +197,7 @@ public class Utils {
         private final String ext;
 
         public ExtensionFilenameFilter(String ext) {
-            this.ext = ext;
+            this.ext = "." + ext;
         }
 
         @Override
@@ -191,4 +205,94 @@ public class Utils {
             return name.toLowerCase().endsWith(ext);
         }
     }
+
+    private final static char[] hexArray = "0123456789ABCDEF".toCharArray();
+
+    public static String mysqlEscapeBytes(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2 + 2];
+        hexChars[0] = '0';
+        hexChars[1] = 'x';
+        for (int j = 0; j < bytes.length; j++) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2 + 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 3] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+
+    public static String mysqlPrepareBytesForInsertAllowNull(byte[] bytes) {
+        if (bytes == null) {
+            return "null";
+        }
+        return "'" + mysqlEscapeBytes(bytes) + "'";
+    }
+
+    public static String mysqlTextEscape(String untrusted) {
+        return untrusted.replace("\\", "\\\\").replace("'", "\\'");
+    }
+
+    public static ItemStack loadItemStack(byte[] data) {
+        if (data == null || data.length == 0) {
+            return null;
+        }
+        YamlConfiguration conf = deserializeYamlConfiguration(data);
+        return conf == null ? null : conf.getItemStack("stack");
+    }
+
+    public static byte[] saveItemStack(ItemStack stack) {
+        if (stack == null || BukkitUtils.isEmpty(stack.getType())) {
+            return null;
+        }
+        YamlConfiguration conf = new YamlConfiguration();
+        conf.set("stack", stack);
+        return serializeYamlConfiguration(conf);
+    }
+
+    public static YamlConfiguration deserializeYamlConfiguration(byte[] data) {
+        if (data == null || data.length == 0) {
+            return null;
+        }
+        YamlConfiguration conf = new YamlConfiguration();
+        try {
+            InputStreamReader reader = new InputStreamReader(new GZIPInputStream(new ByteArrayInputStream(data)), "UTF-8");
+            conf.load(reader);
+            reader.close();
+            return conf;
+        } catch (ZipException | InvalidConfigurationException e) {
+            LogBlock.getInstance().getLogger().warning("Could not deserialize YamlConfiguration: " + e.getMessage());
+            return conf;
+        } catch (IOException e) {
+            throw new RuntimeException("IOException should be impossible for ByteArrayInputStream", e);
+        }
+    }
+
+    public static byte[] serializeYamlConfiguration(YamlConfiguration conf) {
+        if (conf == null || conf.getKeys(false).isEmpty()) {
+            return null;
+        }
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(baos), "UTF-8");
+            writer.write(conf.saveToString());
+            writer.close();
+            return baos.toByteArray();
+        } catch (IOException e) {
+            throw new RuntimeException("IOException should be impossible for ByteArrayOutputStream", e);
+        }
+    }
+
+    public static String serializeForSQL(YamlConfiguration conf) {
+        return mysqlPrepareBytesForInsertAllowNull(serializeYamlConfiguration(conf));
+    }
+
+    public static double warpDegrees(double degrees) {
+        double d = degrees % 360.0;
+        if (d >= 180.0) {
+            d -= 360.0;
+        }
+        if (d < -180.0) {
+            d += 360.0;
+        }
+        return d;
+    }
 }

src/main/java/de/diddiz/LogBlock/worldedit/WorldEditHelper.java

@@ -0,0 +1,181 @@
+package de.diddiz.LogBlock.worldedit;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.UUID;
+import java.util.logging.Level;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.util.BlockVector;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.DoubleTag;
+import com.sk89q.jnbt.FloatTag;
+import com.sk89q.jnbt.ListTag;
+import com.sk89q.jnbt.NBTInputStream;
+import com.sk89q.jnbt.NBTOutputStream;
+import com.sk89q.jnbt.NamedTag;
+import com.sk89q.jnbt.ShortTag;
+import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldedit.entity.BaseEntity;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.Region;
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.util.CuboidRegion;
+
+public class WorldEditHelper {
+    private static boolean checkedForWorldEdit;
+    private static boolean hasWorldEdit;
+
+    public static boolean hasWorldEdit() {
+        if (!checkedForWorldEdit) {
+            checkedForWorldEdit = true;
+            Plugin worldEdit = Bukkit.getPluginManager().getPlugin("WorldEdit");
+            hasWorldEdit = worldEdit != null;
+            if (worldEdit != null) {
+                Internal.setWorldEdit(worldEdit);
+            }
+        }
+        return hasWorldEdit;
+    }
+
+    public static boolean hasFullWorldEdit() {
+        return hasWorldEdit && Internal.hasBukkitImplAdapter();
+    }
+
+    public static byte[] serializeEntity(Entity entity) {
+        if (!hasWorldEdit()) {
+            return null;
+        }
+        return Internal.serializeEntity(entity);
+    }
+
+    public static Entity restoreEntity(Location location, EntityType type, byte[] serialized) {
+        if (!hasWorldEdit()) {
+            return null;
+        }
+        return Internal.restoreEntity(location, type, serialized);
+    }
+
+    public static CuboidRegion getSelectedRegion(Player player) throws IllegalArgumentException {
+        if (!hasWorldEdit()) {
+            throw new IllegalArgumentException("WorldEdit not found!");
+        }
+        return Internal.getSelectedRegion(player);
+    }
+
+    private static class Internal {
+        private static WorldEditPlugin worldEdit;
+        private static Method getBukkitImplAdapter;
+
+        public static void setWorldEdit(Plugin worldEdit) {
+            Internal.worldEdit = (WorldEditPlugin) worldEdit;
+        }
+
+        public static boolean hasBukkitImplAdapter() {
+            if (getBukkitImplAdapter == null) {
+                try {
+                    getBukkitImplAdapter = WorldEditPlugin.class.getDeclaredMethod("getBukkitImplAdapter");
+                    getBukkitImplAdapter.setAccessible(true);
+                } catch (Exception e) {
+                    LogBlock.getInstance().getLogger().log(Level.SEVERE, "Exception while checking for BukkitImplAdapter", e);
+                    return false;
+                }
+            }
+            try {
+                return getBukkitImplAdapter.invoke(worldEdit) != null;
+            } catch (Exception e) {
+                LogBlock.getInstance().getLogger().log(Level.SEVERE, "Exception while checking for BukkitImplAdapter", e);
+                return false;
+            }
+        }
+
+        public static Entity restoreEntity(Location location, EntityType type, byte[] serialized) {
+            com.sk89q.worldedit.world.entity.EntityType weType = BukkitAdapter.adapt(type);
+            com.sk89q.worldedit.util.Location weLocation = BukkitAdapter.adapt(location);
+            try {
+                NBTInputStream nbtis = new NBTInputStream(new ByteArrayInputStream(serialized));
+                NamedTag namedTag = nbtis.readNamedTag();
+                nbtis.close();
+                UUID newUUID = null;
+                if (namedTag.getName().equals("entity") && namedTag.getTag() instanceof CompoundTag) {
+                    CompoundTag serializedState = (CompoundTag) namedTag.getTag();
+                    BaseEntity state = new BaseEntity(weType, serializedState);
+                    com.sk89q.worldedit.entity.Entity weEntity = weLocation.getExtent().createEntity(weLocation, state);
+                    if (weEntity != null) {
+                        CompoundTag newNbt = weEntity.getState().getNbtData();
+                        int[] uuidInts = newNbt.getIntArray("UUID");
+                        if (uuidInts != null && uuidInts.length >= 4) {
+                            newUUID = new UUID(((long) uuidInts[0] << 32) | (uuidInts[1] & 0xFFFFFFFFL), ((long) uuidInts[2] << 32) | (uuidInts[3] & 0xFFFFFFFFL));
+                        } else {
+                            newUUID = new UUID(newNbt.getLong("UUIDMost"), newNbt.getLong("UUIDLeast")); // pre 1.16
+                        }
+                    }
+                }
+                return newUUID == null ? null : Bukkit.getEntity(newUUID);
+            } catch (IOException e) {
+                throw new RuntimeException("This IOException should be impossible", e);
+            }
+        }
+
+        public static byte[] serializeEntity(Entity entity) {
+            com.sk89q.worldedit.entity.Entity weEntity = BukkitAdapter.adapt(entity);
+            BaseEntity state = weEntity.getState();
+            if (state != null) {
+                try {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    NBTOutputStream nbtos = new NBTOutputStream(baos);
+                    CompoundTag nbt = state.getNbtData();
+                    LinkedHashMap<String, Tag<?, ?>> value = new LinkedHashMap<>(nbt.getValue());
+                    value.put("Health", new FloatTag(20.0f));
+                    value.put("Motion", new ListTag(DoubleTag.class, Arrays.asList(new DoubleTag[] { new DoubleTag(0), new DoubleTag(0), new DoubleTag(0) })));
+                    value.put("Fire", new ShortTag((short) -20));
+                    value.put("HurtTime", new ShortTag((short) 0));
+                    nbtos.writeNamedTag("entity", new CompoundTag(value));
+                    nbtos.close();
+                    return baos.toByteArray();
+                } catch (IOException e) {
+                    throw new RuntimeException("This IOException should be impossible", e);
+                }
+            }
+            return null;
+        }
+
+        public static CuboidRegion getSelectedRegion(Player player) throws IllegalArgumentException {
+            LocalSession session = worldEdit.getSession(player);
+            World world = player.getWorld();
+            com.sk89q.worldedit.world.World weWorld = BukkitAdapter.adapt(world);
+            if (!weWorld.equals(session.getSelectionWorld())) {
+                throw new IllegalArgumentException("No selection defined");
+            }
+            Region selection;
+            try {
+                selection = session.getSelection(weWorld);
+            } catch (IncompleteRegionException e) {
+                throw new IllegalArgumentException("No selection defined");
+            }
+            if (selection == null) {
+                throw new IllegalArgumentException("No selection defined");
+            }
+            if (!(selection instanceof com.sk89q.worldedit.regions.CuboidRegion)) {
+                throw new IllegalArgumentException("You have to define a cuboid selection");
+            }
+            BlockVector3 min = selection.getMinimumPoint();
+            BlockVector3 max = selection.getMaximumPoint();
+            return new CuboidRegion(world, new BlockVector(min.getBlockX(), min.getBlockY(), min.getBlockZ()), new BlockVector(max.getBlockX(), max.getBlockY(), max.getBlockZ()));
+        }
+    }
+}

src/main/java/de/diddiz/LogBlock/worldedit/WorldEditLoggingHook.java

@@ -0,0 +1,106 @@
+package de.diddiz.LogBlock.worldedit;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.event.extent.EditSessionEvent;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.eventbus.Subscribe;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+
+import de.diddiz.LogBlock.LogBlock;
+import de.diddiz.LogBlock.Logging;
+import de.diddiz.LogBlock.blockstate.BlockStateCodecs;
+import de.diddiz.LogBlock.config.Config;
+import de.diddiz.LogBlock.util.BukkitUtils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+
+import java.util.logging.Level;
+
+//...so they ALSO have a class called Actor... need to fully-qualify when we use ours
+
+public class WorldEditLoggingHook {
+
+    private LogBlock plugin;
+
+    public WorldEditLoggingHook(LogBlock plugin) {
+        this.plugin = plugin;
+    }
+
+    // Convert WE Actor to LB Actor
+    private de.diddiz.LogBlock.Actor AtoA(Actor weActor) {
+        if (weActor.isPlayer()) {
+            return new de.diddiz.LogBlock.Actor(weActor.getName(), weActor.getUniqueId());
+        }
+        return new de.diddiz.LogBlock.Actor(weActor.getName());
+    }
+
+    public void hook() {
+        WorldEdit.getInstance().getEventBus().register(new Object() {
+            @Subscribe
+            public void wrapForLogging(final EditSessionEvent event) {
+                final Actor actor = event.getActor();
+                if (actor == null) {
+                    return;
+                }
+                final de.diddiz.LogBlock.Actor lbActor = AtoA(actor);
+
+                // Check to ensure the world should be logged
+                final World world;
+                try {
+                    world = BukkitAdapter.adapt(event.getWorld());
+                } catch (RuntimeException ex) {
+                    plugin.getLogger().warning("Failed to register logging for WorldEdit!");
+                    plugin.getLogger().log(Level.WARNING, ex.getMessage(), ex);
+                    return;
+                }
+
+                // If config becomes reloadable, this check should be moved
+                if (!(Config.isLogging(world, Logging.WORLDEDIT))) {
+                    return;
+                }
+
+                event.setExtent(new AbstractDelegateExtent(event.getExtent()) {
+                    @Override
+                    public final <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block) throws WorldEditException {
+                        onBlockChange(position, block);
+                        return super.setBlock(position, block);
+                    }
+
+                    protected <B extends BlockStateHolder<B>> void onBlockChange(BlockVector3 pt, B block) {
+
+                        if (event.getStage() != EditSession.Stage.BEFORE_CHANGE) {
+                            return;
+                        }
+
+                        Location location = BukkitAdapter.adapt(world, pt);
+                        Block blockBefore = location.getBlock();
+                        BlockData blockDataBefore = blockBefore.getBlockData();
+                        Material typeBefore = blockDataBefore.getMaterial();
+
+                        BlockData blockDataNew = BukkitAdapter.adapt(block);
+
+                        if (!blockDataBefore.equals(blockDataNew)) {
+                            // Check to see if we've broken a sign
+                            if (BlockStateCodecs.hasCodec(typeBefore)) {
+                                plugin.getConsumer().queueBlockBreak(lbActor, blockBefore.getState());
+                            } else if (!BukkitUtils.isEmpty(typeBefore)) {
+                                plugin.getConsumer().queueBlockBreak(lbActor, location, blockDataBefore);
+                            }
+                            if (!BukkitUtils.isEmpty(blockDataNew.getMaterial())) {
+                                plugin.getConsumer().queueBlockPlace(lbActor, location, blockDataNew);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+    }
+}

src/main/java/de/diddiz/util/Block.java

@@ -1,34 +0,0 @@
-package de.diddiz.util;
-
-import java.util.List;
-
-public class Block {
-    private int block;
-    private int data;
-
-    /**
-     * @param block The id of the block
-     * @param data  The data for the block, -1 for any data
-     */
-    public Block(int block, int data) {
-        this.block = block;
-        this.data = data;
-    }
-
-    public int getBlock() {
-        return this.block;
-    }
-
-    public int getData() {
-        return this.data;
-    }
-
-    public static boolean inList(List<Block> types, int blockID) {
-        for (Block block : types) {
-            if (block.getBlock() == blockID) {
-                return true;
-            }
-        }
-        return false;
-    }
-}

src/main/java/de/diddiz/util/BukkitUtils.java

@@ -1,435 +0,0 @@
-package de.diddiz.util;
-
-import org.bukkit.*;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.DoubleChest;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-
-import java.io.File;
-import java.util.*;
-
-import static de.diddiz.util.MaterialName.materialName;
-
-public class BukkitUtils {
-    private static final Set<Set<Integer>> blockEquivalents;
-    private static final Set<Material> relativeBreakable;
-    private static final Set<Material> relativeTopBreakable;
-    private static final Set<Material> relativeTopFallables;
-    private static final Set<Material> fallingEntityKillers;
-
-    private static final Set<Material> cropBlocks;
-    private static final Set<Material> containerBlocks;
-
-    private static final Map<EntityType, Integer> projectileItems;
-
-    static {
-        blockEquivalents = new HashSet<Set<Integer>>(7);
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(2, 3, 60)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(8, 9, 79)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(10, 11)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(61, 62)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(73, 74)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(75, 76)));
-        blockEquivalents.add(new HashSet<Integer>(Arrays.asList(93, 94)));
-
-        // Blocks that break when they are attached to a block
-        relativeBreakable = new HashSet<Material>(11);
-        relativeBreakable.add(Material.WALL_SIGN);
-        relativeBreakable.add(Material.LADDER);
-        relativeBreakable.add(Material.STONE_BUTTON);
-        relativeBreakable.add(Material.WOOD_BUTTON);
-        relativeBreakable.add(Material.REDSTONE_TORCH_ON);
-        relativeBreakable.add(Material.REDSTONE_TORCH_OFF);
-        relativeBreakable.add(Material.LEVER);
-        relativeBreakable.add(Material.TORCH);
-        relativeBreakable.add(Material.TRAP_DOOR);
-        relativeBreakable.add(Material.TRIPWIRE_HOOK);
-        relativeBreakable.add(Material.COCOA);
-
-        // Blocks that break when they are on top of a block
-        relativeTopBreakable = new HashSet<Material>(33);
-        relativeTopBreakable.add(Material.SAPLING);
-        relativeTopBreakable.add(Material.LONG_GRASS);
-        relativeTopBreakable.add(Material.DEAD_BUSH);
-        relativeTopBreakable.add(Material.YELLOW_FLOWER);
-        relativeTopBreakable.add(Material.RED_ROSE);
-        relativeTopBreakable.add(Material.BROWN_MUSHROOM);
-        relativeTopBreakable.add(Material.RED_MUSHROOM);
-        relativeTopBreakable.add(Material.CROPS);
-        relativeTopBreakable.add(Material.POTATO);
-        relativeTopBreakable.add(Material.CARROT);
-        relativeTopBreakable.add(Material.WATER_LILY);
-        relativeTopBreakable.add(Material.CACTUS);
-        relativeTopBreakable.add(Material.SUGAR_CANE_BLOCK);
-        relativeTopBreakable.add(Material.FLOWER_POT);
-        relativeTopBreakable.add(Material.POWERED_RAIL);
-        relativeTopBreakable.add(Material.DETECTOR_RAIL);
-        relativeTopBreakable.add(Material.ACTIVATOR_RAIL);
-        relativeTopBreakable.add(Material.RAILS);
-        relativeTopBreakable.add(Material.REDSTONE_WIRE);
-        relativeTopBreakable.add(Material.SIGN_POST);
-        relativeTopBreakable.add(Material.STONE_PLATE);
-        relativeTopBreakable.add(Material.WOOD_PLATE);
-        relativeTopBreakable.add(Material.IRON_PLATE);
-        relativeTopBreakable.add(Material.GOLD_PLATE);
-        relativeTopBreakable.add(Material.SNOW);
-        relativeTopBreakable.add(Material.DIODE_BLOCK_ON);
-        relativeTopBreakable.add(Material.DIODE_BLOCK_OFF);
-        relativeTopBreakable.add(Material.REDSTONE_COMPARATOR_ON);
-        relativeTopBreakable.add(Material.REDSTONE_COMPARATOR_OFF);
-        relativeTopBreakable.add(Material.WOODEN_DOOR);
-        relativeTopBreakable.add(Material.IRON_DOOR_BLOCK);
-        relativeTopBreakable.add(Material.CARPET);
-        relativeTopBreakable.add(Material.DOUBLE_PLANT);
-
-        // Blocks that fall
-        relativeTopFallables = new HashSet<Material>(4);
-        relativeTopFallables.add(Material.SAND);
-        relativeTopFallables.add(Material.GRAVEL);
-        relativeTopFallables.add(Material.DRAGON_EGG);
-        relativeTopFallables.add(Material.ANVIL);
-
-        // Blocks that break falling entities
-        fallingEntityKillers = new HashSet<Material>(32);
-        fallingEntityKillers.add(Material.SIGN_POST);
-        fallingEntityKillers.add(Material.WALL_SIGN);
-        fallingEntityKillers.add(Material.STONE_PLATE);
-        fallingEntityKillers.add(Material.WOOD_PLATE);
-        fallingEntityKillers.add(Material.IRON_PLATE);
-        fallingEntityKillers.add(Material.GOLD_PLATE);
-        fallingEntityKillers.add(Material.SAPLING);
-        fallingEntityKillers.add(Material.YELLOW_FLOWER);
-        fallingEntityKillers.add(Material.RED_ROSE);
-        fallingEntityKillers.add(Material.CROPS);
-        fallingEntityKillers.add(Material.CARROT);
-        fallingEntityKillers.add(Material.POTATO);
-        fallingEntityKillers.add(Material.RED_MUSHROOM);
-        fallingEntityKillers.add(Material.BROWN_MUSHROOM);
-        fallingEntityKillers.add(Material.STEP);
-        fallingEntityKillers.add(Material.WOOD_STEP);
-        fallingEntityKillers.add(Material.TORCH);
-        fallingEntityKillers.add(Material.FLOWER_POT);
-        fallingEntityKillers.add(Material.POWERED_RAIL);
-        fallingEntityKillers.add(Material.DETECTOR_RAIL);
-        fallingEntityKillers.add(Material.ACTIVATOR_RAIL);
-        fallingEntityKillers.add(Material.RAILS);
-        fallingEntityKillers.add(Material.LEVER);
-        fallingEntityKillers.add(Material.REDSTONE_WIRE);
-        fallingEntityKillers.add(Material.REDSTONE_TORCH_ON);
-        fallingEntityKillers.add(Material.REDSTONE_TORCH_OFF);
-        fallingEntityKillers.add(Material.DIODE_BLOCK_ON);
-        fallingEntityKillers.add(Material.DIODE_BLOCK_OFF);
-        fallingEntityKillers.add(Material.REDSTONE_COMPARATOR_ON);
-        fallingEntityKillers.add(Material.REDSTONE_COMPARATOR_OFF);
-        fallingEntityKillers.add(Material.DAYLIGHT_DETECTOR);
-        fallingEntityKillers.add(Material.CARPET);
-
-        // Crop Blocks
-        cropBlocks = new HashSet<Material>(5);
-        cropBlocks.add(Material.CROPS);
-        cropBlocks.add(Material.MELON_STEM);
-        cropBlocks.add(Material.PUMPKIN_STEM);
-        cropBlocks.add(Material.CARROT);
-        cropBlocks.add(Material.POTATO);
-
-        // Container Blocks
-        containerBlocks = new HashSet<Material>(6);
-        containerBlocks.add(Material.CHEST);
-        containerBlocks.add(Material.TRAPPED_CHEST);
-        containerBlocks.add(Material.DISPENSER);
-        containerBlocks.add(Material.DROPPER);
-        containerBlocks.add(Material.HOPPER);
-        containerBlocks.add(Material.BREWING_STAND);
-        containerBlocks.add(Material.FURNACE);
-        containerBlocks.add(Material.BURNING_FURNACE);
-        containerBlocks.add(Material.BEACON);
-        // Doesn't actually have a block inventory
-        // containerBlocks.add(Material.ENDER_CHEST);
-
-        // It doesn't seem like you could injure people with some of these, but they exist, so....
-        projectileItems = new EnumMap<EntityType, Integer>(EntityType.class);
-        projectileItems.put(EntityType.ARROW, 262);
-        projectileItems.put(EntityType.EGG, 344);
-        projectileItems.put(EntityType.ENDER_PEARL, 368);
-        projectileItems.put(EntityType.SMALL_FIREBALL, 385);    // Fire charge
-        projectileItems.put(EntityType.FIREBALL, 385);        // Fire charge
-        projectileItems.put(EntityType.FISHING_HOOK, 346);
-        projectileItems.put(EntityType.SNOWBALL, 332);
-        projectileItems.put(EntityType.SPLASH_POTION, 373);
-        projectileItems.put(EntityType.THROWN_EXP_BOTTLE, 384);
-        projectileItems.put(EntityType.WITHER_SKULL, 397);
-
-    }
-
-    private static final BlockFace[] relativeBlockFaces = new BlockFace[]{
-            BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.UP, BlockFace.DOWN
-    };
-
-    /**
-     * Returns a list of block locations around the block that are of the type specified by the integer list parameter
-     *
-     * @param block The central block to get the blocks around
-     * @param type The type of blocks around the center block to return
-     * @return List of block locations around the block that are of the type specified by the integer list parameter
-     */
-    public static List<Location> getBlocksNearby(org.bukkit.block.Block block, Set<Material> type) {
-        ArrayList<Location> blocks = new ArrayList<Location>();
-        for (BlockFace blockFace : relativeBlockFaces) {
-            if (type.contains(block.getRelative(blockFace).getType())) {
-                blocks.add(block.getRelative(blockFace).getLocation());
-            }
-        }
-        return blocks;
-    }
-
-    public static boolean isTop(Material mat, byte data) {
-
-        switch (mat) {
-            case DOUBLE_PLANT:
-                return data > 5;
-            case IRON_DOOR_BLOCK:
-            case WOODEN_DOOR:
-                return data == 8 || data == 9;
-            default:
-                return false;
-        }
-    }
-
-    public static int getInventoryHolderType(InventoryHolder holder) {
-        if (holder instanceof DoubleChest) {
-            return getInventoryHolderType(((DoubleChest) holder).getLeftSide());
-        } else if (holder instanceof BlockState) {
-            return ((BlockState) holder).getTypeId();
-        } else {
-            return -1;
-        }
-    }
-
-    public static Location getInventoryHolderLocation(InventoryHolder holder) {
-        if (holder instanceof DoubleChest) {
-            return getInventoryHolderLocation(((DoubleChest) holder).getLeftSide());
-        } else if (holder instanceof BlockState) {
-            return ((BlockState) holder).getLocation();
-        } else {
-            return null;
-        }
-    }
-
-    public static ItemStack[] compareInventories(ItemStack[] items1, ItemStack[] items2) {
-        final ItemStackComparator comperator = new ItemStackComparator();
-        final ArrayList<ItemStack> diff = new ArrayList<ItemStack>();
-        final int l1 = items1.length, l2 = items2.length;
-        int c1 = 0, c2 = 0;
-        while (c1 < l1 || c2 < l2) {
-            if (c1 >= l1) {
-                diff.add(items2[c2]);
-                c2++;
-                continue;
-            }
-            if (c2 >= l2) {
-                items1[c1].setAmount(items1[c1].getAmount() * -1);
-                diff.add(items1[c1]);
-                c1++;
-                continue;
-            }
-            final int comp = comperator.compare(items1[c1], items2[c2]);
-            if (comp < 0) {
-                items1[c1].setAmount(items1[c1].getAmount() * -1);
-                diff.add(items1[c1]);
-                c1++;
-            } else if (comp > 0) {
-                diff.add(items2[c2]);
-                c2++;
-            } else {
-                final int amount = items2[c2].getAmount() - items1[c1].getAmount();
-                if (amount != 0) {
-                    items1[c1].setAmount(amount);
-                    diff.add(items1[c1]);
-                }
-                c1++;
-                c2++;
-            }
-        }
-        return diff.toArray(new ItemStack[diff.size()]);
-    }
-
-    public static ItemStack[] compressInventory(ItemStack[] items) {
-        final ArrayList<ItemStack> compressed = new ArrayList<ItemStack>();
-        for (final ItemStack item : items) {
-            if (item != null) {
-                final int type = item.getTypeId();
-                final short data = rawData(item);
-                boolean found = false;
-                for (final ItemStack item2 : compressed) {
-                    if (type == item2.getTypeId() && data == rawData(item2)) {
-                        item2.setAmount(item2.getAmount() + item.getAmount());
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found) {
-                    compressed.add(new ItemStack(type, item.getAmount(), data));
-                }
-            }
-        }
-        Collections.sort(compressed, new ItemStackComparator());
-        return compressed.toArray(new ItemStack[compressed.size()]);
-    }
-
-    public static boolean equalTypes(int type1, int type2) {
-        if (type1 == type2) {
-            return true;
-        }
-        for (final Set<Integer> equivalent : blockEquivalents) {
-            if (equivalent.contains(type1) && equivalent.contains(type2)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static String friendlyWorldname(String worldName) {
-        return new File(worldName).getName();
-    }
-
-    public static Set<Set<Integer>> getBlockEquivalents() {
-        return blockEquivalents;
-    }
-
-    public static Set<Material> getRelativeBreakables() {
-        return relativeBreakable;
-    }
-
-    public static Set<Material> getRelativeTopBreakabls() {
-        return relativeTopBreakable;
-    }
-
-    public static Set<Material> getRelativeTopFallables() {
-        return relativeTopFallables;
-    }
-
-    public static Set<Material> getFallingEntityKillers() {
-        return fallingEntityKillers;
-    }
-
-    public static Set<Material> getCropBlocks() {
-        return cropBlocks;
-    }
-
-    public static Set<Material> getContainerBlocks() {
-        return containerBlocks;
-    }
-
-    public static String entityName(Entity entity) {
-        if (entity instanceof Player) {
-            return ((Player) entity).getName();
-        }
-        if (entity instanceof TNTPrimed) {
-            return "TNT";
-        }
-        return entity.getClass().getSimpleName().substring(5);
-    }
-
-    public static void giveTool(Player player, int type) {
-        final Inventory inv = player.getInventory();
-        if (inv.contains(type)) {
-            player.sendMessage(ChatColor.RED + "You have already a " + materialName(type));
-        } else {
-            final int free = inv.firstEmpty();
-            if (free >= 0) {
-                if (player.getItemInHand() != null && player.getItemInHand().getTypeId() != 0) {
-                    inv.setItem(free, player.getItemInHand());
-                }
-                player.setItemInHand(new ItemStack(type, 1));
-                player.sendMessage(ChatColor.GREEN + "Here's your " + materialName(type));
-            } else {
-                player.sendMessage(ChatColor.RED + "You have no empty slot in your inventory");
-            }
-        }
-    }
-
-    public static short rawData(ItemStack item) {
-        return item.getType() != null ? item.getData() != null ? item.getDurability() : 0 : 0;
-    }
-
-    public static int saveSpawnHeight(Location loc) {
-        final World world = loc.getWorld();
-        final Chunk chunk = world.getChunkAt(loc);
-        if (!world.isChunkLoaded(chunk)) {
-            world.loadChunk(chunk);
-        }
-        final int x = loc.getBlockX(), z = loc.getBlockZ();
-        int y = loc.getBlockY();
-        boolean lower = world.getBlockTypeIdAt(x, y, z) == 0, upper = world.getBlockTypeIdAt(x, y + 1, z) == 0;
-        while ((!lower || !upper) && y != 127) {
-            lower = upper;
-            upper = world.getBlockTypeIdAt(x, ++y, z) == 0;
-        }
-        while (world.getBlockTypeIdAt(x, y - 1, z) == 0 && y != 0) {
-            y--;
-        }
-        return y;
-    }
-
-    public static int modifyContainer(BlockState b, ItemStack item) {
-        if (b instanceof InventoryHolder) {
-            final Inventory inv = ((InventoryHolder) b).getInventory();
-            if (item.getAmount() < 0) {
-                item.setAmount(-item.getAmount());
-                final ItemStack tmp = inv.removeItem(item).get(0);
-                return tmp != null ? tmp.getAmount() : 0;
-            } else if (item.getAmount() > 0) {
-                final ItemStack tmp = inv.addItem(item).get(0);
-                return tmp != null ? tmp.getAmount() : 0;
-            }
-        }
-        return 0;
-    }
-
-    public static boolean canFall(World world, int x, int y, int z) {
-        Material mat = world.getBlockAt(x, y, z).getType();
-
-        // Air
-        if (mat == Material.AIR) {
-            return true;
-        } else if (mat == Material.WATER || mat == Material.STATIONARY_WATER || mat == Material.LAVA || mat == Material.STATIONARY_LAVA) { // Fluids
-            return true;
-        } else if (getFallingEntityKillers().contains(mat) || mat == Material.FIRE || mat == Material.VINE || mat == Material.LONG_GRASS || mat == Material.DEAD_BUSH) { // Misc.
-            return true;
-        }
-        return false;
-    }
-
-    public static class ItemStackComparator implements Comparator<ItemStack> {
-        @Override
-        public int compare(ItemStack a, ItemStack b) {
-            final int aType = a.getTypeId(), bType = b.getTypeId();
-            if (aType < bType) {
-                return -1;
-            }
-            if (aType > bType) {
-                return 1;
-            }
-            final short aData = rawData(a), bData = rawData(b);
-            if (aData < bData) {
-                return -1;
-            }
-            if (aData > bData) {
-                return 1;
-            }
-            return 0;
-        }
-    }
-
-    public static int itemIDfromProjectileEntity(Entity e) {
-        Integer i = projectileItems.get(e.getType());
-        return (i == null) ? 0 : i;
-    }
-}

src/main/java/de/diddiz/util/LoggingUtil.java

@@ -1,214 +0,0 @@
-package de.diddiz.util;
-
-import de.diddiz.LogBlock.Actor;
-import de.diddiz.LogBlock.Consumer;
-import de.diddiz.LogBlock.Logging;
-import de.diddiz.LogBlock.config.WorldConfig;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.Sign;
-import org.bukkit.material.*;
-
-import java.util.List;
-
-import static de.diddiz.LogBlock.config.Config.getWorldConfig;
-import static de.diddiz.LogBlock.config.Config.mb4;
-
-public class LoggingUtil {
-
-    public static void smartLogFallables(Consumer consumer, Actor actor, Block origin) {
-
-        WorldConfig wcfg = getWorldConfig(origin.getWorld());
-        if (wcfg == null) {
-            return;
-        }
-
-        //Handle falling blocks
-        Block checkBlock = origin.getRelative(BlockFace.UP);
-        int up = 0;
-        final int highestBlock = checkBlock.getWorld().getHighestBlockYAt(checkBlock.getLocation());
-        while (BukkitUtils.getRelativeTopFallables().contains(checkBlock.getType())) {
-
-            // Record this block as falling
-            consumer.queueBlockBreak(actor, checkBlock.getState());
-
-            // Guess where the block is going (This could be thrown of by explosions, but it is better than nothing)
-            Location loc = origin.getLocation();
-            int x = loc.getBlockX();
-            int y = loc.getBlockY();
-            int z = loc.getBlockZ();
-            while (y > 0 && BukkitUtils.canFall(loc.getWorld(), x, (y - 1), z)) {
-                y--;
-            }
-            // If y is 0 then the sand block fell out of the world :(
-            if (y != 0) {
-                Location finalLoc = new Location(loc.getWorld(), x, y, z);
-                // Run this check to avoid false positives
-                if (!BukkitUtils.getFallingEntityKillers().contains(finalLoc.getBlock().getType())) {
-                    finalLoc.add(0, up, 0); // Add this here after checking for block breakers
-                    if (finalLoc.getBlock().getType() == Material.AIR || BukkitUtils.getRelativeTopFallables().contains(finalLoc.getBlock().getType())) {
-                        consumer.queueBlockPlace(actor, finalLoc, checkBlock.getTypeId(), checkBlock.getData());
-                    } else {
-                        consumer.queueBlockReplace(actor, finalLoc, finalLoc.getBlock().getTypeId(), finalLoc.getBlock().getData(), checkBlock.getTypeId(), checkBlock.getData());
-                    }
-                    up++;
-                }
-            }
-            if (checkBlock.getY() >= highestBlock) {
-                break;
-            }
-            checkBlock = checkBlock.getRelative(BlockFace.UP);
-        }
-    }
-
-    public static void smartLogBlockBreak(Consumer consumer, Actor actor, Block origin) {
-
-        WorldConfig wcfg = getWorldConfig(origin.getWorld());
-        if (wcfg == null) {
-            return;
-        }
-
-        Block checkBlock = origin.getRelative(BlockFace.UP);
-        if (BukkitUtils.getRelativeTopBreakabls().contains(checkBlock.getType())) {
-            if (wcfg.isLogging(Logging.SIGNTEXT) && checkBlock.getType() == Material.SIGN_POST) {
-                consumer.queueSignBreak(actor, (Sign) checkBlock.getState());
-            } else if (checkBlock.getType() == Material.IRON_DOOR_BLOCK || checkBlock.getType() == Material.WOODEN_DOOR) {
-                Block doorBlock = checkBlock;
-                // If the doorBlock is the top half a door the player simply punched a door
-                // this will be handled later.
-                if (!BukkitUtils.isTop(doorBlock.getType(), doorBlock.getData())) {
-                    doorBlock = doorBlock.getRelative(BlockFace.UP);
-                    // Fall back check just in case the top half wasn't a door
-                    if (doorBlock.getType() == Material.IRON_DOOR_BLOCK || doorBlock.getType() == Material.WOODEN_DOOR) {
-                        consumer.queueBlockBreak(actor, doorBlock.getState());
-                    }
-                    consumer.queueBlockBreak(actor, checkBlock.getState());
-                }
-            } else if (checkBlock.getType() == Material.DOUBLE_PLANT) {
-                Block plantBlock = checkBlock;
-                // If the plantBlock is the top half of a double plant the player simply
-                // punched the plant this will be handled later.
-                if (!BukkitUtils.isTop(plantBlock.getType(), plantBlock.getData())) {
-                    plantBlock = plantBlock.getRelative(BlockFace.UP);
-                    // Fall back check just in case the top half wasn't a plant
-                    if (plantBlock.getType() == Material.DOUBLE_PLANT) {
-                        consumer.queueBlockBreak(actor, plantBlock.getState());
-                    }
-                    consumer.queueBlockBreak(actor, checkBlock.getState());
-                }
-            } else {
-                consumer.queueBlockBreak(actor, checkBlock.getState());
-            }
-        }
-
-        List<Location> relativeBreakables = BukkitUtils.getBlocksNearby(origin, BukkitUtils.getRelativeBreakables());
-        if (relativeBreakables.size() != 0) {
-            for (Location location : relativeBreakables) {
-                final Material blockType = location.getBlock().getType();
-                final BlockState blockState = location.getBlock().getState();
-                final MaterialData data = blockState.getData();
-                switch (blockType) {
-                    case REDSTONE_TORCH_ON:
-                    case REDSTONE_TORCH_OFF:
-                        if (blockState.getBlock().getRelative(((RedstoneTorch) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case TORCH:
-                        if (blockState.getBlock().getRelative(((Torch) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case COCOA:
-                        if (blockState.getBlock().getRelative(((CocoaPlant) data).getAttachedFace().getOppositeFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case LADDER:
-                        if (blockState.getBlock().getRelative(((Ladder) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case LEVER:
-                        if (blockState.getBlock().getRelative(((Lever) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case TRIPWIRE_HOOK:
-                        if (blockState.getBlock().getRelative(((TripwireHook) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case WOOD_BUTTON:
-                    case STONE_BUTTON:
-                        if (blockState.getBlock().getRelative(((Button) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    case WALL_SIGN:
-                        if (blockState.getBlock().getRelative(((org.bukkit.material.Sign) data).getAttachedFace()).equals(origin)) {
-                            if (wcfg.isLogging(Logging.SIGNTEXT)) {
-                                consumer.queueSignBreak(actor, (Sign) blockState);
-                            } else {
-                                consumer.queueBlockBreak(actor, blockState);
-                            }
-                        }
-                        break;
-                    case TRAP_DOOR:
-                        if (blockState.getBlock().getRelative(((TrapDoor) data).getAttachedFace()).equals(origin)) {
-                            consumer.queueBlockBreak(actor, blockState);
-                        }
-                        break;
-                    default:
-                        consumer.queueBlockBreak(actor, blockState);
-                        break;
-                }
-            }
-        }
-
-        // Special door check
-        if (origin.getType() == Material.IRON_DOOR_BLOCK || origin.getType() == Material.WOODEN_DOOR) {
-            Block doorBlock = origin;
-
-            // Up or down?
-            if (!BukkitUtils.isTop(doorBlock.getType(), doorBlock.getData())) {
-                doorBlock = doorBlock.getRelative(BlockFace.UP);
-            } else {
-                doorBlock = doorBlock.getRelative(BlockFace.DOWN);
-            }
-
-            if (doorBlock.getType() == Material.IRON_DOOR_BLOCK || doorBlock.getType() == Material.WOODEN_DOOR) {
-                consumer.queueBlockBreak(actor, doorBlock.getState());
-            }
-        } else if (origin.getType() == Material.DOUBLE_PLANT) { // Special double plant check
-            Block plantBlock = origin;
-
-            // Up or down?
-            if (!BukkitUtils.isTop(origin.getType(), origin.getData())) {
-                plantBlock = plantBlock.getRelative(BlockFace.UP);
-            } else {
-                plantBlock = plantBlock.getRelative(BlockFace.DOWN);
-            }
-
-            if (plantBlock.getType() == Material.DOUBLE_PLANT) {
-                consumer.queueBlockBreak(actor, plantBlock.getState());
-            }
-        }
-
-        // Do this down here so that the block is added after blocks sitting on it
-        consumer.queueBlockBreak(actor, origin.getState());
-    }
-
-    public static String checkText(String text) {
-        if (text == null) {
-            return text;
-        }
-        if (mb4) {
-            return text;
-        }
-        return text.replaceAll("[^\\u0000-\\uFFFF]", "?");
-    }
-}

src/main/java/de/diddiz/util/MaterialName.java

@@ -1,277 +0,0 @@
-package de.diddiz.util;
-
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.material.MaterialData;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-
-import static de.diddiz.util.Utils.isInt;
-import static de.diddiz.util.Utils.isShort;
-import static org.bukkit.Bukkit.getLogger;
-
-public class MaterialName {
-    private static final String[] COLORS = {"white", "orange", "magenta", "light blue", "yellow", "lime", "pink", "gray", "silver", "cyan", "purple", "blue", "brown", "green", "red", "black"};
-    private static final Map<Integer, String> materialNames = new HashMap<Integer, String>();
-    private static final Map<Integer, Map<Short, String>> materialDataNames = new HashMap<Integer, Map<Short, String>>();
-    private static final Map<String, Integer> nameTypes = new HashMap<String, Integer>();
-
-    static {
-        // Add all known materials
-        for (final Material mat : Material.values()) {
-            materialNames.put(mat.getId(), mat.toString().replace('_', ' ').toLowerCase());
-        }
-        // Load config
-        final File file = new File("plugins/LogBlock/materials.yml");
-        final YamlConfiguration cfg = YamlConfiguration.loadConfiguration(file);
-        if (cfg.getKeys(false).isEmpty()) {
-            // Generate defaults
-            cfg.options().header("Add block or item names you want to be overridden or also names for custom blocks");
-            cfg.set("1.1", "granite");
-            cfg.set("1.2", "polished granite");
-            cfg.set("1.3", "diorite");
-            cfg.set("1.4", "polished diorite");
-            cfg.set("1.5", "andesite");
-            cfg.set("1.6", "polished andesite");
-            cfg.set("5.0", "oak wood");
-            cfg.set("5.1", "spruce wood");
-            cfg.set("5.2", "birch wood");
-            cfg.set("5.3", "jungle wood");
-            cfg.set("5.4", "acacia wood");
-            cfg.set("5.5", "dark oak wood");
-            cfg.set("3.1", "coarse dirt");
-            cfg.set("3.2", "podzol");
-            cfg.set("6.1", "redwood sapling");
-            cfg.set("6.2", "birch sapling");
-            cfg.set("6.3", "jungle sapling");
-            cfg.set("6.4", "acacia sapling");
-            cfg.set("6.5", "dark oak sapling");
-            cfg.set("9", "water");
-            cfg.set("11", "lava");
-            cfg.set("12.1", "red sand");
-            cfg.set("17.0", "oak log");
-            cfg.set("17.1", "spruce log");
-            cfg.set("17.2", "birch log");
-            cfg.set("17.3", "jungle log");
-            cfg.set("17.4", "oak log");
-            cfg.set("17.5", "spruce log");
-            cfg.set("17.6", "birch log");
-            cfg.set("17.7", "jungle log");
-            cfg.set("17.8", "oak log");
-            cfg.set("17.9", "spruce log");
-            cfg.set("17.10", "birch log");
-            cfg.set("17.11", "jungle log");
-            cfg.set("17.12", "oak log");
-            cfg.set("17.13", "spruce log");
-            cfg.set("17.14", "birch log");
-            cfg.set("17.15", "jungle log");
-            cfg.set("18.1", "spruce leaves");
-            cfg.set("18.2", "birch leaves");
-            cfg.set("18.3", "jungle leaves");
-            cfg.set("18.4", "oak leaves");
-            cfg.set("18.5", "spruce leaves");
-            cfg.set("18.6", "birch leaves");
-            cfg.set("18.7", "jungle leaves");
-            cfg.set("18.8", "oak leaves");
-            cfg.set("18.9", "spruce leaves");
-            cfg.set("18.10", "birch leaves");
-            cfg.set("18.11", "jungle leaves");
-            cfg.set("18.12", "oak leaves");
-            cfg.set("18.13", "spruce leaves");
-            cfg.set("18.14", "birch leaves");
-            cfg.set("18.15", "jungle leaves");
-            cfg.set("19.1", "wet sponge");
-            cfg.set("37.0", "dandelion");
-            cfg.set("38.0", "poppy");
-            cfg.set("38.1", "blue orchid");
-            cfg.set("38.2", "allium");
-            cfg.set("38.3", "azure bluet");
-            cfg.set("38.4", "red tulip");
-            cfg.set("38.5", "orange tulip");
-            cfg.set("38.6", "white tulip");
-            cfg.set("38.7", "pink tulip");
-            cfg.set("38.8", "oxeye daisy");
-            cfg.set("24.1", "chiseled sandstone");
-            cfg.set("24.2", "smooth sandstone");
-            cfg.set("31.0", "dead bush");
-            cfg.set("31.1", "tall grass");
-            cfg.set("31.2", "fern");
-            cfg.set("98.0", "stone brick");
-            cfg.set("98.1", "mossy stone brick");
-            cfg.set("98.2", "cracked stone brick");
-            cfg.set("98.3", "chiseled stone brick");
-            cfg.set("125.0", "oak double step");
-            cfg.set("125.1", "spruce double step");
-            cfg.set("125.2", "birch double step");
-            cfg.set("125.3", "jungle double step");
-            cfg.set("125.4", "acacia double step");
-            cfg.set("125.5", "dark oak double step");
-            cfg.set("126.0", "oak step");
-            cfg.set("126.1", "spruce step");
-            cfg.set("126.2", "birch step");
-            cfg.set("126.3", "jungle step");
-            cfg.set("126.4", "acacia step");
-            cfg.set("126.5", "dark oak step");
-            cfg.set("126.8", "oak step");
-            cfg.set("126.9", "spruce step");
-            cfg.set("126.10", "birch step");
-            cfg.set("126.11", "jungle step");
-            cfg.set("126.12", "acacia step");
-            cfg.set("126.13", "dark oak step");
-            cfg.set("139.1", "mossy cobble wall");
-            cfg.set("155.1", "chiseled quartz block");
-            cfg.set("155.2", "pillar quartz block");
-            cfg.set("155.3", "pillar quartz block");
-            cfg.set("155.4", "pillar quartz block");
-            cfg.set("161.0", "acacia leaves");
-            cfg.set("161.1", "dark oak leaves");
-            cfg.set("161.4", "acacia leaves");
-            cfg.set("161.5", "dark oak leaves");
-            cfg.set("161.8", "acacia leaves");
-            cfg.set("161.9", "dark oak leaves");
-            cfg.set("161.12", "acacia leaves");
-            cfg.set("161.13", "dark oak leaves");
-            cfg.set("162.0", "acacia log");
-            cfg.set("162.1", "dark oak log");
-            cfg.set("162.4", "acacia log");
-            cfg.set("162.5", "dark oak log");
-            cfg.set("162.8", "acacia log");
-            cfg.set("162.9", "dark oak log");
-            cfg.set("162.12", "acacia log");
-            cfg.set("162.13", "dark oak log");
-            cfg.set("168.1", "prismarine brick");
-            cfg.set("168.2", "dark prismarine");
-            cfg.set("181.0", "red sandstone double step");
-            cfg.set("181.8", "smooth red sandstone double step");
-            cfg.set("162.13", "dark oak log");
-            cfg.set("175.0", "sunflower");
-            cfg.set("175.1", "lilac");
-            cfg.set("175.2", "double tall grass");
-            cfg.set("175.3", "large fern");
-            cfg.set("175.4", "rose bush");
-            cfg.set("175.5", "peony");
-            cfg.set("175.8", "sunflower");
-            cfg.set("175.9", "lilac");
-            cfg.set("175.10", "double tall grass");
-            cfg.set("175.11", "large fern");
-            cfg.set("175.12", "rose bush");
-            cfg.set("175.13", "peony");
-            cfg.set("179.1", "chiseled sandstone");
-            cfg.set("179.2", "smooth sandstone");
-            cfg.set("263.1", "charcoal");
-            for (byte i = 0; i < 10; i++) {
-                cfg.set("43." + i, toReadable(Material.DOUBLE_STEP.getNewData(i)));
-            }
-            cfg.set("43.8", "stone double step");
-            cfg.set("43.9", "sandstone double step");
-            cfg.set("43.15", "quartz double step");
-            for (byte i = 0; i < 8; i++) {
-                cfg.set("44." + i, toReadable(Material.STEP.getNewData(i)));
-                // The second half of this data list should read the same as the first half
-                cfg.set("44." + (i + 7), toReadable(Material.STEP.getNewData(i)));
-            }
-            for (byte i = 0; i < 16; i++) {
-                cfg.set("351." + i, toReadable(Material.INK_SACK.getNewData(i)));
-                cfg.set("35." + i, COLORS[i] + " wool");
-                cfg.set("159." + i, COLORS[i] + " stained clay");
-                cfg.set("95." + i, COLORS[i] + " stained glass");
-                cfg.set("160." + i, COLORS[i] + " stained glass pane");
-                cfg.set("171." + i, COLORS[i] + " carpet");
-            }
-            for (byte i = 0; i < 6; i++) {
-                cfg.set("125." + i, toReadable(Material.WOOD_DOUBLE_STEP.getNewData(i)));
-                cfg.set("126." + i, toReadable(Material.WOOD_STEP.getNewData(i)));
-                cfg.set("126." + i + 8, toReadable(Material.WOOD_STEP.getNewData(i)));
-            }
-            try {
-                cfg.save(file);
-            } catch (final IOException ex) {
-                getLogger().log(Level.WARNING, "Unable to save material.yml: ", ex);
-            }
-        }
-        if (cfg.getString("263.1") == null) {
-            getLogger().info("[Logblock-names] Logblock's default materials.yml file has been updated with more names");
-            getLogger().info("[Logblock-names] Consider deleting your current materials.yml file to allow it to be recreated");
-        }
-        for (final String entry : cfg.getKeys(false)) {
-            if (isInt(entry)) {
-                if (cfg.isString(entry)) {
-                    materialNames.put(Integer.valueOf(entry), cfg.getString(entry));
-                    nameTypes.put(cfg.getString(entry), Integer.valueOf(entry));
-                } else if (cfg.isConfigurationSection(entry)) {
-                    final Map<Short, String> dataNames = new HashMap<Short, String>();
-                    materialDataNames.put(Integer.valueOf(entry), dataNames);
-                    final ConfigurationSection sec = cfg.getConfigurationSection(entry);
-                    for (final String data : sec.getKeys(false)) {
-                        if (isShort(data)) {
-                            if (sec.isString(data)) {
-                                dataNames.put(Short.valueOf(data), sec.getString(data));
-                                nameTypes.put(sec.getString(data), Integer.valueOf(entry));
-                            } else {
-                                getLogger().warning("Parsing materials.yml: '" + data + "' is not a string.");
-                            }
-                        } else {
-                            getLogger().warning("Parsing materials.yml: '" + data + "' is no valid material data");
-                        }
-                    }
-                } else {
-                    getLogger().warning("Parsing materials.yml: '" + entry + "' is neither a string nor a section.");
-                }
-            } else {
-                getLogger().warning("Parsing materials.yml: '" + entry + "' is no valid material id");
-            }
-        }
-    }
-
-    /**
-     * Returns the name of a material based on its id
-     *
-     * @param type The type of the material
-     * @return Name of the material, or if it's unknown, the id.
-     */
-    public static String materialName(int type) {
-        return materialNames.containsKey(type) ? materialNames.get(type) : String.valueOf(type);
-    }
-
-    /**
-     * Returns the name of a material based on its id and data
-     *
-     * @param type The type of the material
-     * @param data The data of the material
-     * @return Name of the material regarding it's data, or if it's unknown, the basic name.
-     */
-    public static String materialName(int type, short data) {
-        final Map<Short, String> dataNames = materialDataNames.get(type);
-        if (dataNames != null) {
-            if (dataNames.containsKey(data)) {
-                return dataNames.get(data);
-            }
-        }
-        return materialName(type);
-    }
-
-    public static Integer typeFromName(String name) {
-        Integer answer = nameTypes.get(toReadable(name));
-        if (answer != null) {
-            return answer;
-        }
-        final Material mat = Material.matchMaterial(name);
-        if (mat == null) {
-            throw new IllegalArgumentException("No material matching: '" + name + "'");
-        }
-        return mat.getId();
-    }
-
-    private static String toReadable(MaterialData matData) {
-        return matData.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
-    }
-
-    private static String toReadable(String matData) {
-        return matData.toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
-    }
-}