Identify players by UUID and migrate existing databases to include th…

…is. Fixes #538, fixes #568

This creates a new column in the lb-players table called UUID. If this is in the form of a UUID,
it's assumed to be a player. If not, it's assumed to be a server entity (zombie, sheep, or
WaterFlow, LavaFlow etc.). LogBlock will set the UUID of entities to "log_" plus their name
(i.e. log_zombie or log_sheep)

To assist this is a new class Actor, which wraps a name/UUID pair, with constructors that will
generate one from server entities, or SQL results. Every listener and every class in Consumer
needed to be updated to deal with this

As of yet, only the playername is displayed in results (although the queries do return UUID data).
Similarly, you can only query by name (the database stores the last name they have logged in as).
In addition, the WorldEdit hook has been disabled (is not compiled) since LB needs to be updated
to use their new API, and the LB code hook has to extract UUID information for insertion.

The UUID importer assumes any player with an onlinetime of 0 is a server-generated source, and set
the UUID as above (log_sheep etc.).  For everything else, it sends 100 names at a time to Mojang's
name->UUID service, and records them if available.  If no result is found, it records their UUID as
noimport_theirname.  As this is more likely than other updates to be interrupted mid-way, the
importer is tolerant of e.g. the column already being added, and will resume where it left off.

pom.xml

@@ -89,6 +89,9 @@
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
+                                <excludes>
+                                    <exclude>**/de/diddiz/worldedit/*.java</exclude>
+                                </excludes>
 				</configuration>
 			</plugin>
 		</plugins>

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

@@ -0,0 +1,85 @@
+package de.diddiz.LogBlock;
+
+import static de.diddiz.util.BukkitUtils.entityName;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class Actor {
+
+	@Override
+	public int hashCode() {
+		int hash = 5;
+		hash = 79 * hash + (this.UUID != null ? this.UUID.hashCode() : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		final Actor other = (Actor) obj;
+		if ((this.UUID == null) ? (other.UUID != null) : !this.UUID.equals(other.UUID)) {
+			return false;
+		}
+		return true;
+	}
+
+	final String name;
+	final String UUID;
+
+	public Actor(String name, String UUID) {
+		this.name = name;
+		this.UUID = UUID;
+
+	}
+
+	public Actor(String name) {
+		this(name, generateUUID(name));
+	}
+
+	public Actor(ResultSet rs) throws SQLException {
+		this(rs.getString("playername"),rs.getString("UUID"));
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getUUID() {
+		return UUID;
+	}
+
+	public static Actor actorFromEntity(Entity entity) {
+		if (entity instanceof Player) {
+			return new Actor(entityName(entity),entity.getUniqueId().toString());
+		} else {
+			return new Actor(entityName(entity));
+		}
+	}
+
+	public static Actor actorFromEntity(EntityType entity) {
+		return new Actor(entity.getName());
+	}
+
+	public static boolean isValidUUID(String uuid) {
+		try {
+			java.util.UUID.fromString(uuid);
+			return true;
+		} catch (IllegalArgumentException e) {
+			return false;
+		}
+	}
+
+	public static String generateUUID(String name) {
+		return "log_" + name;
+
+	}
+}

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

@@ -14,28 +14,31 @@ 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 ChestAccess ca;
 
-	public BlockChange(long date, Location loc, String playerName, int replaced, int type, byte data, String signtext, ChestAccess ca) {
+	public BlockChange(long date, Location loc, Actor actor, int replaced, int type, byte data, String signtext, ChestAccess ca) {
 		id = 0;
 		this.date = date;
 		this.loc = loc;
-		this.playerName = playerName;
+		this.actor = actor;
 		this.replaced = replaced;
 		this.type = type;
 		this.data = data;
 		this.signtext = signtext;
 		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;
 		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;
@@ -49,8 +52,8 @@ public String toString() {
 		final StringBuilder msg = new StringBuilder();
 		if (date > 0)
 			msg.append(Config.formatter.format(date)).append(" ");
-		if (playerName != null)
-			msg.append(playerName).append(" ");
+		if (actor != null)
+			msg.append(actor.getName()).append(" ");
 		if (signtext != null) {
 			final String action = type == 0 ? "destroyed " : "created ";
 			if (!signtext.contains("\0"))

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

@@ -8,17 +8,20 @@ public class ChatMessage implements LookupCacheElement
 {
 	final long id, date;
 	final String playerName, message;
+	final Actor player;
 
-	public ChatMessage(String playerName, String message) {
+	public ChatMessage(Actor player, String message) {
 		id = 0;
 		date = System.currentTimeMillis() / 1000;
-		this.playerName = playerName;
+		this.player = player;
 		this.message = message;
+		this.playerName = player == null ? null : player.getName();
 	}
 
 	public ChatMessage(ResultSet rs, QueryParams p) throws SQLException {
 		id = p.needId ? rs.getInt("id") : 0;
 		date = p.needDate ? rs.getTimestamp("date").getTime() : 0;
+		player = p.needPlayer ? new Actor(rs) : null;
 		playerName = p.needPlayer ? rs.getString("playername") : null;
 		message = p.needMessage ? rs.getString("message") : null;
 	}
@@ -30,6 +33,6 @@ public Location getLocation() {
 
 	@Override
 	public String getMessage() {
-		return (playerName != null ? "<" + playerName + "> " : "") + (message != null ? message : "");
+		return (player != null ? "<" + player.getName() + "> " : "") + (message != null ? message : "");
 	}
 }