Return success values from various commands

pupnewfster · pupnewfster · commit 1b375fc1136f · 2025-01-04T15:53:27.000-06:00
diff --git a/src/main/java/mekanism/common/command/CommandMek.java b/src/main/java/mekanism/common/command/CommandMek.java
@@ -1,6 +1,7 @@
 package mekanism.common.command;
 
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -55,7 +56,7 @@ private static class DebugCommand {
                   .executes(ctx -> {
                       MekanismAPI.debug = !MekanismAPI.debug;
                       ctx.getSource().sendSuccess(() -> MekanismLang.COMMAND_DEBUG.translateColored(EnumColor.GRAY, OnOff.of(MekanismAPI.debug, true)), true);
-                      return 0;
+                      return Command.SINGLE_SUCCESS;
                   });
         }
     }
@@ -78,7 +79,7 @@ private static class TestRulesCommand {
                       //Act as if /weather clear was ran
                       source.getLevel().setWeatherParameters(ServerLevel.RAIN_DELAY.sample(server.overworld().getRandom()), 0, false, false);
                       source.sendSuccess(() -> MekanismLang.COMMAND_TEST_RULES.translateColored(EnumColor.GRAY), true);
-                      return 0;
+                      return Command.SINGLE_SUCCESS;
                   });
         }
     }
@@ -102,7 +103,7 @@ private static class TpCommand {
                             // Teleport user to new location
                             player.connection.teleport(position.x(), position.y(), position.z(), player.getYRot(), player.getXRot());
                             source.sendSuccess(() -> MekanismLang.COMMAND_TP.translateColored(EnumColor.GRAY, EnumColor.INDIGO, getPosition(position)), true);
-                            return 0;
+                            return Command.SINGLE_SUCCESS;
                         })
                   );
         }
@@ -133,7 +134,7 @@ private static class TppopCommand {
                       BlockPos lastPos = playerLocations.pop();
                       player.connection.teleport(lastPos.getX(), lastPos.getY(), lastPos.getZ(), player.getYRot(), player.getXRot());
                       source.sendSuccess(() -> MekanismLang.COMMAND_TPOP.translateColored(EnumColor.GRAY, EnumColor.INDIGO, getPosition(lastPos), EnumColor.INDIGO, playerLocations.size()), true);
-                      return 0;
+                      return Command.SINGLE_SUCCESS;
                   });
         }
 
diff --git a/src/main/java/mekanism/common/command/ForceRetrogenCommand.java b/src/main/java/mekanism/common/command/ForceRetrogenCommand.java
@@ -59,21 +59,21 @@ private static int addChunksToRegen(CommandSourceStack source, ColumnPos start,
         int chunkZEnd = SectionPos.blockToSectionCoord(zEnd);
         ServerLevel world = source.getLevel();
         ResourceKey<Level> registryKey = world.dimension();
-        boolean hasChunks = false;
+        int chunks = 0;
         for (int chunkX = chunkXStart; chunkX <= chunkXEnd; chunkX++) {
             for (int chunkZ = chunkZStart; chunkZ <= chunkZEnd; chunkZ++) {
                 if (world.hasChunk(chunkX, chunkZ)) {
                     Mekanism.worldTickHandler.addRegenChunk(registryKey, new ChunkPos(chunkX, chunkZ));
                     int finalChunkX = chunkX, finalChunkZ = chunkZ;
                     source.sendSuccess(() -> MekanismLang.COMMAND_RETROGEN_CHUNK_QUEUED.translateColored(EnumColor.GRAY, EnumColor.INDIGO,
                           MekanismLang.GENERIC_WITH_COMMA.translate(finalChunkX, finalChunkZ), EnumColor.INDIGO, world), true);
-                    hasChunks = true;
+                    chunks++;
                 }
             }
         }
-        if (!hasChunks) {
+        if (chunks == 0) {
             throw NO_CHUNKS_QUEUED.create();
         }
-        return 0;
+        return chunks;
     }
 }
diff --git a/src/main/java/mekanism/common/command/RadiationCommand.java b/src/main/java/mekanism/common/command/RadiationCommand.java
@@ -1,7 +1,9 @@
 package mekanism.common.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
+import mekanism.api.math.MathUtils;
 import mekanism.api.radiation.IRadiationManager;
 import mekanism.api.radiation.capability.IRadiationEntity;
 import mekanism.api.text.EnumColor;
@@ -41,7 +43,7 @@ public class RadiationCommand {
                     .executes(ctx -> {
                         RadiationManager.get().clearSources();
                         ctx.getSource().sendSuccess(() -> MekanismLang.COMMAND_RADIATION_REMOVE_ALL.translateColored(EnumColor.GRAY), true);
-                        return 0;
+                        return Command.SINGLE_SUCCESS;
                     })
               );
     }
@@ -84,6 +86,7 @@ public class RadiationCommand {
                             cap.radiate(magnitude);
                             source.sendSuccess(() -> MekanismLang.COMMAND_RADIATION_ADD_ENTITY.translateColored(EnumColor.GRAY, RadiationScale.getSeverityColor(magnitude),
                                   UnitDisplayUtils.getDisplayShort(magnitude, RadiationUnit.SVH, 3)), true);
+                            return getReturnLevelFromRadiation(magnitude);
                         }
                         return 0;
                     })
@@ -144,7 +147,7 @@ public class RadiationCommand {
                       cap.set(RadiationManager.BASELINE);
                       source.sendSuccess(() -> MekanismLang.COMMAND_RADIATION_CLEAR.translateColored(EnumColor.GRAY), true);
                   }
