world.execute() now requires @ prefix in command name to show any war…

…ning at all
Darmo117 · Dec 7, 2023 · 68367be · 68367be
1 parent 19017ee
commit 68367be
Showing 1 changed file with 26 additions and 14 deletions.
diff --git a/src/main/java/net/darmo_creations/mccode/interpreter/type_wrappers/WorldType.java b/src/main/java/net/darmo_creations/mccode/interpreter/type_wrappers/WorldType.java
@@ -669,14 +669,25 @@ public Position locateBiome(final Scope scope, final ServerWorld self, final Str
       },
       returnTypeMetadata = @ReturnMeta(mayBeNull = true,
           doc = "The result of the command or #null if an error occured."),
-      doc = "Executes a command. See the Minecraft Wiki for more information. The /trigger command is not accepted and will raise an error ")
+      doc = "Executes a command." +
+          " Prefix the command name with @ to print warnings to the server console and chat when any occur, they will be hidden otherwise." +
+          " See the Minecraft Wiki for more information on commands." +
+          " The /trigger command is not accepted and will raise an error.")
   public Long executeCommand(final Scope scope, ServerWorld self, final String name, final Object... args) {
-    if ("trigger".equals(name)) {
-      throw new MCCodeRuntimeException(scope, name, "mccode.interpreter.error.illegal_command", name);
+    String cmdName;
+    boolean showWarnings = name.startsWith("@");
+    if (showWarnings) {
+      cmdName = name.substring(1);
+    } else {
+      cmdName = name;
+    }
+    if ("trigger".equals(cmdName.trim())) {
+      throw new MCCodeRuntimeException(scope, cmdName, "mccode.interpreter.error.illegal_command", cmdName);
     }
     return executeCommand(
         scope, self,
-        name,
+        cmdName,
+        showWarnings,
         Arrays.stream(args).map(o -> ProgramManager.getTypeForValue(o).toString(o)).toArray(String[]::new)
     ).orElse(null);
   }
@@ -685,7 +696,8 @@ public Long executeCommand(final Scope scope, ServerWorld self, final String nam
    * Utility methods
    */
 
-  private static Optional<Long> executeCommand(final Scope scope, ServerWorld self, final String commandName, final String... args) {
+  private static Optional<Long> executeCommand(final Scope scope, ServerWorld self, final String commandName,
+                                               boolean showWarnings, final String... args) {
     MinecraftServer server = self.getServer();
     String command = commandName;
     if (args.length != 0) {
@@ -696,11 +708,13 @@ private static Optional<Long> executeCommand(final Scope scope, ServerWorld self
     Vec2f execRot = program.getExecutorRotation();
     CommandSourceStackWrapper commandSourceStack = new CommandSourceStackWrapper(server, self, execPos, execRot);
     long result = server.getCommandManager().executeWithPrefix(commandSourceStack, command);
-    if (result == 0 && commandSourceStack.anyFailures) {
-      String dimension = Utils.getDimension(program.getProgramManager().getWorld());
-      String prefix = "[Program %s in %s] ".formatted(program.getName(), dimension);
-      printWarning(self, prefix + "Command error: " + command);
-      commandSourceStack.errors.forEach(text -> printWarning(self, prefix + text.getString()));
+    if (commandSourceStack.anyFailures) {
+      if (showWarnings) {
+        String dimension = Utils.getDimension(program.getProgramManager().getWorld());
+        String prefix = "[Program %s in %s] ".formatted(program.getName(), dimension);
+        printWarning(self, prefix + "Command error: " + command);
+        commandSourceStack.errors.forEach(text -> printWarning(self, prefix + text.getString()));
+      }
       return Optional.empty();
     }
     return Optional.of(result);
@@ -807,11 +821,11 @@ private static class CommandSourceStackWrapper extends ServerCommandSource {
     /**
      * The list of all errors.
      */
-    final List<Text> errors;
+    final List<Text> errors = new LinkedList<>();
     /**
      * Whether any failures occured while executing the last command.
      */
-    boolean anyFailures;
+    boolean anyFailures = false;
 
     /**
      * Create a wrapper for a command source and level.
@@ -835,8 +849,6 @@ private static class CommandSourceStackWrapper extends ServerCommandSource {
           SignedCommandArguments.EMPTY,
           FutureQueue.NOOP
       );
-      this.errors = new LinkedList<>();
-      this.anyFailures = false;
     }
 
     @Override