Added player tracing tools, fixed some bugs

core/src/io/anuke/mindustry/net/Administration.java

@@ -10,6 +10,7 @@ public class Administration {
     private Array<String> bannedIPS = new Array<>();
     private Array<String> admins = new Array<>();
     private ObjectMap<String, String> known = new ObjectMap<>();
+    private ObjectMap<String, TraceInfo> traces = new ObjectMap<>();
 
     public Administration(){
         Settings.defaultList(
@@ -21,6 +22,16 @@ public class Administration {
         load();
     }
 
+    public TraceInfo getTrace(String ip){
+        if(!traces.containsKey(ip)) traces.put(ip, new TraceInfo(ip));
+
+        return traces.get(ip);
+    }
+
+    public void clearTraces(){
+        traces.clear();
+    }
+
     /**Sets last known name for an IP.*/
     public void setKnownName(String ip, String name){
         known.put(ip, name);

core/src/io/anuke/mindustry/net/NetEvents.java

@@ -13,7 +13,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.entities.Entity;
 
-import static io.anuke.mindustry.Vars.netCommon;
+import static io.anuke.mindustry.Vars.*;
 
 public class NetEvents {
 
@@ -165,4 +165,12 @@ public class NetEvents {
         packet.action = action;
         Net.send(packet, SendMode.tcp);
     }
+
+    public static void handleTraceRequest(Player target){
+        if(Net.client()) {
+            handleAdministerRequest(target, AdminAction.trace);
+        }else{
+            ui.traces.show(target, netServer.admins.getTrace(Net.getConnection(target.clientid).address));
+        }
+    }
 }

core/src/io/anuke/mindustry/net/Packets.java

@@ -8,6 +8,7 @@ import io.anuke.mindustry.io.Version;
 import io.anuke.mindustry.net.Packet.ImportantPacket;
 import io.anuke.mindustry.net.Packet.UnimportantPacket;
 import io.anuke.mindustry.resource.Item;
+import io.anuke.mindustry.world.Block;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.EntityGroup;
 
@@ -612,6 +613,43 @@ public class Packets {
     }
 
     public enum AdminAction{
-        kick, ban
+        kick, ban, trace
+    }
+
+    public static class TracePacket implements Packet{
+        public TraceInfo info;
+
+        @Override
+        public void write(ByteBuffer buffer) {
+            buffer.putInt(info.playerid);
+            buffer.putShort((short)info.ip.getBytes().length);
+            buffer.put(info.ip.getBytes());
+            buffer.put(info.modclient ? (byte)1 : 0);
+
+            buffer.putInt(info.totalBlocksBroken);
+            buffer.putInt(info.structureBlocksBroken);
+            buffer.putInt(info.lastBlockBroken.id);
+
+            buffer.putInt(info.totalBlocksPlaced);
+            buffer.putInt(info.lastBlockPlaced.id);
+        }
+
+        @Override
+        public void read(ByteBuffer buffer) {
+            int id = buffer.getInt();
+            short iplen = buffer.getShort();
+            byte[] ipb = new byte[iplen];
+            buffer.get(ipb);
+
+            info = new TraceInfo(new String(ipb));
+
+            info.playerid = id;
+            info.modclient = buffer.get() == 1;
+            info.totalBlocksBroken = buffer.getInt();
+            info.structureBlocksBroken = buffer.getInt();
+            info.lastBlockBroken = Block.getByID(buffer.getInt());
+            info.totalBlocksPlaced = buffer.getInt();
+            info.lastBlockPlaced = Block.getByID(buffer.getInt());
+        }
     }
 }

core/src/io/anuke/mindustry/net/Registrator.java

@@ -44,6 +44,7 @@ public class Registrator {
             NetErrorPacket.class,
             PlayerAdminPacket.class,
             AdministerRequestPacket.class,
+            TracePacket.class,
     };
     private static ObjectIntMap<Class<?>> ids = new ObjectIntMap<>();
 

core/src/io/anuke/mindustry/net/TraceInfo.java

@@ -0,0 +1,21 @@
+package io.anuke.mindustry.net;
+
+import io.anuke.mindustry.world.Block;
+import io.anuke.mindustry.world.blocks.Blocks;
+
+public class TraceInfo {
+    public int playerid;
+    public String ip;
+    public boolean modclient;
+
+    public int totalBlocksBroken;
+    public int structureBlocksBroken;
+    public Block lastBlockBroken = Blocks.air;
+
+    public int totalBlocksPlaced;
+    public Block lastBlockPlaced = Blocks.air;
+
+    public TraceInfo(String ip){
+        this.ip = ip;
+    }
+}