-                  return 0;
+                  return Command.SINGLE_SUCCESS;
               }).then(Commands.argument("targets", EntityArgument.entities())
                     .requires(MekanismPermissions.COMMAND_RADIATION_HEAL_OTHERS)
                     .executes(ctx -> {
@@ -181,6 +184,7 @@ public class RadiationCommand {
                             cap.set(newValue);
                             source.sendSuccess(() -> MekanismLang.COMMAND_RADIATION_REDUCE.translateColored(EnumColor.GRAY, RadiationScale.getSeverityColor(reduced),
                                   UnitDisplayUtils.getDisplayShort(reduced, RadiationUnit.SVH, 3)), true);
+                            return getReturnLevelFromRadiation(reduced);
                         }
                         return 0;
                     })
@@ -221,7 +225,7 @@ private static int addRadiation(CommandSourceStack source, Vec3 pos, Level world
         IRadiationManager.INSTANCE.radiate(location, magnitude);
         source.sendSuccess(() -> MekanismLang.COMMAND_RADIATION_ADD.translateColored(EnumColor.GRAY, RadiationScale.getSeverityColor(magnitude),
               UnitDisplayUtils.getDisplayShort(magnitude, RadiationUnit.SVH, 3), EnumColor.INDIGO, getPosition(location.pos()), EnumColor.INDIGO, world), true);
-        return 0;
+        return getReturnLevelFromRadiation(magnitude);
     }
 
     private static int getRadiationLevel(CommandSourceStack source, Coordinates location, Level world) {
@@ -234,10 +238,18 @@ private static int getRadiationLevel(CommandSourceStack source, Vec3 pos, Level
         source.sendSuccess(() -> MekanismLang.COMMAND_RADIATION_GET.translateColored(EnumColor.GRAY, EnumColor.INDIGO, getPosition(location.pos()), EnumColor.INDIGO,
                     world, RadiationScale.getSeverityColor(magnitude), UnitDisplayUtils.getDisplayShort(magnitude, RadiationUnit.SVH, 3)),
               true);
-        return 0;
+        return getReturnLevelFromRadiation(magnitude);
     }
 
     private static Component getPosition(BlockPos pos) {
         return MekanismLang.GENERIC_BLOCK_POS.translate(pos.getX(), pos.getY(), pos.getZ());
     }
+
+    private static int getReturnLevelFromRadiation(double magnitude) {
+        if (magnitude < RadiationManager.MIN_MAGNITUDE) {
+            return 0;
+        }
+        //Multiply to make it so that we can differentiate various levels based on what the micro sievert rate would be
+        return MathUtils.clampToInt(magnitude * 1_000_000);
+    }
 }
diff --git a/src/main/java/mekanism/common/command/builders/BuildCommand.java b/src/main/java/mekanism/common/command/builders/BuildCommand.java
@@ -1,5 +1,6 @@
 package mekanism.common.command.builders;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -52,7 +53,7 @@ private BuildCommand() {
                           CommandSourceStack source = ctx.getSource();
                           destroy(source.getLevel(), rayTracePos(source));
                           source.sendSuccess(() -> MekanismLang.COMMAND_BUILD_REMOVED.translateColored(EnumColor.GRAY), true);
-                          return 0;
+                          return Command.SINGLE_SUCCESS;
                       }));
 
     public static void register(String name, ILangEntry localizedName, StructureBuilder builder) {
@@ -89,7 +90,7 @@ private static int build(CommandContext<CommandSourceStack> ctx, ILangEntry loca
             ILangEntry builtEntry = empty ? MekanismLang.COMMAND_BUILD_BUILT_EMPTY : MekanismLang.COMMAND_BUILD_BUILT;
             return builtEntry.translateColored(EnumColor.GRAY, EnumColor.INDIGO, localizedName);
         }, true);
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static void destroy(Level world, BlockPos pos) throws CommandSyntaxException {

Original file line number	Diff line number	Diff line change
`@@ -59,21 +59,21 @@ private static int addChunksToRegen(CommandSourceStack source, ColumnPos start,`
`59`	`59`	`int chunkZEnd = SectionPos.blockToSectionCoord(zEnd);`
`60`	`60`	`ServerLevel world = source.getLevel();`
`61`	`61`	`ResourceKey<Level> registryKey = world.dimension();`
`62`		`- boolean hasChunks = false;`
	`62`	`+ int chunks = 0;`
`63`	`63`	`for (int chunkX = chunkXStart; chunkX <= chunkXEnd; chunkX++) {`
`64`	`64`	`for (int chunkZ = chunkZStart; chunkZ <= chunkZEnd; chunkZ++) {`
`65`	`65`	`if (world.hasChunk(chunkX, chunkZ)) {`
`66`	`66`	`Mekanism.worldTickHandler.addRegenChunk(registryKey, new ChunkPos(chunkX, chunkZ));`
`67`	`67`	`int finalChunkX = chunkX, finalChunkZ = chunkZ;`
`68`	`68`	`source.sendSuccess(() -> MekanismLang.COMMAND_RETROGEN_CHUNK_QUEUED.translateColored(EnumColor.GRAY, EnumColor.INDIGO,`
`69`	`69`	`MekanismLang.GENERIC_WITH_COMMA.translate(finalChunkX, finalChunkZ), EnumColor.INDIGO, world), true);`
`70`		`- hasChunks = true;`
	`70`	`+ chunks++;`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`- if (!hasChunks) {`
	`74`	`+ if (chunks == 0) {`
`75`	`75`	`throw NO_CHUNKS_QUEUED.create();`
`76`	`76`	`}`
`77`		`- return 0;`
	`77`	`+ return chunks;`
`78`	`78`	`}`
`79`	`79`	`}`