SteamWar/Velocity
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev/3.0.0'

Browse Source
This commit is contained in:
Lixfel
2024-12-06 11:14:27 +01:00
parent b89a5c5ce9 965db127a9
commit 19e51a2b12
12 changed files with 140 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
api/src/main/java/com/velocitypowered/api/event/command/CommandExecuteEvent.java
View File

@ -26,6 +26,7 @@ public final class CommandExecuteEvent implements ResultedEvent<CommandResult> {
private final CommandSource commandSource;
private final String command;
private CommandResult result;
private InvocationInfo invocationInfo;
/**
* Constructs a CommandExecuteEvent.
@ -34,9 +35,21 @@ public final class CommandExecuteEvent implements ResultedEvent<CommandResult> {
* @param command the command being executed without first slash
*/
public CommandExecuteEvent(CommandSource commandSource, String command) {
this(commandSource, command, new InvocationInfo(SignedState.UNSUPPORTED, Source.API));
}
/**
* Constructs a CommandExecuteEvent.
*
* @param commandSource the source executing the command
* @param command the command being executed without first slash
* @param invocationInfo the invocation info of this command
*/
public CommandExecuteEvent(CommandSource commandSource, String command, InvocationInfo invocationInfo) {
this.commandSource = Preconditions.checkNotNull(commandSource, "commandSource");
this.command = Preconditions.checkNotNull(command, "command");
this.result = CommandResult.allowed();
this.invocationInfo = invocationInfo;
}
/**
@ -61,6 +74,16 @@ public final class CommandExecuteEvent implements ResultedEvent<CommandResult> {
return command;
}
/**
* Returns the info of the command invocation.
*
* @since 3.4.0
* @return invocation info
*/
public InvocationInfo getInvocationInfo() {
return this.invocationInfo;
}
@Override
public CommandResult getResult() {
return result;
@ -80,6 +103,75 @@ public final class CommandExecuteEvent implements ResultedEvent<CommandResult> {
+ '}';
}
/**
* Represents information about a command invocation, including its signed state and source.
*
* @since 3.4.0
*/
public record InvocationInfo(SignedState signedState, Source source) {
}
/**
* Represents the signed state of a command invocation.
*
* @since 3.4.0
*/
public enum SignedState {
/**
* Indicates that the command was executed from a signed source with signed message arguments,
* This is currently only possible by typing a command in chat with signed arguments.
*
* <p><b>Note:</b> Cancelling the {@link CommandExecuteEvent} in this state will result in the player being kicked.</p>
*
* @since 3.4.0
*/
SIGNED_WITH_ARGS,
/**
* Indicates that the command was executed from an signed source with no signed message arguments,
* This is currently only possible by typing a command in chat.
*
* @since 3.4.0
*/
SIGNED_WITHOUT_ARGS,
/**
* Indicates that the command was executed from an unsigned source,
* such as clicking on a component with a {@link net.kyori.adventure.text.event.ClickEvent.Action#RUN_COMMAND}.
*
* <p>Clients running version 1.20.5 or later will send this state.</p>
*
* @since 3.4.0
*/
UNSIGNED,
/**
* Indicates that the command invocation does not support signing.
*
* <p>This state is sent by clients running versions prior to 1.19.3.</p>
*
* @since 3.4.0
*/
UNSUPPORTED
}
/**
* Represents the source of a command invocation.
*
* @since 3.4.0
*/
public enum Source {
/**
* Indicates that the command was invoked by a player.
*
* @since 3.4.0
*/
PLAYER,
/**
* Indicates that the command was invoked programmatically through an API call.
*
* @since 3.4.0
*/
API
}
/**
* Represents the result of the {@link CommandExecuteEvent}.
*/

3
api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
View File

@ -88,7 +88,8 @@ public enum ProtocolVersion implements Ordered<ProtocolVersion> {
MINECRAFT_1_20_3(765, "1.20.3", "1.20.4"),
MINECRAFT_1_20_5(766, "1.20.5", "1.20.6"),
MINECRAFT_1_21(767, "1.21", "1.21.1"),
MINECRAFT_1_21_2(768, "1.21.2", "1.21.3");
MINECRAFT_1_21_2(768, "1.21.2", "1.21.3"),
MINECRAFT_1_21_4(769, "1.21.4");
private static final int SNAPSHOT_BIT = 30;

2
proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
View File

@ -253,7 +253,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
commandManager.metaBuilder(callbackCommand)
.plugin(VelocityVirtualPlugin.INSTANCE)
.build(),
velocityParentCommand
callbackCommand
);
final BrigadierCommand serverCommand = ServerCommand.create(this);
commandManager.register(

12
proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java
View File

@ -218,13 +218,14 @@ public class VelocityCommandManager implements CommandManager {
*
* @param source the source to execute the command for
* @param cmdLine the command to execute
* @param invocationInfo the invocation info
* @return the {@link CompletableFuture} of the event
*/
public CompletableFuture<CommandExecuteEvent> callCommandEvent(final CommandSource source,
final String cmdLine) {
final String cmdLine, final CommandExecuteEvent.InvocationInfo invocationInfo) {
Preconditions.checkNotNull(source, "source");
Preconditions.checkNotNull(cmdLine, "cmdLine");
return eventManager.fire(new CommandExecuteEvent(source, cmdLine));
return eventManager.fire(new CommandExecuteEvent(source, cmdLine, invocationInfo));
}
private boolean executeImmediately0(final CommandSource source, final ParseResults<CommandSource> parsed) {
@ -266,7 +267,12 @@ public class VelocityCommandManager implements CommandManager {
Preconditions.checkNotNull(source, "source");
Preconditions.checkNotNull(cmdLine, "cmdLine");
return callCommandEvent(source, cmdLine).thenComposeAsync(event -> {
CommandExecuteEvent.InvocationInfo invocationInfo = new CommandExecuteEvent.InvocationInfo(
CommandExecuteEvent.SignedState.UNSUPPORTED,
CommandExecuteEvent.Source.API
);
return callCommandEvent(source, cmdLine, invocationInfo).thenComposeAsync(event -> {
CommandExecuteEvent.CommandResult commandResult = event.getResult();
if (commandResult.isForwardToServer() || !commandResult.isAllowed()) {
return CompletableFuture.completedFuture(false);

4
proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
View File

@ -38,6 +38,7 @@ import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_20_3;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_20_5;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_21;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_21_2;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_21_4;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_7_2;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_8;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9;
@ -359,7 +360,8 @@ public enum StateRegistry {
map(0x27, MINECRAFT_1_20_2, false),
map(0x28, MINECRAFT_1_20_3, false),
map(0x2B, MINECRAFT_1_20_5, false),
map(0x2D, MINECRAFT_1_21_2, false));
map(0x2D, MINECRAFT_1_21_2, false),
map(0x2F, MINECRAFT_1_21_4, false));
serverbound.register(
FinishedUpdatePacket.class, () -> FinishedUpdatePacket.INSTANCE,
map(0x0B, MINECRAFT_1_20_2, false),

14
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/UpsertPlayerInfoPacket.java
View File

@ -193,6 +193,11 @@ public class UpsertPlayerInfoPacket implements MinecraftPacket {
info.listOrder = ProtocolUtils.readVarInt(buf);
}, (version, buf, info) -> { // write
ProtocolUtils.writeVarInt(buf, info.listOrder);
}),
UPDATE_HAT((version, buf, info) -> { // read
info.showHat = buf.readBoolean();
}, (version, buf, info) -> { // write
buf.writeBoolean(info.showHat);
});
private final Read read;
@ -223,6 +228,7 @@ public class UpsertPlayerInfoPacket implements MinecraftPacket {
private int gameMode;
@Nullable
private ComponentHolder displayName;
private boolean showHat;
private int listOrder;
@Nullable
private RemoteChatSession chatSession;
@ -256,6 +262,10 @@ public class UpsertPlayerInfoPacket implements MinecraftPacket {
return displayName;
}
public boolean isShowHat() {
return showHat;
}
public int getListOrder() {
return listOrder;
}
@ -285,6 +295,10 @@ public class UpsertPlayerInfoPacket implements MinecraftPacket {
this.displayName = displayName;
}
public void setShowHat(boolean showHat) {
this.showHat = showHat;
}
public void setListOrder(int listOrder) {
this.listOrder = listOrder;
}

6
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/CommandHandler.java
View File

@ -56,8 +56,10 @@ public interface CommandHandler<T extends MinecraftPacket> {
default void queueCommandResult(VelocityServer server, ConnectedPlayer player,
BiFunction<CommandExecuteEvent, LastSeenMessages, CompletableFuture<MinecraftPacket>> futurePacketCreator,
String message, Instant timestamp, @Nullable LastSeenMessages lastSeenMessages) {
CompletableFuture<CommandExecuteEvent> eventFuture = server.getCommandManager().callCommandEvent(player, message);
String message, Instant timestamp, @Nullable LastSeenMessages lastSeenMessages,
CommandExecuteEvent.InvocationInfo invocationInfo) {
CompletableFuture<CommandExecuteEvent> eventFuture = server.getCommandManager().callCommandEvent(player, message,
invocationInfo);
player.getChatQueue().queuePacket(
newLastSeenMessages -> eventFuture
.thenComposeAsync(event -> futurePacketCreator.apply(event, newLastSeenMessages))

2
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/keyed/KeyedCommandHandler.java
View File

@ -111,6 +111,6 @@ public class KeyedCommandHandler implements CommandHandler<KeyedPlayerCommandPac
}
return null;
});
}, packet.getCommand(), packet.getTimestamp(), null);
}, packet.getCommand(), packet.getTimestamp(), null, new CommandExecuteEvent.InvocationInfo(CommandExecuteEvent.SignedState.UNSUPPORTED, CommandExecuteEvent.Source.PLAYER));
}
}

2
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/legacy/LegacyCommandHandler.java
View File

@ -62,6 +62,6 @@ public class LegacyCommandHandler implements CommandHandler<LegacyChatPacket> {
}
return null;
});
}, command, Instant.now(), null);
}, command, Instant.now(), null, new CommandExecuteEvent.InvocationInfo(CommandExecuteEvent.SignedState.UNSUPPORTED, CommandExecuteEvent.Source.PLAYER));
}
}

