0 -> Command.SINGLE_SUCCESS

Author: Earthcomputer

CONTRIBUTING.md

@@ -54,7 +54,7 @@ You may see old code that doesn't adhere to these guidelines, but all new code m
 ### Command registry
 #### General
 * Execute a command's code mostly in a dedicated method, rather than in the `register` method
-* If the command was successful and there isn't something sensible to return, it should `return 0`. If the command was not successful, an exception should be thrown
+* If the command was successful and there isn't something sensible to return, it should `return Command.SINGLE_SUCCESS`. If the command was not successful, an exception should be thrown
 #### Exceptions
 * Exception variables are [immutable constants](#immutable-constants)
 ### Miscellaneous

src/main/java/net/earthcomputer/clientcommands/command/AliasCommand.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
@@ -101,7 +102,7 @@ private static int executeAliasCommand(FabricClientCommandSource source, String
             source.getPlayer().sendChatMessage(cmd);
         }
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     @SuppressWarnings("unchecked")
@@ -127,7 +128,7 @@ private static int addAlias(FabricClientCommandSource source, String key, String
 
         saveAliases();
         source.sendFeedback(Text.translatable("commands.calias.addAlias.success", key));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static int listAliases(FabricClientCommandSource source) {
@@ -139,7 +140,7 @@ private static int listAliases(FabricClientCommandSource source) {
                 source.sendFeedback(Text.of(Formatting.BOLD + key + Formatting.RESET + ": " + aliasMap.get(key).replace("%","%%")));
             }
         }
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static int removeAlias(FabricClientCommandSource source, String key) throws CommandSyntaxException {
@@ -153,7 +154,7 @@ private static int removeAlias(FabricClientCommandSource source, String key) thr
 
         saveAliases();
         source.sendFeedback(Text.translatable("commands.calias.removeAlias.success", key));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static HashMap<String, String> loadAliases() {

src/main/java/net/earthcomputer/clientcommands/command/BookCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -101,6 +102,6 @@ private static int fillBook(FabricClientCommandSource source, IntStream characte
 
         source.sendFeedback(Text.translatable("commands.cbook.success"));
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 }

src/main/java/net/earthcomputer/clientcommands/command/CEnchantCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.command.arguments.ItemAndEnchantmentsPredicateArgumentType.ItemAndEnchantmentsPredicate;
@@ -42,7 +43,7 @@ private static int cenchant(FabricClientCommandSource source, ItemAndEnchantment
                     .append(" ")
                     .append(getCommandTextComponent("commands.client.crack", "/ccrackrng"));
             source.sendFeedback(text);
-            return 0;
+            return Command.SINGLE_SUCCESS;
         }
 
         boolean simulate = getFlag(source, FLAG_SIMULATE);
@@ -71,7 +72,7 @@ private static int cenchant(FabricClientCommandSource source, ItemAndEnchantment
                 source.sendFeedback(Text.translatable("commands.cenchant.success"));
             }
         }
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/CGiveCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -35,6 +36,6 @@ private static int give(FabricClientCommandSource source, ItemStackArgument item
         source.getPlayer().playerScreenHandler.sendContentUpdates();
 
         source.sendFeedback(Text.translatable("commands.cgive.success", count, stack.toHoverableText()));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 }

src/main/java/net/earthcomputer/clientcommands/command/CParticleCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -60,7 +61,7 @@ private static int spawnParticle(FabricClientCommandSource source, ParticleEffec
                 }
                 source.sendFeedback(Text.translatable("commands.cparticle.success",
                         Registry.PARTICLE_TYPE.getId(parameters.getType()).toString()));
-                return 0;
+                return Command.SINGLE_SUCCESS;
         }
     }
 }

src/main/java/net/earthcomputer/clientcommands/command/CPlaySoundCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import dev.xpple.clientarguments.arguments.CSuggestionProviders;
@@ -47,7 +48,7 @@ private static int playSound(FabricClientCommandSource source, Identifier sound,
 
         source.sendFeedback(Text.translatable("commands.cplaysound.success", sound));
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/CStopSoundCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import dev.xpple.clientarguments.arguments.CSuggestionProviders;
@@ -44,7 +45,7 @@ private static int stopSound(FabricClientCommandSource source, SoundCategory cat
         } else {
             source.sendFeedback(Text.translatable("commands.cstopsound.success.source.sound", sound, category.getName()));
         }
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/CTeleportCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -28,6 +29,6 @@ private static int teleport(FabricClientCommandSource source, UUID uuid) throws
         }
         source.getClient().getNetworkHandler().sendPacket(new SpectatorTeleportC2SPacket(uuid));
         source.sendFeedback(Text.translatable("commands.ctp.success", uuid.toString()));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 }

src/main/java/net/earthcomputer/clientcommands/command/CTellRawCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.text.MutableText;
@@ -16,7 +17,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                 .executes(ctx -> {
                     MutableText text = Texts.parse(new FakeCommandSource(ctx.getSource().getPlayer()), getCTextArgument(ctx, "message"), ctx.getSource().getPlayer(), 0);
                     ctx.getSource().getClient().inGameHud.getChatHud().addMessage(text);
-                    return 0;
+                    return Command.SINGLE_SUCCESS;
                 })
             )
         );

