Bump version to 1.1.2

Cleaner item list display
Allow full item list as file
Fixed online status message with new handler

MinecraftDiscordBot/ClientScript.lua

@@ -1,9 +1,12 @@
 local secretToken = "$TOKEN"
 local connectionUri = "$HOST"
 local waitSeconds = 5
+-- https://github.com/cc-tweaked/CC-Tweaked/blob/9cf70b10effeeed23e0e9c537bbbe0b2ff0d1a0f/src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java#L29
+-- Chunk size must be less than packet size (type reply, success, chunkids, content: chunk) 16 kb for buffer
+local maxMessageSize = (128 - 16) * 1024
 
 local function chunkString(value, chunkSize)
-	if not chunkSize then chunkSize = 10000 end
+	if not chunkSize then chunkSize = maxMessageSize end
 	local length = value:len()
 	local total = math.ceil(length / chunkSize)
 	local chunks = {}
@@ -29,7 +32,7 @@ local function sendResponse(socket, id, result, success)
 
 	local total, chunks = chunkString(result)
 	for i, chunk in pairs(chunks) do
-		sendJson(socket, { id = id, result = chunk, chunk = i, total = total, success = success })
+		sendJson(socket, { type = "reply", id = id, result = chunk, chunk = i, total = total, success = success })
 	end
 end
 
@@ -73,6 +76,19 @@ local function getResponse(parsed)
 		return textutils.serializeJSON(item)
 	elseif parsed.method == "command" then
 		return runRsCommand(parsed.params)
+	elseif parsed.method == "getonline" then
+		return textutils.serializeJSON(getPeripheral("playerDetector").getOnlinePlayers())
+	elseif parsed.method == "whereis" then
+		local pos = getPeripheral("playerDetector").getPlayerPos(parsed.params.username)
+		if not pos then return "null" end
+		return textutils.serializeJSON(pos)
+	elseif parsed.method == "send" then
+		if not parsed.params.username then
+			getPeripheral("chatBox").sendMessage(parsed.params.message, parsed.params.prefix)
+		else
+			getPeripheral("chatBox").sendMessageToPlayer(parsed.params.message, parsed.params.username, parsed.params.prefix)
+		end
+		return "true"
 	end
 
 	error({message = "No message handler for method: "..parsed.method.."!"})
@@ -119,13 +135,7 @@ local function handleMessage(socket, message)
 	return false
 end
 
-local function socketClient()
-	print("Connecting to the socket server at "..connectionUri.."...")
-	local socket, reason = http.websocket(connectionUri)
-	if not socket then error("Socket server could not be reached: "..reason) end
-	print("Connection successful!")
-
-	socket.send("login="..secretToken)
+local function responder(socket)
 	while true do
 		local message, binary = socket.receive()
 		if not not message and not binary then
@@ -142,15 +152,60 @@ local function termWaiter()
 	os.pullEvent("terminate")
 end
 
-local function services()
-	parallel.waitForAny(termWaiter, function()
-		parallel.waitForAll(socketClient)
-	end)
+local function chatEventListener(socket)
+	while true do
+		event, username, message, uuid, hidden = os.pullEvent("chat")
+		sendJson(socket, {type = "chat", username = username, message = message, uuid = uuid, hidden = hidden})
+		print("Chat event relayed!")
+	end
+end
+
+local function getPeripheralInfo(side)
+	return {type = peripheral.getType(side), methods = peripheral.getMethods(side), side = side}
+end
+
+local function peripheralDetachEventListener(socket)
+	while true do
+		event, side = os.pullEvent("peripheral_detach")
+		sendJson(socket, {type = "peripheral_detach", side = side})
+		print("Peripheral was detached!")
+	end
+end
+
+local function peripheralAttachEventListener(socket)
+	while true do
+		event, side = os.pullEvent("peripheral")
+		sendJson(socket, {type = "peripheral", peripheral = getPeripheralInfo(side) })
+		print("Peripheral was attached!")
+	end
+end
+
+local function eventListeners(socket)
+	parallel.waitForAny(
+		termWaiter,
+		function() chatEventListener(socket) end,
+		function() peripheralDetachEventListener(socket) end,
+		function() peripheralAttachEventListener(socket) end
+	)
+end
+
+local function socketClient()
+	print("Connecting to the socket server at "..connectionUri.."...")
+	local socket, reason = http.websocket(connectionUri)
+	if not socket then error("Socket server could not be reached: "..reason) end
+	print("Connection successful!")
+
+	socket.send("login="..secretToken)
+	parallel.waitForAny(
+		function() responder(socket) end,
+		function() eventListeners(socket) end
+	)
+	socket.close()
 end
 
 local function main()
 	while true do
-		local status, error = pcall(services)
+		local status, error = pcall(socketClient)
 		if status then break end
 		printError("An uncaught exception was raised:", error)
 		printError("Restarting in", waitSeconds, "seconds...")

MinecraftDiscordBot/Commands/CommandRouter.cs

@@ -1,4 +1,5 @@
 using Discord.WebSocket;
+using MinecraftDiscordBot.Models;
 using MinecraftDiscordBot.Services;
 using System.Reflection;
 using System.Text;