3
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/session/SessionCommandHandler.java
View File

@ -117,6 +117,7 @@ public class SessionCommandHandler implements CommandHandler<SessionPlayerComman
}
return forwardCommand(fixedPacket, commandToRun);
});
}, packet.command, packet.timeStamp, packet.lastSeenMessages);
}, packet.command, packet.timeStamp, packet.lastSeenMessages,
new CommandExecuteEvent.InvocationInfo(packet.getEventSignedState(), CommandExecuteEvent.Source.PLAYER));
}
}

5
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/session/SessionPlayerCommandPacket.java
View File

@ -18,6 +18,7 @@
package com.velocitypowered.proxy.protocol.packet.chat.session;
import com.google.common.collect.Lists;
import com.velocitypowered.api.event.command.CommandExecuteEvent;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
import com.velocitypowered.proxy.protocol.MinecraftPacket;
@ -70,6 +71,10 @@ public class SessionPlayerCommandPacket implements MinecraftPacket {
return !argumentSignatures.isEmpty();
}
public CommandExecuteEvent.SignedState getEventSignedState() {
return !this.argumentSignatures.isEmpty() ? CommandExecuteEvent.SignedState.SIGNED_WITH_ARGS : CommandExecuteEvent.SignedState.SIGNED_WITHOUT_ARGS;
}
@Override
public boolean handle(MinecraftSessionHandler handler) {
return handler.handle(this);

6
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/session/UnsignedPlayerCommandPacket.java
View File

@ -17,6 +17,7 @@
package com.velocitypowered.proxy.protocol.packet.chat.session;
import com.velocitypowered.api.event.command.CommandExecuteEvent;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.proxy.protocol.ProtocolUtils;
import com.velocitypowered.proxy.protocol.packet.chat.LastSeenMessages;
@ -44,6 +45,11 @@ public class UnsignedPlayerCommandPacket extends SessionPlayerCommandPacket {
return false;
}
@Override
public CommandExecuteEvent.SignedState getEventSignedState() {
return CommandExecuteEvent.SignedState.UNSIGNED;
}
@Override
public String toString() {
return "UnsignedPlayerCommandPacket{" +