src/main/java/net/earthcomputer/clientcommands/command/CalcStackCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -44,7 +45,7 @@ private static int getStackSize(FabricClientCommandSource source, ItemStack stac
             }
         }
 
-        return 1;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static int getStackSize(FabricClientCommandSource source, int count) {

src/main/java/net/earthcomputer/clientcommands/command/CrackRNGCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import net.cortex.clientAddon.cracker.SeedCracker;
 import net.earthcomputer.clientcommands.ServerBrandManager;
@@ -24,7 +25,7 @@ private static int crackPlayerRNG(FabricClientCommandSource source) {
             PlayerRandCracker.setSeed(seed);
             TempRules.playerCrackState = PlayerRandCracker.CrackState.CRACKED;
         });
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/FindBlockCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.world.ClientWorld;
@@ -63,7 +64,7 @@ public static int findBlock(FabricClientCommandSource source, ClientBlockPredica
                     .append(" ")
                     .append(getGlowCoordsTextComponent(Text.translatable("commands.cfindblock.success.glow"), closestBlock))
                     .append(Text.translatable("commands.cfindblock.success.right", foundRadius)));
-            return 1;
+            return Command.SINGLE_SUCCESS;
         }
     }
 

src/main/java/net/earthcomputer/clientcommands/command/FindCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 
@@ -43,7 +44,7 @@ private static int listEntities(FabricClientCommandSource source, CEntitySelecto
                     .append(" ")
                     .append(getCommandTextComponent("commands.client.cancel", "/ctask stop " + taskName)));
 
-            return 0;
+            return Command.SINGLE_SUCCESS;
         } else {
             List<? extends Entity> entities = selector.getEntities(source);
 

src/main/java/net/earthcomputer/clientcommands/command/FindItemCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
 import net.earthcomputer.clientcommands.GuiBlocker;
@@ -82,7 +83,7 @@ private static int findItem(CommandContext<FabricClientCommandSource> ctx, boole
             ctx.getSource().sendFeedback(Text.translatable("commands.cfinditem.starting", item.getLeft()));
         }
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static class FindItemsTask extends SimpleTask {

src/main/java/net/earthcomputer/clientcommands/command/FovCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -26,7 +27,7 @@ private static int setFov(FabricClientCommandSource source, int fov) {
         Text feedback = Text.translatable("commands.cfov.success", fov);
         source.sendFeedback(feedback);
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/GammaCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -22,7 +23,7 @@ private static int setGamma(FabricClientCommandSource source, double gamma) {
         Text feedback = Text.translatable("commands.cgamma.success", gamma);
         source.sendFeedback(feedback);
 
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
 }

src/main/java/net/earthcomputer/clientcommands/command/GetDataCommand.java

@@ -1,6 +1,7 @@
 package net.earthcomputer.clientcommands.command;
 
 import com.google.common.collect.ImmutableList;
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -78,7 +79,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
 
     private static int getData(FabricClientCommandSource source, DataCommandObject dataObj) throws CommandSyntaxException {
         source.sendFeedback(dataObj.feedbackQuery(dataObj.getNbt()));
-        return 1;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static int getData(FabricClientCommandSource source, DataCommandObject dataObj, NbtPath path) throws CommandSyntaxException {

src/main/java/net/earthcomputer/clientcommands/command/GhostBlockCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -42,7 +43,7 @@ private static int setGhostBlock(FabricClientCommandSource source, BlockPos pos,
         boolean result = world.setBlockState(pos, state, 18);
         if (result) {
             source.sendFeedback(Text.translatable("commands.cghostblock.set.success"));
-            return 1;
+            return Command.SINGLE_SUCCESS;
         } else {
             throw SET_FAILED_EXCEPTION.create();
         }

src/main/java/net/earthcomputer/clientcommands/command/GlowCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -102,7 +103,7 @@ protected void onTick() {
                     .append(" ")
                     .append(getCommandTextComponent("commands.client.cancel", "/ctask stop " + taskName)));
 
-            return 0;
+            return Command.SINGLE_SUCCESS;
         } else {
             List<? extends Entity> entities = entitySelector.getEntities(source);
             if (entities.isEmpty()) {

src/main/java/net/earthcomputer/clientcommands/command/HotbarCommand.java

@@ -1,5 +1,6 @@
 package net.earthcomputer.clientcommands.command;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
@@ -45,7 +46,7 @@ private static int save(FabricClientCommandSource source, int index) {
         Text hotbarKey = client.options.hotbarKeys[index - 1].getBoundKeyLocalizedText();
 
         source.sendFeedback(Text.translatable("inventory.hotbarSaved", loadKey, hotbarKey));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 
     private static int restore(FabricClientCommandSource source, int index) throws CommandSyntaxException {
@@ -69,6 +70,6 @@ private static int restore(FabricClientCommandSource source, int index) throws C
         player.playerScreenHandler.sendContentUpdates();
 
         source.sendFeedback(Text.translatable("commands.chotbar.restoredHotbar", index));
-        return 0;
+        return Command.SINGLE_SUCCESS;
     }
 }