diff options
| -rw-r--r-- | src/main/java/de/torui/coflsky/EventRegistry.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/torui/coflsky/WSCommandHandler.java | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/de/torui/coflsky/EventRegistry.java b/src/main/java/de/torui/coflsky/EventRegistry.java index a05e213..dbca065 100644 --- a/src/main/java/de/torui/coflsky/EventRegistry.java +++ b/src/main/java/de/torui/coflsky/EventRegistry.java @@ -65,7 +65,7 @@ public class EventRegistry{ String command = WSCommandHandler.lastOnClickEvent; WSCommandHandler.lastOnClickEvent = null; //System.out.println(">>>>> HasLastONClickEvent = " + command); - Minecraft.getMinecraft().thePlayer.sendChatMessage(command); + WSCommandHandler.Execute(command,Minecraft.getMinecraft().thePlayer); } diff --git a/src/main/java/de/torui/coflsky/WSCommandHandler.java b/src/main/java/de/torui/coflsky/WSCommandHandler.java index abffdf2..7e857db 100644 --- a/src/main/java/de/torui/coflsky/WSCommandHandler.java +++ b/src/main/java/de/torui/coflsky/WSCommandHandler.java @@ -69,17 +69,22 @@ public class WSCommandHandler { private static void Execute(Command cmd, Entity sender) { System.out.println("Execute: " + cmd.getData() + " sender:" + sender); String dummy = WSClient.gson.fromJson(cmd.getData(), String.class); - - if(dummy.startsWith("/cofl")) { - ClientCommandHandler.instance.executeCommand(sender, dummy); + Execute(dummy,sender); + } + + public static void Execute(String cmd, Entity sender) + { + if(cmd.startsWith("/cofl") || cmd.startsWith("http")) { + ClientCommandHandler.instance.executeCommand(sender, cmd); } else { - Minecraft.getMinecraft().thePlayer.sendChatMessage(dummy); + Minecraft.getMinecraft().thePlayer.sendChatMessage(cmd); } - } private static IChatComponent CommandToChatComponent(WriteToChatCommand wcmd) { + if(wcmd.OnClick != null) + lastOnClickEvent = "/cofl callback " + wcmd.OnClick; if (wcmd.Text != null) { IChatComponent comp = new ChatComponentText(wcmd.Text); @@ -126,8 +131,6 @@ public class WSCommandHandler { IChatComponent comp = CommandToChatComponent(wcmd); if (comp != null) { - if(wcmd.OnClick != null) - lastOnClickEvent = "/cofl callback " + wcmd.OnClick; Minecraft.getMinecraft().thePlayer.addChatMessage(comp); } |