@@ -8,6 +9,7 @@ namespace MinecraftDiscordBot.Commands;
 public abstract class CommandRouter : ICommandHandler<ResponseType> {
     public record struct HandlerStruct(HandleCommandDelegate<ResponseType> Delegate, CommandHandlerAttribute Attribute);
     private readonly Dictionary<string, HandlerStruct> _handlers = new();
+
     public abstract string HelpTextPrefix { get; }
     public CommandRouter() {
         foreach (var method in GetType().GetMethods())

MinecraftDiscordBot/MinecraftDiscordBot.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
     <Authors>Michael Chen</Authors>
     <Company>$(Authors)</Company>
     <RepositoryUrl>https://gitlab.com/chenmichael/mcdiscordbot</RepositoryUrl>

MinecraftDiscordBot/Models/Fluid.cs

@@ -19,4 +19,6 @@ public class Fluid {
         : $"{Amount:n0} mB of {DisplayName}";
     [JsonIgnore]
     public string CleanDisplayName => DisplayName[1..^1];
+    [JsonIgnore]
+    public string? TagString => Tags is string[] tags ? string.Join(", ", tags) : null;
 }

MinecraftDiscordBot/Models/Item.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System.Diagnostics;
+using System.Text;
 
 namespace MinecraftDiscordBot.Models;
 
@@ -10,5 +11,23 @@ public class Item : Fluid {
     public Md5Hash Fingerprint { get; set; } = default!;
     [JsonProperty("nbt", Required = Required.DisallowNull)]
     public dynamic? NBT { get; set; }
-    public override string ToString() => $"{Amount:n0}x {DisplayName}";
+    public override string ToString() => $"{AmountString} {CleanDisplayName}";
+    [JsonIgnore]
+    public string DetailString {
+        get {
+            var sb = new StringBuilder();
+            sb.AppendFormat("{0} {1}, fp: {2}", AmountString, CleanDisplayName, Fingerprint);
+            if (TagString is string tags)
+                sb.AppendFormat(", tags: [{0}]", tags);
+            if (NBT is not null)
+                sb.AppendFormat(", NBT: {0}", JsonConvert.SerializeObject(NBT));
+            return sb.ToString();
+        }
+    }
+    [JsonIgnore]
+    public string AmountString => Amount switch {
+        > 1000000 => $"> {Amount / 1000000:n0}m",
+        > 10000 => $"~ {Amount / 1000.0f:n2}k",
+        _ => Amount.ToString()
+    };
 }

MinecraftDiscordBot/Models/Message.cs

@@ -1,51 +1,114 @@
 using Discord.WebSocket;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace MinecraftDiscordBot.Models;
 
 public abstract class Message {
+    public static Message Deserialize(string strMessage) {
+        var obj = JObject.Parse(strMessage);
+        var typeName = GetKey<string>(obj, "type");
+        if (!Parsers.TryGetValue(typeName, out var type))
+            throw new FormatException($"Unknown message type '{typeName}'!");
+        if (obj.ToObject(type) is not Message message)
+            throw new FormatException($"Message cannot be casted to '{type}'!");
+        return message;
+    }
+
+    private static readonly Dictionary<string, Type> Parsers = GetMessageTypes();
+    private static Dictionary<string, Type> GetMessageTypes() {
+        var types = new Dictionary<string, Type>();
+        var messageTypes =
+            AppDomain.CurrentDomain.GetAssemblies().SelectMany(domainAssembly => domainAssembly.GetTypes())
+                .Where(typeof(Message).IsAssignableFrom);
+        foreach (var type in messageTypes)
+            if (GetTypeAttribute(type) is MessageTypeAttribute attr)
+                types.Add(attr.Name, type);
+        return types;
+    }
+
+    private static MessageTypeAttribute? GetTypeAttribute(Type type)
+        => type.GetCustomAttributes(typeof(MessageTypeAttribute), false).OfType<MessageTypeAttribute>().FirstOrDefault();
+
+    private static T GetKey<T>(JObject msg, string key)
+        => (msg.TryGetValue(key, out var type) ? type : throw new FormatException($"Message has no '{key}' param!"))
+            .ToObject<T>() ?? throw new FormatException($"'{key}' param is not of expected type '{typeof(T).Name}'!");
+
     [JsonProperty("type")]
     public abstract string Type { get; }
 }
 
+[MessageType(TYPE)]
 public class CapabilityMessage : Message {
-    public override string Type => "roles";
+    private const string TYPE = "roles";
+    public override string Type => TYPE;
     [JsonProperty("role", Required = Required.Always)]
     public string[] Role { get; set; } = default!;
 }
 
-public class TextMessage : Message {
-    public TextMessage(SocketMessage arg) : this(arg.Author.Username, arg.Content) { }
-    public TextMessage(string author, string content) {
-        Author = author;
-        Content = content;
-    }
-    public override string Type => "text";
-    [JsonProperty("author", Required = Required.Always)]
-    public string Author { get; set; }
-    [JsonProperty("message", Required = Required.Always)]
-    public string Content { get; set; }
-}
-
+[MessageType(TYPE)]
 public class ReplyMessage : Message {
-    public ReplyMessage(int answerId, string result) {
-        AnswerId = answerId;
-        Result = result;
-    }
+    private const string TYPE = "reply";
+    public override string Type => TYPE;
     [JsonProperty("id", Required = Required.Always)]
     public int AnswerId { get; set; }
     [JsonProperty("result", Required = Required.Always)]
-    public string Result { get; set; }
+    public string Result { get; set; } = default!;
     [JsonProperty("chunk", Required = Required.DisallowNull)]
     public int Chunk { get; set; } = 1;
     [JsonProperty("total", Required = Required.DisallowNull)]
     public int Total { get; set; } = 1;
     [JsonProperty("success", Required = Required.DisallowNull)]
     public ResultState State { get; set; } = ResultState.Successful;
-    public override string Type => "reply";
 }
 
+public abstract class EventMessage : Message { }
+
+[MessageType(TYPE)]
+public class PeripheralDetachEvent : EventMessage {
+    private const string TYPE = "peripheral_detach";
+    public override string Type => TYPE;
+    [JsonProperty("side", Required = Required.Always)]
+    public string Side { get; set; } = default!;
+}
+
+[MessageType(TYPE)]
+public class PeripheralAttachEvent : EventMessage {
+    private const string TYPE = "peripheral";
+    public override string Type => TYPE;
+    [JsonIgnore]
+    public string Side => Peripheral.Side;
+    [JsonProperty("peripheral", Required = Required.Always)]
+    public Peripheral Peripheral { get; set; } = default!;
+}
+
+public class Peripheral {
+    [JsonProperty("side", Required = Required.Always)]
+    public string Side { get; set; } = default!;
+    [JsonProperty("type", Required = Required.Always)]
+    public string Type { get; set; } = default!;
+    [JsonProperty("methods", Required = Required.Always)]
+    public string[] Methods { get; set; } = default!;
+}
+
+[MessageType(TYPE)]
+public class ChatEvent : EventMessage {
+    private const string TYPE = "chat";
+    public override string Type => TYPE;
+    [JsonProperty("username", Required = Required.Always)]
+    public string Username { get; set; } = default!;
+    [JsonProperty("message", Required = Required.Always)]
+    public string Message { get; set; } = default!;
+    [JsonProperty("uuid", Required = Required.Always)]
+    public string UUID { get; set; } = default!;
+    [JsonProperty("hidden", Required = Required.Always)]
+    public bool IsHidden { get; set; }
+}
+
+[MessageType(TYPE)]
 public class RequestMessage : Message {
+    private const string TYPE = "request";
+    public override string Type => TYPE;
     public RequestMessage(int answerId, string method, Dictionary<string, object>? parameters = null) {
         AnswerId = answerId;
         Method = method;
@@ -58,11 +121,4 @@ public class RequestMessage : Message {
     public string Method { get; set; }
     [JsonProperty("params")]
     public Dictionary<string, object> Parameters { get; }
-    public override string Type => "request";
-}
-
-public enum ResultState {
-    Successful,
-    Unsuccessful,
-    Fatal
 }

MinecraftDiscordBot/Models/MessageTypeAttribute.cs

@@ -0,0 +1,7 @@
+namespace MinecraftDiscordBot.Models;
+
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+public sealed class MessageTypeAttribute : Attribute {
+    public MessageTypeAttribute(string type) => Name = type;
+    public string Name { get; }
+}

MinecraftDiscordBot/Models/PlayerPosition.cs

@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace MinecraftDiscordBot.Models;
+
+public class PlayerPosition {
+    [JsonProperty("dimension", Required = Required.Always)] public string Dimension { get; set; } = default!;
+    [JsonProperty("eyeHeight", Required = Required.Always)] public double EyeHeight { get; set; }
+    [JsonProperty("pitch", Required = Required.Always)] public double Pitch { get; set; }
+    [JsonProperty("yaw", Required = Required.Always)] public double Yaw { get; set; }
+    [JsonProperty("x", Required = Required.Always)] public int X { get; set; }
+    [JsonProperty("y", Required = Required.Always)] public int Y { get; set; }
+    [JsonProperty("z", Required = Required.Always)] public int Z { get; set; }
+}

MinecraftDiscordBot/Models/ResultState.cs

@@ -0,0 +1,7 @@
+namespace MinecraftDiscordBot.Models;
+
+public enum ResultState {
+    Successful,
+    Unsuccessful,
+    Fatal
+}

MinecraftDiscordBot/Program.cs

@@ -2,9 +2,11 @@
 using Discord;
 using Discord.Commands;
 using Discord.Rest;
+using Discord.Webhook;
 using Discord.WebSocket;
 using Fleck;
 using MinecraftDiscordBot.Commands;
+using MinecraftDiscordBot.Models;
 using MinecraftDiscordBot.Services;
 using System.Collections.Concurrent;
 using System.Reflection;
@@ -26,11 +28,14 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
     private readonly HashSet<ulong> _whitelistedChannels;
     private readonly ConcurrentDictionary<Guid, RootCommandService> _connections = new();
     private static readonly char[] WhiteSpace = new char[] { '\t', '\n', ' ', '\r' };
-    public ITextChannel[] _channels = Array.Empty<ITextChannel>();
-    private RootCommandService? _rsSystem = null;
+    public IEnumerable<ActiveChannel> Channels => _channels ?? throw new InvalidProgramException("Channels used before verification!");
+    public ActiveChannel[]? _channels;
     private bool disposedValue;
+    private readonly RootCommandService _computer;
+
     public static bool OnlineNotifications => true;
     private const string ClientScriptName = "MinecraftDiscordBot.ClientScript.lua";
+    private const string WebhookName = "minecraftbot";
     public readonly string ClientScript;
     private readonly ITokenProvider _tokenProvider = new TimeoutTokenProvider(InstanceId, 10);
     private static readonly int InstanceId = new Random().Next();
@@ -46,25 +51,17 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
             .Replace("$HOST", $"ws://{config.SocketHost}:{config.Port}");
     }
 
-    public RootCommandService? Computer {
-        get => _rsSystem; set {
-            if (_rsSystem != value) {
-                _rsSystem = value;
-                if (OnlineNotifications)
-                    _ = Task.Run(() => Broadcast(i => i.SendMessageAsync(value is null
-                          ? $"The Minecraft client has gone offline!"
-                          : $"The Minecraft client is now online!")));
-            }
-        }
-    }
-
-    private async Task Broadcast(Func<ITextChannel, Task<IUserMessage>> message) => _ = await Task.WhenAll(_channels.Select(message));
+    private Task Broadcast(Func<ITextChannel, Task<IUserMessage>> message)
+        => Task.WhenAll(Channels.Select(i => message(i.Channel)));
     public Program(BotConfiguration config) {
         _config = config;
+        _computer = new(this);
+        _computer.ChatMessageReceived += MinecraftMessageReceived;
+        _computer.SocketChanged += ComputerConnectedChanged;
         _administrators = config.Administrators.ToHashSet();
         ClientScript = GetClientScript(config);
         _client.Log += LogAsync;
-        _client.MessageReceived += (msg) => DiscordMessageReceived(msg);
+        _client.MessageReceived += (msg) => DiscordMessageReceived(msg, 20 * 1000);
         _client.ReactionAdded += DiscordReactionAdded;
         _wssv = new WebSocketServer($"ws://0.0.0.0:{config.Port}") {
             RestartAfterListenError = true
@@ -73,6 +70,14 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
         _whitelistedChannels = config.Channels.ToHashSet();
     }
 
+    private void ComputerConnectedChanged(object? sender, IWebSocketConnection? e) {
+        _ = Task.Run(() => Broadcast(i => i.SendMessageAsync(e is not null
+              ? "The Minecraft client is now available!"
+              : "The Minecraft client disconnected!")));
+    }
+    private void MinecraftMessageReceived(object? sender, ChatEvent e)
+        => Task.Run(() => WebhookBroadcast(i => i.SendMessageAsync(e.Message, username: e.Username, avatarUrl: $"https://crafatar.com/renders/head/{e.UUID}")));
+    private Task<T[]> WebhookBroadcast<T>(Func<DiscordWebhookClient, Task<T>> apply) => Task.WhenAll(Channels.Select(i => apply(new DiscordWebhookClient(i.Webhook))));
     private void LogWebSocket(LogLevel level, string message, Exception exception) => Log(new(level switch {
         LogLevel.Debug => LogSeverity.Debug,
         LogLevel.Info => LogSeverity.Info,
@@ -108,7 +113,11 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
             await LogErrorAsync(BotSource, new InvalidOperationException("No valid textchannel was whitelisted!"));
             return false;
         }
-        _channels = channels;
+        _channels = await Task.WhenAll(channels.Select(async i => new ActiveChannel(i, await GetOrCreateWebhook(i))));
+        static async Task<IWebhook> GetOrCreateWebhook(ITextChannel i) {
+            var hooks = (await i.GetWebhooksAsync()).Where(i => i.Name == WebhookName).FirstOrDefault();
+            return hooks ?? await i.CreateWebhookAsync(WebhookName);
+        }
         return true;
     }
 
@@ -142,17 +151,21 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
         await (message switch {
             "getcode" => SendClientCode(socket),
             string s when s.StartsWith("login=") => ClientComputerConnected(socket, s[6..]),
+            string s when s.StartsWith("error=") => ClientComputerError(socket, s[6..]),
             _ => DisruptClientConnection(socket, "Protocol violation!")
         });
     }
 
+    private static async Task ClientComputerError(IWebSocketConnection socket, string message)
+        => await LogWarningAsync("Client", $"Computer failed to run the script: {message}");
+
     private async Task ClientComputerConnected(IWebSocketConnection socket, string token) {
         if (!_tokenProvider.VerifyToken(token)) {
             await DisruptClientConnection(socket, "outdated");
             return;
         }
         await LogInfoAsync(WebSocketSource, $"[{socket.ConnectionInfo.Id}] Client logged in with valid script!");
-        AddComputerSocket(socket, new(socket, this));
+        AddComputerSocket(socket);
     }
 
     private static async Task DisruptClientConnection(IWebSocketConnection socket, string reason) {
@@ -166,10 +179,10 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
         await LogInfoAsync(WebSocketSource, $"[{socket.ConnectionInfo.Id}] Script sent to client!");
     }
 
-    private void AddComputerSocket(IWebSocketConnection socket, RootCommandService pc) => Computer = pc;
+    private void AddComputerSocket(IWebSocketConnection socket) => _computer.Socket = socket;
 
     private void RemoveComputerSocket(IWebSocketConnection socket) {
-        if (Computer is { ConnectionInfo.Id: Guid id } && id == socket.ConnectionInfo.Id) Computer = null;
+        if (_computer.Socket is { ConnectionInfo.Id: Guid id } && id == socket.ConnectionInfo.Id) _computer.Socket = null;
     }
 
     private async Task SocketClosed(IWebSocketConnection socket) {
@@ -198,13 +211,14 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
         }
 
         await LogInfoAsync("Discord", $"[{arg.Author.Username}] {arg.Content}");
-        // TODO: Relay Message to Chat Receiver   
+        _ = Task.Run(() => _computer.Chat.SendMessageAsync(arg.Content, arg.Author.Username, cts.Token));
     }
 
     private Task SendResponse(SocketUserMessage message, ResponseType response) => response switch {
         ResponseType.IChoiceResponse res => HandleChoice(message, res),
         ResponseType.StringResponse res => message.ReplyAsync(res.Message),
-        _ => message.ReplyAsync($"Whoops, someone forgot to implement '{response.GetType()}' responses?"),
+        ResponseType.FileResponse res => message.Channel.SendFileAsync(res.Path, text: res.Message),
+        _ => message.ReplyAsync($"Whoops, someone forgot to implement '{response.GetType().Name}' responses?"),
     };
 
     private readonly ConcurrentDictionary<ulong, ResponseType.IChoiceResponse> _choiceWait = new();
@@ -232,7 +246,7 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
     }
 
     public async Task<ResponseType> HandleCommand(SocketUserMessage message, string[] parameters, CancellationToken ct) {
-        if (Computer is ICommandHandler<ResponseType> handler)
+        if (_computer is ICommandHandler<ResponseType> handler)
             try {
                 return await handler.HandleCommand(message, parameters, ct);
             } catch (TaskCanceledException) {
@@ -267,8 +281,23 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
     }
 
     public static void Log(LogMessage msg) {
-        lock (LogLock)
-            Console.WriteLine(msg.ToString());
+        lock (LogLock) {
+            var oldColor = Console.ForegroundColor;
+            try {
+                Console.ForegroundColor = msg.Severity switch {
+                    LogSeverity.Critical => ConsoleColor.Magenta,
+                    LogSeverity.Error => ConsoleColor.Red,
+                    LogSeverity.Warning => ConsoleColor.Yellow,
+                    LogSeverity.Info => ConsoleColor.White,
+                    LogSeverity.Verbose => ConsoleColor.Blue,
+                    LogSeverity.Debug => ConsoleColor.DarkBlue,
+                    _ => ConsoleColor.Cyan,
+                };
+                Console.WriteLine(msg.ToString());
+            } finally {
+                Console.ForegroundColor = oldColor;
+            }
+        }
     }
 
     protected virtual void Dispose(bool disposing) {
@@ -304,10 +333,22 @@ public class Program : IDisposable, ICommandHandler<ResponseType>, IUserRoleMana
     }
 }
 
+public class ActiveChannel {
+    public ActiveChannel(ITextChannel channel, IWebhook webhook) {
+        Channel = channel;
+        Webhook = webhook;
+    }
+
+    public IWebhook Webhook { get; }
+    public ITextChannel Channel { get; }
+}
+
 public abstract class ResponseType {
     private static string DefaultDisplay<T>(T obj) => obj?.ToString() ?? throw new InvalidProgramException("ToString did not yield anything!");
     public static ResponseType AsString(string message) => new StringResponse(message);
     public static ResponseType FromChoice<T>(string query, IEnumerable<T> choice, Func<T, Task> resultHandler, Func<T, string>? display = null) => new ChoiceResponse<T>(query, choice, resultHandler, display ?? DefaultDisplay);
+    internal static ResponseType File(string path, string message) => new FileResponse(path, message);
+
     public class StringResponse : ResponseType {
         public StringResponse(string message) => Message = message;
         public string Message { get; }
@@ -331,4 +372,14 @@ public abstract class ResponseType {
             _displayer = display;
         }
     }
+
+    public class FileResponse : ResponseType {
+        public FileResponse(string path, string message) {
+            Path = path;
+            Message = message;
+        }
+
+        public string Path { get; }
+        public string Message { get; }
+    }
 }

MinecraftDiscordBot/Services/ChatBoxService.cs

@@ -0,0 +1,26 @@
+using Discord.WebSocket;
+using MinecraftDiscordBot.Commands;
+
+namespace MinecraftDiscordBot.Services;
+
+public class ChatBoxService : CommandRouter {
+    private readonly ITaskWaitSource _taskSource;
+    public ChatBoxService(ITaskWaitSource taskSource) => _taskSource = taskSource;
+
+    public override string HelpTextPrefix => "!chat ";
+    public override Task<ResponseType> FallbackHandler(SocketUserMessage message, string method, string[] parameters, CancellationToken ct)
+        => throw new ReplyException($"The chat box cannot do '{method}'!");
+
+    private Task<T> Method<T>(string methodName, Func<string, T> parser, CancellationToken ct, Dictionary<string, object>? parameters = null)
+        => RootCommandService.Method(_taskSource, methodName, parser, ct, parameters);
+
+    public Task<bool> SendMessageAsync(string message, string prefix, CancellationToken ct) => Method("send", RootCommandService.Deserialize<bool>(), ct, new() {
+        ["message"] = message,
+        ["prefix"] = prefix
+    });
+    public Task<bool> SendMessageToPlayerAsync(string message, string username, string prefix, CancellationToken ct) => Method("send", RootCommandService.Deserialize<bool>(), ct, new() {
+        ["message"] = message,
+        ["username"] = username,
+        ["prefix"] = prefix
+    });
+}

MinecraftDiscordBot/Services/PlayerDetectorService.cs

@@ -0,0 +1,37 @@
+using Discord.WebSocket;
+using MinecraftDiscordBot.Commands;
+using MinecraftDiscordBot.Models;
+using Newtonsoft.Json;
+
+namespace MinecraftDiscordBot.Services;
+
+public class PlayerDetectorService : CommandRouter {
+    private readonly ITaskWaitSource _taskSource;
+    public PlayerDetectorService(ITaskWaitSource taskSource) => _taskSource = taskSource;
+
+    public override string HelpTextPrefix => "!pd ";
+    public override Task<ResponseType> FallbackHandler(SocketUserMessage message, string method, string[] parameters, CancellationToken ct)
+        => throw new ReplyException($"The player detector cannot do '{method}'!");
+
+    private Task<T> Method<T>(string methodName, Func<string, T> parser, CancellationToken ct, Dictionary<string, object>? parameters = null)
+        => RootCommandService.Method(_taskSource, methodName, parser, ct, parameters);
+
+    public Task<string[]> GetOnlinePlayersAsync(CancellationToken ct) => Method("getonline", RootCommandService.Deserialize<string[]>(), ct);
+    public async Task<PlayerPosition> GetPlayerPosition(string username, CancellationToken ct)
+        => (await FindPlayerAsync(username, ct)) ?? throw new ReplyException($"User '{username}' is not online!");
+    private Task<PlayerPosition?> FindPlayerAsync(string username, CancellationToken ct) => Method("whereis", i => JsonConvert.DeserializeObject<PlayerPosition?>(i), ct, new() {
+        ["username"] = username
+    });
+
+    [CommandHandler("getonline", HelpText = "Get a list of online players.")]
+    public async Task<ResponseType> HandleOnlinePlayers(SocketUserMessage message, string[] parameters, CancellationToken ct)
+        => ResponseType.AsString($"The following players are currently online:\n{string.Join("\n", await GetOnlinePlayersAsync(ct))}");
+    [CommandHandler("whereis", HelpText = "Find a player in the world.")]
+    public async Task<ResponseType> HandleFindPlayers(SocketUserMessage message, string[] parameters, CancellationToken ct) {
+        if (parameters is not { Length: 1 }) throw new ReplyException($"Give me only one username!");
+        var username = parameters[0];
+        var player = await FindPlayerAsync(username, ct);
+        if (player is null) throw new ReplyException($"{username} is currently offline!");
+        return ResponseType.AsString($"{username} is at coordinates {player.X} {player.Y} {player.Z} in dimension {player.Dimension}.");
+    }
+}

MinecraftDiscordBot/Services/RefinedStorageService.cs

@@ -1,4 +1,5 @@
-using Discord.WebSocket;
+using Discord;
+using Discord.WebSocket;
 using MinecraftDiscordBot.Commands;
 using MinecraftDiscordBot.Models;
 using System.Text;
@@ -18,11 +19,8 @@ public class RefinedStorageService : CommandRouter {
     public override Task<ResponseType> FallbackHandler(SocketUserMessage message, string method, string[] parameters, CancellationToken ct)
         => throw new ReplyException($"The RS system has no command '{method}'!");
 
-    private async Task<T> Method<T>(string methodName, Func<string, T> parser, CancellationToken ct, Dictionary<string, object>? parameters = null) {
-        var waiter = _taskSource.GetWaiter(parser, ct);
-        await _taskSource.Send(new RequestMessage(waiter.ID, methodName, parameters));
-        return await waiter.Task;
-    }
+    private Task<T> Method<T>(string methodName, Func<string, T> parser, CancellationToken ct, Dictionary<string, object>? parameters = null)
+        => RootCommandService.Method(_taskSource, methodName, parser, ct, parameters);
 
     private const string CmdEnergyUsage = "energyusage";
     private const string CmdEnergyStorage = "energystorage";
@@ -37,17 +35,17 @@ public class RefinedStorageService : CommandRouter {
     public async Task<int> GetEnergyStorageAsync(CancellationToken ct) => await Method(CmdEnergyStorage, int.Parse, ct);
     public async Task<IEnumerable<Item>> ListItemsAsync(CancellationToken ct) => await Method(CmdListItems, RootCommandService.Deserialize<IEnumerable<Item>>(), ct);
     public async Task<IEnumerable<Fluid>> ListFluidsAsync(CancellationToken ct) => await Method(CmdListFluids, RootCommandService.Deserialize<IEnumerable<Fluid>>(), ct);
-    public async Task<Item> GetItemData(string itemid, CancellationToken ct) => await Method(CmdGetItem, RootCommandService.Deserialize<Item>(), ct, new() {
+    public async Task<Item> GetItemDataAsync(string itemid, CancellationToken ct) => await Method(CmdGetItem, RootCommandService.Deserialize<Item>(), ct, new() {
         ["name"] = itemid
     });
-    public async Task<Item> GetItemData(Md5Hash fingerprint, CancellationToken ct) => await Method(CmdGetItem, RootCommandService.Deserialize<Item>(), ct, new() {
+    public async Task<Item> GetItemDataAsync(Md5Hash fingerprint, CancellationToken ct) => await Method(CmdGetItem, RootCommandService.Deserialize<Item>(), ct, new() {
         ["fingerprint"] = fingerprint.ToString()
     });
-    public async Task<bool> CraftItem(string itemid, int amount, CancellationToken ct) => await Method(CmdCraftItem, RootCommandService.Deserialize<bool>(), ct, new() {
+    public async Task<bool> CraftItemAsync(string itemid, int amount, CancellationToken ct) => await Method(CmdCraftItem, RootCommandService.Deserialize<bool>(), ct, new() {
         ["name"] = itemid,
         ["count"] = amount
     });
-    public async Task<LuaPackedArray> RawCommand(string command, CancellationToken ct) => await Method(CmdCommand, LuaPackedArray.Deserialize, ct, new() {
+    public async Task<LuaPackedArray> RawCommandAsync(string command, CancellationToken ct) => await Method(CmdCommand, LuaPackedArray.Deserialize, ct, new() {
         ["command"] = command
     });
 
@@ -94,7 +92,7 @@ public class RefinedStorageService : CommandRouter {
             : parameters.Length is > 2
             ? throw new ReplyException("Yo, those are way too many arguments! I want only item name and maybe an amount!")
             : throw new InvalidOperationException($"Forgot to match parameter length {parameters.Length}!");
-        return await CraftItem(itemid, amount, ct)
+        return await CraftItemAsync(itemid, amount, ct)
             ? ResponseType.AsString($"Alright, I'm starting to craft {amount} {itemid}.")
             : ResponseType.AsString($"Nope, that somehow doesn't work!");
     }
@@ -104,8 +102,8 @@ public class RefinedStorageService : CommandRouter {
         if (parameters.Length is not 1) throw new ReplyException($"I only want one name or fingerprint to search for, you gave me {parameters.Length} arguments!");
         itemid = parameters[0];
         var item = await (Md5Hash.TryParse(itemid, out var fingerprint)
-            ? GetItemData(fingerprint, ct)
-            : GetItemData(itemid, ct));
+            ? GetItemDataAsync(fingerprint, ct)
+            : GetItemDataAsync(itemid, ct));
         var sb = new StringBuilder();
         sb.Append($"We currently have {item.Amount:n0} {item.CleanDisplayName}!");
         if (item.Tags is not null and var tags) {
@@ -143,12 +141,13 @@ public class RefinedStorageService : CommandRouter {
     public async Task<ResponseType> HandleRawCommand(SocketUserMessage message, string[] parameters, CancellationToken ct) {
         _roleManager.RequireAdministrator(message.Author.Id, "You are not authorized to run raw commands on this instance!");
         var command = string.Join(' ', parameters);
-        var response = await RawCommand(command, ct);
+        var response = await RawCommandAsync(command, ct);
         return ResponseType.AsString(response.ToString());
     }
 
     [CommandHandler(CmdListItems, HelpText = "Gets a list of items that are currently stored in the RS system.")]
     public async Task<ResponseType> HandleItemListing(SocketUserMessage message, string[] parameters, CancellationToken ct) {
+        if (parameters.Length is 1 && parameters[0] == "full") return await SendFullItemList(message, ct);
         var sb = new StringBuilder();
         sb.Append("The Refined Storage system currently stores these items:");
         var items = await RefreshItemList(ct);
@@ -156,11 +155,29 @@ public class RefinedStorageService : CommandRouter {
             var taken = 0;
             foreach (var item in items) {
                 if (sb.Length > 500) break;
-                sb.AppendFormat("\n{0:n0}x {1}", item.Amount, item.DisplayName);
+                sb.Append('\n');
+                sb.Append(item.ToString());
                 taken++;
             }
-            if (items.Count > taken) sb.AppendFormat("\nand {0} more items.", items.Skip(taken).Sum(i => i.Amount));
+            if (items.Count > taken) sb.AppendFormat("\nand {0:n0} more items.", items.Skip(taken).Sum(i => i.Amount));
         }
         return ResponseType.AsString(sb.ToString());
     }
+
+    private async Task<ResponseType> SendFullItemList(SocketUserMessage message, CancellationToken ct) {
+        var path = await GetItemListFile(ct);
+        return ResponseType.File(path, $"{message.Author.Mention} Here you go:");
+    }
+
+    private async Task<string> GetItemListFile(CancellationToken ct) {
+        var items = await RefreshItemList(ct);
+        var file = Path.Combine(Path.GetTempPath(), "itemlist.txt");
+        var fs = new FileStream(file, FileMode.OpenOrCreate, FileAccess.Write);
+        using (var sw = new StreamWriter(fs, Encoding.UTF8)) {
+            await sw.WriteLineAsync("The RS System stores the following items:");
+            foreach (var item in items)
+                await sw.WriteLineAsync(item.DetailString);
+        };
+        return file;
+    }
 }

MinecraftDiscordBot/Services/RootCommandService.cs

@@ -10,34 +10,73 @@ public delegate Task<TResponse> HandleCommandDelegate<TResponse>(SocketUserMessa
 public delegate Task HandleCommandDelegate(SocketUserMessage message, string[] parameters, CancellationToken ct);
 
 public class RootCommandService : CommandRouter, ITaskWaitSource {
-    protected readonly IWebSocketConnection _socket;
+    protected IWebSocketConnection? _socketField;
     public override string HelpTextPrefix => "!";
-    public RootCommandService(IWebSocketConnection socket, IUserRoleManager roleManager) : base() {
-        socket.OnMessage = OnMessage;
-        _socket = socket;
-        _rs = new RefinedStorageService(this, roleManager);
+    public RootCommandService(IUserRoleManager roleManager) : base() {
+        RefinedStorage = new RefinedStorageService(this, roleManager);
+        Players = new PlayerDetectorService(this);
+        Chat = new ChatBoxService(this);
     }
 
+    public static async Task<T> Method<T>(ITaskWaitSource taskSource, string methodName, Func<string, T> parser, CancellationToken ct, Dictionary<string, object>? parameters) {
+        var waiter = taskSource.GetWaiter(parser, ct);
+        await taskSource.Send(new RequestMessage(waiter.ID, methodName, parameters));
+        return await waiter.Task;
+    }
+
+    public event EventHandler<ChatEvent>? ChatMessageReceived;
+    public event EventHandler<PeripheralAttachEvent>? PeripheralAttached;
+    public event EventHandler<PeripheralDetachEvent>? PeripheralDetached;
+    public event EventHandler<IWebSocketConnection?>? SocketChanged;
+
+    public IWebSocketConnection? Socket {
+        get => _socketField; set {
+            if (_socketField != value) {
+                _socketField = value;
+                if (value is not null) value.OnMessage = OnMessage;
+                SocketChanged?.Invoke(this, value);
+            }
+        }
+    }
+
+    public RefinedStorageService RefinedStorage { get; }
+    public PlayerDetectorService Players { get; }
+    public ChatBoxService Chat { get; }
+
     private void OnMessage(string message) {
-        if (JsonConvert.DeserializeObject<ReplyMessage>(message) is not ReplyMessage msg) return;
-        IChunkWaiter? waiter;
-        lock (_syncRoot) if (!_waits.TryGetValue(msg.AnswerId, out waiter)) {
-                Program.LogWarningAsync("Socket", $"Invalid wait id '{msg.AnswerId}'!");
-                return;
-            }
-        waiter.SetResultState(msg.State);
-        waiter.AddChunk(msg.Chunk, msg.Total, msg.Result);
-        if (waiter.Finished || waiter.IsCancellationRequested)
-            lock (_syncRoot)
-                _waits.Remove(waiter.ID);
+        switch (Message.Deserialize(message)) {
+        case ChatEvent msg:
+            ChatMessageReceived?.Invoke(this, msg);
+            break;
+        case PeripheralAttachEvent msg:
+            PeripheralAttached?.Invoke(this, msg);
+            break;
+        case PeripheralDetachEvent msg:
+            PeripheralDetached?.Invoke(this, msg);
+            break;
+        case ReplyMessage msg:
+            IChunkWaiter? waiter;
+            lock (_syncRoot) if (!_waits.TryGetValue(msg.AnswerId, out waiter)) {
+                    Program.LogWarningAsync("Socket", $"Invalid wait id '{msg.AnswerId}'!");
+                    return;
+                }
+            waiter.SetResultState(msg.State);
+            waiter.AddChunk(msg.Chunk, msg.Total, msg.Result);
+            if (waiter.Finished || waiter.IsCancellationRequested)
+                lock (_syncRoot)
+                    _waits.Remove(waiter.ID);
+            break;
+        default:
+            Program.LogInfo(Program.WebSocketSource, $"Received unhandled message: {message}!");
+            break;
+        }
     }
 
-    public Task Send(string message) => _socket.Send(message);
+    public Task Send(string message) => (Socket ?? throw new ReplyException("Minecraft server is not available!")).Send(message);
     public Task Send(Message message) => Send(JsonConvert.SerializeObject(message));
     private readonly object _syncRoot = new();
     private readonly Dictionary<int, IChunkWaiter> _waits = new();
     private readonly Random _rnd = new();
-    public IWebSocketConnectionInfo ConnectionInfo => _socket.ConnectionInfo;
 
     private int GetFreeId() {
         var attempts = 0;
@@ -58,10 +97,15 @@ public class RootCommandService : CommandRouter, ITaskWaitSource {
         return waiter;
     }
 
-    private readonly ICommandHandler<ResponseType> _rs;
     [CommandHandler("rs", HelpText = "Provides some commands for interacting with the Refined Storage system.")]
     public Task<ResponseType> RefinedStorageHandler(SocketUserMessage message, string[] parameters, CancellationToken ct)
-        => _rs.HandleCommand(message, parameters, ct);
+        => RefinedStorage.HandleCommand(message, parameters, ct);
+    [CommandHandler("pd", HelpText = "Provides some commands for interacting with the Player Detector.")]
+    public Task<ResponseType> PlayerDetectorHandler(SocketUserMessage message, string[] parameters, CancellationToken ct)
+        => Players.HandleCommand(message, parameters, ct);
+    [CommandHandler("chat", HelpText = "Provides some commands for chatting.")]
+    public Task<ResponseType> ChatBoxHandler(SocketUserMessage message, string[] parameters, CancellationToken ct)
+        => Chat.HandleCommand(message, parameters, ct);
 
     public static Func<string, T> Deserialize<T>() => msg
              => JsonConvert.DeserializeObject<T>(msg) ?? throw new InvalidProgramException("Empty response!");