FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-26 17:46:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Update client commands to reflect 22w19a changes (#2217)

Browse source
This commit is contained in:
apple502j 2022-05-15 21:10:34 +09:00 committed by GitHub
parent 55e82473ab
commit 839472dc27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fabric-command-api-v1/src/main/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java
View file

@ -53,56 +53,49 @@ import net.fabricmc.fabric.mixin.command.HelpCommandAccessor;
@Environment(EnvType.CLIENT)
public final class ClientCommandInternals {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientCommandInternals.class);
private static final char PREFIX = '/';
private static final String API_COMMAND_NAME = "fabric-command-api-v1:client";
private static final String SHORT_API_COMMAND_NAME = "fcc";
/**
* Executes a client-sided command from a message.
* Executes a client-sided command. Callers should ensure that this is only called
* on slash-prefixed messages and the slash needs to be removed before calling.
* (This is the same requirement as {@code ClientPlayerEntity#sendCommand}.)
*
* @param message the command message
* @return true if the message should not be sent to the server, false otherwise
* @param command the command with slash removed
* @return true if the command should not be sent to the server, false otherwise
*/
public static boolean executeCommand(String message) {
if (message.isEmpty()) {
return false; // Nothing to process
}
if (message.charAt(0) != PREFIX) {
return false; // Incorrect prefix, won't execute anything.
}
public static boolean executeCommand(String command) {
MinecraftClient client = MinecraftClient.getInstance();
// The interface is implemented on ClientCommandSource with a mixin.
// noinspection ConstantConditions
FabricClientCommandSource commandSource = (FabricClientCommandSource) client.getNetworkHandler().getCommandSource();
client.getProfiler().push(message);
client.getProfiler().push(command);
try {
// TODO: Check for server commands before executing.
// This requires parsing the command, checking if they match a server command
// and then executing the command with the parse results.
DISPATCHER.execute(message.substring(1), commandSource);
DISPATCHER.execute(command, commandSource);
return true;
} catch (CommandSyntaxException e) {
boolean ignored = isIgnoredException(e.getType());
if (ignored) {
LOGGER.debug("Syntax exception for client-sided command '{}'", message, e);
LOGGER.debug("Syntax exception for client-sided command '{}'", command, e);
return false;
}
LOGGER.warn("Syntax exception for client-sided command '{}'", message, e);
LOGGER.warn("Syntax exception for client-sided command '{}'", command, e);
commandSource.sendError(getErrorMessage(e));
return true;
} catch (CommandException e) {
LOGGER.warn("Error while executing client-sided command '{}'", message, e);
LOGGER.warn("Error while executing client-sided command '{}'", command, e);
commandSource.sendError(e.getTextMessage());
return true;
} catch (RuntimeException e) {
LOGGER.warn("Error while executing client-sided command '{}'", message, e);
LOGGER.warn("Error while executing client-sided command '{}'", command, e);
commandSource.sendError(Text.of(e.getMessage()));
return true;
} finally {
@ -112,7 +105,7 @@ public final class ClientCommandInternals {
/**
* Tests whether a command syntax exception with the type
* should be ignored and the message sent to the server.
* should be ignored and the command sent to the server.
*
* @param type the exception type
* @return true if ignored, false otherwise

7
fabric-command-api-v1/src/main/java/net/fabricmc/fabric/mixin/command/client/ClientPlayerEntityMixin.java
View file

@ -22,14 +22,15 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.text.Text;
import net.fabricmc.fabric.impl.command.client.ClientCommandInternals;
@Mixin(ClientPlayerEntity.class)
abstract class ClientPlayerEntityMixin {
@Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
private void onSendChatMessage(String message, CallbackInfo info) {
if (ClientCommandInternals.executeCommand(message)) {
@Inject(method = "method_44098", at = @At("HEAD"), cancellable = true)
private void onSendCommand(String command, Text preview, CallbackInfo info) {
if (ClientCommandInternals.executeCommand(command)) {
info.cancel();
}
}