From cbf9414558c08c914a5c7568e1fcbe267de6f853 Mon Sep 17 00:00:00 2001 From: Space Walker Date: Fri, 13 Nov 2026 20:22:59 +0100 Subject: [PATCH] [commands] make client help command separate from server help --- .../commands/impl/client/ClientCommandsImpl.java | 2 +- .../{api => impl}/client/command/HelpCommand.java | 13 ++++++++++--- .../commands/impl/client/ClientCommandsImpl.java | 2 +- .../{api => impl}/client/command/HelpCommand.java | 13 ++++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) rename libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/{api => impl}/client/command/HelpCommand.java (80%) rename libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/{api => impl}/client/command/HelpCommand.java (80%) diff --git a/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java b/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java index a56f6ddb6..8945af849 100644 --- a/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java +++ b/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java @@ -15,9 +15,9 @@ import net.ornithemc.osl.commands.api.client.ClientCommandEvents; import net.ornithemc.osl.commands.api.client.ClientCommands; import net.ornithemc.osl.commands.api.client.command.ClientCommandSource; -import net.ornithemc.osl.commands.api.client.command.HelpCommand; import net.ornithemc.osl.commands.api.command.SharedSuggestionProvider; import net.ornithemc.osl.commands.impl.BrigadierCommandsImpl; +import net.ornithemc.osl.commands.impl.client.command.HelpCommand; public final class ClientCommandsImpl { diff --git a/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java b/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java similarity index 80% rename from libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java rename to libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java index 6a15e5bd3..98a25c85f 100644 --- a/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java +++ b/libraries/commands/commands-mc14w28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java @@ -1,4 +1,4 @@ -package net.ornithemc.osl.commands.api.client.command; +package net.ornithemc.osl.commands.impl.client.command; import java.util.List; import java.util.Map; @@ -16,6 +16,7 @@ import com.mojang.brigadier.tree.CommandNode; import net.ornithemc.osl.commands.api.client.ClientCommands; +import net.ornithemc.osl.commands.api.client.command.ClientCommandSource; import net.ornithemc.osl.text.api.TextComponents; public final class HelpCommand { @@ -23,14 +24,20 @@ public final class HelpCommand { private static final SimpleCommandExceptionType ERROR_FAILED = new SimpleCommandExceptionType(TextComponents.translatable("commands.help.failed")); public static void register(CommandDispatcher dispatcher) { - LiteralArgumentBuilder command = ClientCommands + LiteralArgumentBuilder mainCommand = ClientCommands + .literal("osl-client-commands"); + LiteralArgumentBuilder shortCommand = ClientCommands + .literal("occ"); + + LiteralArgumentBuilder help = ClientCommands .literal("help") .executes(HelpCommand::giveHelp) .then(ClientCommands .argument("command", StringArgumentType.greedyString()) .executes(HelpCommand::giveCommandHelp)); - dispatcher.register(command); + CommandNode command = dispatcher.register(mainCommand.then(help)); + dispatcher.register(shortCommand.redirect(command)); } private static int giveHelp(CommandContext ctx) { diff --git a/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java b/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java index 4fbe4c979..df0586745 100644 --- a/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java +++ b/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java @@ -18,7 +18,7 @@ import net.ornithemc.osl.commands.api.client.ClientCommandEvents; import net.ornithemc.osl.commands.api.client.ClientCommands; import net.ornithemc.osl.commands.api.client.command.ClientCommandSource; -import net.ornithemc.osl.commands.api.client.command.HelpCommand; +import net.ornithemc.osl.commands.impl.client.command.HelpCommand; import net.ornithemc.osl.text.api.ClickEvent; import net.ornithemc.osl.text.api.HoverEvent; import net.ornithemc.osl.text.api.TextColor; diff --git a/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java b/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java similarity index 80% rename from libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java rename to libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java index ad75bf20b..d270fbddf 100644 --- a/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/api/client/command/HelpCommand.java +++ b/libraries/commands/commands-mc17w45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/command/HelpCommand.java @@ -1,4 +1,4 @@ -package net.ornithemc.osl.commands.api.client.command; +package net.ornithemc.osl.commands.impl.client.command; import java.util.Map; @@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.CommandNode; import net.ornithemc.osl.commands.api.client.ClientCommands; +import net.ornithemc.osl.commands.api.client.command.ClientCommandSource; import net.ornithemc.osl.text.api.TextComponents; public final class HelpCommand { @@ -22,14 +23,20 @@ public final class HelpCommand { private static final SimpleCommandExceptionType ERROR_FAILED = new SimpleCommandExceptionType(TextComponents.translatable("commands.help.failed")); public static void register(CommandDispatcher dispatcher) { - LiteralArgumentBuilder command = ClientCommands + LiteralArgumentBuilder mainCommand = ClientCommands + .literal("osl-client-commands"); + LiteralArgumentBuilder shortCommand = ClientCommands + .literal("occ"); + + LiteralArgumentBuilder help = ClientCommands .literal("help") .executes(HelpCommand::giveHelp) .then(ClientCommands .argument("command", StringArgumentType.greedyString()) .executes(HelpCommand::giveCommandHelp)); - dispatcher.register(command); + CommandNode command = dispatcher.register(mainCommand.then(help)); + dispatcher.register(shortCommand.redirect(command)); } private static int giveHelp(CommandContext ctx) {