fix: still show feedback if no regions affected by cmd

NucleoidMC · Jun 16, 2024 · 44dfe7f · 44dfe7f
1 parent a37edaa
commit 44dfe7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/xyz/nucleoid/creator_tools/command/MapMetadataCommand.java b/src/main/java/xyz/nucleoid/creator_tools/command/MapMetadataCommand.java
@@ -279,7 +279,7 @@ private static boolean executeRegionDataGet(CommandContext<ServerCommandSource>
         context.getSource().sendFeedback(() -> withMapPrefix(map,
                 Text.translatable("text.nucleoid_creator_tools.map.region.data.get", region.marker(), formatNbt(region.data()))
         ), false);
-        return false;
+        return true;
     }
 
     private static boolean executeRegionDataMerge(CommandContext<ServerCommandSource> context, MapWorkspace map, WorkspaceRegion region) {
@@ -615,9 +615,15 @@ private static Command<ServerCommandSource> executeInRegions(String message, Reg
             }
 
             if (count > 0) {
-                int finalCount = count;
-                source.sendFeedback(() -> withMapPrefix(map, Text.literal(String.format(message, finalCount))), false);
+                if (!message.isEmpty()) {
+                    int finalCount = count;
+                    source.sendFeedback(() -> withMapPrefix(map, Text.literal(String.format(message, finalCount))), false);
+                }
+            } else {
+                var text = Text.translatable("text.nucleoid_creator_tools.map.region.none_affected");
+                source.sendFeedback(() -> withMapPrefix(map, text), false);
             }
+
             return 2;
         };
     }

diff --git a/src/main/resources/data/nucleoid_creator_tools/lang/en_us.json b/src/main/resources/data/nucleoid_creator_tools/lang/en_us.json
@@ -47,6 +47,7 @@
   "text.nucleoid_creator_tools.map.open.map_already_exists": "Map with id '%s' already exists!",
   "text.nucleoid_creator_tools.map.open.success": "Opened workspace '%s'! Use %s to join this map",
   "text.nucleoid_creator_tools.map.origin.set": "Updated origin for workspace",
+  "text.nucleoid_creator_tools.map.region.none_affected": "No regions affected.",
   "text.nucleoid_creator_tools.map.region.add.success": "Added region '%s'.",
   "text.nucleoid_creator_tools.map.region.add.success.excited": "Added region '%s'!",
   "text.nucleoid_creator_tools.map.region.bounds.get": "%s to %s",