+19
-4
@@ -84,6 +84,7 @@ import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket;
|
||||
import com.velocitypowered.proxy.protocol.packet.RemoveResourcePackPacket;
|
||||
import com.velocitypowered.proxy.protocol.packet.TransferPacket;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.ChatQueue;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.ChatType;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.PlayerChatCompletionPacket;
|
||||
import com.velocitypowered.proxy.protocol.packet.chat.builder.ChatBuilderFactory;
|
||||
@@ -118,6 +119,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CompletionException;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import net.kyori.adventure.audience.MessageType;
|
||||
import net.kyori.adventure.bossbar.BossBar;
|
||||
import net.kyori.adventure.identity.Identity;
|
||||
import net.kyori.adventure.key.Key;
|
||||
@@ -423,16 +425,29 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(final @NonNull Component message) {
|
||||
Preconditions.checkNotNull(message, "message");
|
||||
public void sendMessage(@NonNull Identity identity, @NonNull Component message) {
|
||||
final Component translated = translateMessage(message);
|
||||
|
||||
connection.write(getChatBuilderFactory().builder()
|
||||
.component(translated).toClient());
|
||||
.component(translated).forIdentity(identity).toClient());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendActionBar(@NonNull Component message) {
|
||||
public void sendMessage(@NonNull Identity identity, @NonNull Component message,
|
||||
@NonNull MessageType type) {
|
||||
Preconditions.checkNotNull(message, "message");
|
||||
Preconditions.checkNotNull(type, "type");
|
||||
|
||||
Component translated = translateMessage(message);
|
||||
|
||||
connection.write(getChatBuilderFactory().builder()
|
||||
.component(translated).forIdentity(identity)
|
||||
.setType(type == MessageType.CHAT ? ChatType.CHAT : ChatType.SYSTEM)
|
||||
.toClient());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendActionBar(net.kyori.adventure.text.@NonNull Component message) {
|
||||
Component translated = translateMessage(message);
|
||||
|
||||
ProtocolVersion playerVersion = getProtocolVersion();
|
||||
|
||||
@@ -28,6 +28,7 @@ import com.velocitypowered.proxy.util.ClosestLocaleMatcher;
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import net.kyori.adventure.audience.MessageType;
|
||||
import net.kyori.adventure.identity.Identity;
|
||||
import net.kyori.adventure.permission.PermissionChecker;
|
||||
import net.kyori.adventure.platform.facet.FacetPointers;
|
||||
@@ -72,7 +73,8 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Cons
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendMessage(@NonNull Component message) {
|
||||
public void sendMessage(@NonNull Identity identity, @NonNull Component message,
|
||||
@NonNull MessageType messageType) {
|
||||
componentLogger.info(message);
|
||||
}
|
||||
|
||||
|
||||
@@ -60,6 +60,7 @@ public enum ProtocolUtils {
|
||||
|
||||
private static final GsonComponentSerializer PRE_1_16_SERIALIZER =
|
||||
GsonComponentSerializer.builder()
|
||||
.downsampleColors()
|
||||
.legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
|
||||
.options(
|
||||
OptionSchema.globalSchema().stateBuilder()
|
||||
|
||||
Reference in New Issue
Block a user