Formatting cleanup for dev/example/paper-command-registration

Author: willkroboth

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandAPIBukkit.java

@@ -444,12 +444,12 @@ public void preCommandRegistration(String commandName) {
 	public void postCommandRegistration(RegisteredCommand registeredCommand, LiteralCommandNode<Source> resultantNode, List<LiteralCommandNode<Source>> aliasNodes) {
 		commandRegistrationStrategy.postCommandRegistration(registeredCommand, resultantNode, aliasNodes);
 
-		if(!CommandAPI.canRegister()) {
+		if (!CommandAPI.canRegister()) {
 			// Adding the command to the help map usually happens in `CommandAPIBukkit#onEnable`
 			updateHelpForCommands(List.of(registeredCommand));
 
 			// Sending command dispatcher packets usually happens when Players join the server
-			for(Player p: Bukkit.getOnlinePlayers()) {
+			for (Player p : Bukkit.getOnlinePlayers()) {
 				p.updateCommands();
 			}
 		}
@@ -471,9 +471,9 @@ public void unregister(String commandName, boolean unregisterNamespaces) {
 	 *
 	 * @param commandName          the name of the command to unregister
 	 * @param unregisterNamespaces whether the unregistration system should attempt to remove versions of the
-	 *                                command that start with a namespace. E.g. `minecraft:command`, `bukkit:command`,
-	 *                                or `plugin:command`. If true, these namespaced versions of a command are also
-	 *                                unregistered.
+	 *                             command that start with a namespace. E.g. `minecraft:command`, `bukkit:command`,
+	 *                             or `plugin:command`. If true, these namespaced versions of a command are also
+	 *                             unregistered.
 	 * @param unregisterBukkit     whether the unregistration system should unregister Vanilla or Bukkit commands. If true,
 	 *                             only Bukkit commands are unregistered, otherwise only Vanilla commands are unregistered.
 	 *                             For the purposes of this parameter, commands registered using the CommandAPI are Vanilla
@@ -488,7 +488,7 @@ private void unregisterInternal(String commandName, boolean unregisterNamespaces
 
 		commandRegistrationStrategy.unregister(commandName, unregisterNamespaces, unregisterBukkit);
 
-		if(!CommandAPI.canRegister()) {
+		if (!CommandAPI.canRegister()) {
 			// Help topics (from Bukkit and CommandAPI) are only setup after plugins enable, so we only need to worry
 			//  about removing them once the server is loaded.
 			getHelpMap().remove("/" + commandName);
@@ -631,5 +631,4 @@ boolean isInvalidNamespace(String commandName, String namespace) {
 		}
 		return false;
 	}
-
 }

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/CommandRegistrationStrategy.java

@@ -32,7 +32,7 @@ public abstract class CommandRegistrationStrategy<Source> {
 
 	// Utility methods
 	protected void removeBrigadierCommands(CommandDispatcher<Source> dispatcher, String commandName,
-										boolean unregisterNamespaces, Predicate<CommandNode<Source>> extraCheck) {
+										   boolean unregisterNamespaces, Predicate<CommandNode<Source>> extraCheck) {
 		RootCommandNode<?> root = dispatcher.getRoot();
 		Map<String, CommandNode<Source>> children = (Map<String, CommandNode<Source>>) commandNodeChildren.get(root);
 		Map<String, CommandNode<Source>> literals = (Map<String, CommandNode<Source>>) commandNodeLiterals.get(root);
@@ -66,9 +66,9 @@ protected static <T> void removeCommandFromMapIfCheckPasses(Map<String, T> map,
 	}
 
 	protected static boolean isThisTheCommandButNamespaced(String commandName, String key) {
-		if(!key.contains(":")) return false;
+		if (!key.contains(":")) return false;
 		String[] split = key.split(":");
-		if(split.length < 2) return false;
+		if (split.length < 2) return false;
 		return split[1].equalsIgnoreCase(commandName);
 	}
 

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/SpigotCommandRegistration.java

@@ -124,7 +124,7 @@ private void fixPermissions() {
 				 * what are you doing and why?
 				 */
 				Command command = map.getCommand(cmdName);
-				if(command != null && commandAPIBukkit.isVanillaCommandWrapper(command)) {
+				if (command != null && commandAPIBukkit.isVanillaCommandWrapper(command)) {
 					command.setPermission(permNode);
 				}
 			}
@@ -135,7 +135,7 @@ private void fixPermissions() {
 	@Override
 	public void postCommandRegistration(RegisteredCommand registeredCommand, LiteralCommandNode<Source> resultantNode, List<LiteralCommandNode<Source>> aliasNodes) {
 
-		if(!CommandAPI.canRegister()) {
+		if (!CommandAPI.canRegister()) {
 			// Usually, when registering commands during server startup, we can just put our commands into the
 			// `net.minecraft.server.MinecraftServer#vanillaCommandDispatcher` and leave it. As the server finishes setup,
 			// it and the CommandAPI do some extra stuff to make everything work, and we move on.
@@ -250,7 +250,7 @@ private void fillNamespacesToFix(String... namespacedCommands) {
 			// and there is already a command with this name in the dispatcher
 			// then, the command currently in the dispatcher is supposed to appear as `minecraft:command`
 			CommandNode<Source> currentNode = brigadierDispatcher.getRoot().getChild(namespacedCommand);
-			if(currentNode != null) {
+			if (currentNode != null) {
 				// We'll keep track of everything that should be `minecraft:command` in
 				//  `minecraftCommandNamespaces` and fix this later in `#fixNamespaces`
 				// TODO: Ideally, we should be working without this cast to LiteralCommandNode. I don't know if this can fail
@@ -261,7 +261,7 @@ private void fillNamespacesToFix(String... namespacedCommands) {
 
 	@Override
 	public void unregister(String commandName, boolean unregisterNamespaces, boolean unregisterBukkit) {
-		if(!unregisterBukkit) {
+		if (!unregisterBukkit) {
 			// Remove nodes from the Vanilla dispatcher
 			// This dispatcher doesn't usually have namespaced version of commands (those are created when commands
 			//  are transferred to Bukkit's CommandMap), but if they ask, we'll do it
@@ -271,7 +271,7 @@ public void unregister(String commandName, boolean unregisterNamespaces, boolean
 			CommandAPIHandler.getInstance().writeDispatcherToFile();
 		}
 
-		if(unregisterBukkit || !CommandAPI.canRegister()) {
+		if (unregisterBukkit || !CommandAPI.canRegister()) {
 			// We need to remove commands from Bukkit's CommandMap if we're unregistering a Bukkit command, or
 			//  if we're unregistering after the server is enabled, because `CraftServer#setVanillaCommands` will have
 			//  moved the Vanilla command into the CommandMap
@@ -280,14 +280,14 @@ public void unregister(String commandName, boolean unregisterNamespaces, boolean
 			// If we are unregistering a Bukkit command, DO NOT unregister VanillaCommandWrappers
 			// If we are unregistering a Vanilla command, ONLY unregister VanillaCommandWrappers
 			boolean isMainVanilla = commandAPIBukkit.isVanillaCommandWrapper(knownCommands.get(commandName));
-			if(unregisterBukkit ^ isMainVanilla) knownCommands.remove(commandName);
+			if (unregisterBukkit ^ isMainVanilla) knownCommands.remove(commandName);
 
-			if(unregisterNamespaces) {
+			if (unregisterNamespaces) {
 				removeCommandNamespace(knownCommands, commandName, c -> unregisterBukkit ^ commandAPIBukkit.isVanillaCommandWrapper(c));
 			}
 		}
 
-		if(!CommandAPI.canRegister()) {
+		if (!CommandAPI.canRegister()) {
 			// If the server is enabled, we have extra cleanup to do
 
 			// Remove commands from the resources dispatcher