.say & .clear addition (#100)

* .clear: dont clear input history by default * .say: add option to send message via localPlayer
fr1kin · Jul 25, 2019 · 947e43f · 947e43f
1 parent 5d0611a
commit 947e43f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/matt/forgehax/mods/commands/HelpCommand.java b/src/main/java/com/matt/forgehax/mods/commands/HelpCommand.java
@@ -227,8 +227,9 @@ public Command clearChat(CommandBuilders builders) {
         .newCommandBuilder()
         .name("clear")
         .description("Clears chat")
+        .options(p -> p.acceptsAll(Arrays.asList("all", "a"), "Also clear sent message history"))
         .processor(d -> MC.addScheduledTask(
-          () -> MC.ingameGUI.getChatGUI().clearChatMessages(true))
+          () -> MC.ingameGUI.getChatGUI().clearChatMessages(d.hasOption("all")))
         )
         .build();
     }

diff --git a/src/main/java/com/matt/forgehax/mods/commands/SayCommand.java b/src/main/java/com/matt/forgehax/mods/commands/SayCommand.java
@@ -23,6 +23,7 @@ public Command say(CommandBuilders builders) {
             .options(
                 parser -> {
                     parser.acceptsAll(Arrays.asList("fake", "f"), "Send a fake message that won't be treated as command");
+                    parser.acceptsAll(Arrays.asList("local", "l"), "Send message from local chat");
                 }
             )
             .processor(
@@ -36,7 +37,11 @@ public Command say(CommandBuilders builders) {
                         if (fake) {
                             msg = new StringBuilder().appendCodePoint(fakePrefix).append(msg).toString();
                         }
-                        PacketHelper.ignoreAndSend(new CPacketChatMessage(msg));
+                        if (data.hasOption("local")) {
+                          getLocalPlayer().sendChatMessage(msg);
+                        } else {
+                          PacketHelper.ignoreAndSend(new CPacketChatMessage(msg));
+                        }
                     }
                 }
             )