Skip to content

[Commands] Separate client help command from server help command #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpaceWalkerRS wants to merge 1 commit into
base: gen2
Choose a base branch
from
Open

[Commands] Separate client help command from server help command #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...28a-mc1.12.2/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
13 changes: 10 additions & 3 deletions ...mands/api/client/command/HelpCommand.java → ...ands/impl/client/command/HelpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -16,21 +16,28 @@
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 {

private static final SimpleCommandExceptionType ERROR_FAILED = new SimpleCommandExceptionType(TextComponents.translatable("commands.help.failed"));

public static void register(CommandDispatcher<ClientCommandSource> dispatcher) {
LiteralArgumentBuilder<ClientCommandSource> command = ClientCommands
LiteralArgumentBuilder<ClientCommandSource> mainCommand = ClientCommands
.literal("osl-client-commands");
LiteralArgumentBuilder<ClientCommandSource> shortCommand = ClientCommands
.literal("occ");

LiteralArgumentBuilder<ClientCommandSource> help = ClientCommands
.literal("help")
.executes(HelpCommand::giveHelp)
.then(ClientCommands
.argument("command", StringArgumentType.greedyString())
.executes(HelpCommand::giveCommandHelp));

dispatcher.register(command);
CommandNode<ClientCommandSource> command = dispatcher.register(mainCommand.then(help));
dispatcher.register(shortCommand.redirect(command));
}

private static int giveHelp(CommandContext<ClientCommandSource> ctx) {
Expand Down
2 changes: 1 addition & 1 deletion ...45a-mc1.14.4/src/main/java/net/ornithemc/osl/commands/impl/client/ClientCommandsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 10 additions & 3 deletions ...mands/api/client/command/HelpCommand.java → ...ands/impl/client/command/HelpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.ornithemc.osl.commands.api.client.command;
package net.ornithemc.osl.commands.impl.client.command;

import java.util.Map;

Expand All @@ -15,21 +15,28 @@
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 {

private static final SimpleCommandExceptionType ERROR_FAILED = new SimpleCommandExceptionType(TextComponents.translatable("commands.help.failed"));

public static void register(CommandDispatcher<ClientCommandSource> dispatcher) {
LiteralArgumentBuilder<ClientCommandSource> command = ClientCommands
LiteralArgumentBuilder<ClientCommandSource> mainCommand = ClientCommands
.literal("osl-client-commands");
LiteralArgumentBuilder<ClientCommandSource> shortCommand = ClientCommands
.literal("occ");

LiteralArgumentBuilder<ClientCommandSource> help = ClientCommands
.literal("help")
.executes(HelpCommand::giveHelp)
.then(ClientCommands
.argument("command", StringArgumentType.greedyString())
.executes(HelpCommand::giveCommandHelp));

dispatcher.register(command);
CommandNode<ClientCommandSource> command = dispatcher.register(mainCommand.then(help));
dispatcher.register(shortCommand.redirect(command));
}

private static int giveHelp(CommandContext<ClientCommandSource> ctx) {
Expand Down
Loading