feat: commandLoggerBroadcastToPlayer

OptiJava · Jul 8, 2024 · 71386f1 · 71386f1
1 parent e9565a6
commit 71386f1
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java
@@ -223,4 +223,11 @@ public class OptCarpetSettings {
             validate = PlayerTpRateLimitTimeValidator.class
     )
     public static int playerTpRateLimitTime = 2;
+
+    @Rule(
+            desc = "If enabled, command logger will broadcast commands to those players.",
+            category = RuleCategory.COMMAND,
+            options = {"true", "false", "ops"}
+    )
+    public static String commandLoggerBroadcastToPlayer = FALSE;
 }
diff --git a/...o/github/optijava/opt_carpet_addition/mixins/rule/commandLogger/CommandManager_Mixin.java b/...o/github/optijava/opt_carpet_addition/mixins/rule/commandLogger/CommandManager_Mixin.java
@@ -3,16 +3,19 @@
 //#if MC >= 11900
 //$$ import com.mojang.brigadier.ParseResults;
 //#endif
+import carpet.CarpetServer;
+import carpet.utils.Messenger;
 import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.BaseText;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(CommandManager.class)
@@ -38,20 +41,20 @@ public void injectExecute(ServerCommandSource commandSource, String command, Cal
 
         if (!OptCarpetSettings.commandLoggerConfigBean.logAllCommand && OptCarpetSettings.commandLogger) {
             if (OptCarpetSettings.commandLoggerConfigBean.LogCommandWhitelist.contains(command)) {
-                CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+                logCommand(command, commandSource);
                 return;
             }
 
             for (String var1 : OptCarpetSettings.commandLoggerConfigBean.LogCommandPrefixWhitelist) {
                 if (command.startsWith(var1)) {
-                    CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+                    logCommand(command, commandSource);
                     return;
                 }
             }
 
             if (OptCarpetSettings.commandLoggerConfigBean.LogCommandWhitelist.isEmpty() && OptCarpetSettings.commandLoggerConfigBean.LogCommandPrefixWhitelist.isEmpty()) {
                 if (OptCarpetSettings.commandLoggerConfigBean.LogCommandPrefixBlacklist.isEmpty() && OptCarpetSettings.commandLoggerConfigBean.LogCommandBlacklist.isEmpty()) {
-                    CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+                    logCommand(command, commandSource);
                     return;
                 }
 
@@ -64,10 +67,36 @@ public void injectExecute(ServerCommandSource commandSource, String command, Cal
                         return;
                     }
                 }
-                CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+                logCommand(command, commandSource);
             }
         } else if (OptCarpetSettings.commandLoggerConfigBean.logAllCommand && OptCarpetSettings.commandLogger) {
-            CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+            logCommand(command, commandSource);
+        }
+    }
+
+    @Unique
+    private void logCommand(String command, ServerCommandSource commandSource){
+        CommandManager_Mixin.LOGGER.info("[OCA Command Logger] %s submit command: %s".formatted(commandSource.getName(), command));
+
+        if (OptCarpetSettings.commandLoggerBroadcastToPlayer.equals("true")) {
+            BaseText baseText = Messenger.c(
+                        "gi [",
+                            "li " + commandSource.getName(),
+                            "gi : " + command + "]"
+                    );
+
+            Messenger.print_server_message(CarpetServer.minecraft_server, baseText);
+        } else if (OptCarpetSettings.commandLoggerBroadcastToPlayer.equals("ops")) {
+            BaseText baseText = Messenger.c(
+                        "gi [",
+                            "li " + commandSource.getName(),
+                            "gi : " + command + "]"
+                    );
+
+            for (ServerPlayerEntity serverPlayerEntity : CarpetServer.minecraft_server.getPlayerManager().getPlayerList()) {
+                if (!CarpetServer.minecraft_server.getPlayerManager().isOperator(serverPlayerEntity.getGameProfile())) continue;
+                Messenger.m(serverPlayerEntity, baseText);
+            }
         }
     }
 }