Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-11-17 05:20:14 +01:00
Replacement of some deprecated method (#672)
- PlainComponentSerializer -> PlainTextComponentSerializer - BinaryTagHolder#of -> BinaryTagHolder#binaryTagHolder
Dieser Commit ist enthalten in:
Ursprung
9f77431f36
Commit
9fc4341f40
@ -10,7 +10,8 @@ package com.velocitypowered.api.event;
|
|||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
|
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
|
||||||
|
|
||||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -109,7 +110,7 @@ public interface ResultedEvent<R extends ResultedEvent.Result> {
|
|||||||
return "allowed";
|
return "allowed";
|
||||||
}
|
}
|
||||||
if (reason != null) {
|
if (reason != null) {
|
||||||
return "denied: " + PlainComponentSerializer.plain().serialize(reason);
|
return "denied: " + PlainTextComponentSerializer.plainText().serialize(reason);
|
||||||
}
|
}
|
||||||
return "denied";
|
return "denied";
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
|
|||||||
logger.error("Encountered an I/O error whilst loading translations", e);
|
logger.error("Encountered an I/O error whilst loading translations", e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GlobalTranslator.get().addSource(translationRegistry);
|
GlobalTranslator.translator().addSource(translationRegistry);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressFBWarnings("DM_EXIT")
|
@SuppressFBWarnings("DM_EXIT")
|
||||||
|
@ -92,11 +92,13 @@ import net.kyori.adventure.platform.facet.FacetPointers;
|
|||||||
import net.kyori.adventure.platform.facet.FacetPointers.Type;
|
import net.kyori.adventure.platform.facet.FacetPointers.Type;
|
||||||
import net.kyori.adventure.pointer.Pointers;
|
import net.kyori.adventure.pointer.Pointers;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
|
import net.kyori.adventure.text.KeybindComponent;
|
||||||
import net.kyori.adventure.text.TranslatableComponent;
|
import net.kyori.adventure.text.TranslatableComponent;
|
||||||
|
import net.kyori.adventure.text.flattener.ComponentFlattener;
|
||||||
import net.kyori.adventure.text.format.NamedTextColor;
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
|
||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||||
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
|
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
|
||||||
import net.kyori.adventure.title.Title.Times;
|
import net.kyori.adventure.title.Title.Times;
|
||||||
import net.kyori.adventure.title.TitlePart;
|
import net.kyori.adventure.title.TitlePart;
|
||||||
import net.kyori.adventure.translation.GlobalTranslator;
|
import net.kyori.adventure.translation.GlobalTranslator;
|
||||||
@ -110,8 +112,12 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
|
public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
|
||||||
|
|
||||||
private static final int MAX_PLUGIN_CHANNELS = 1024;
|
private static final int MAX_PLUGIN_CHANNELS = 1024;
|
||||||
private static final PlainComponentSerializer PASS_THRU_TRANSLATE = new PlainComponentSerializer(
|
private static final PlainTextComponentSerializer PASS_THRU_TRANSLATE = PlainTextComponentSerializer.builder()
|
||||||
c -> "", TranslatableComponent::key);
|
.flattener(ComponentFlattener.basic().toBuilder()
|
||||||
|
.mapper(KeybindComponent.class, c -> "")
|
||||||
|
.mapper(TranslatableComponent.class, TranslatableComponent::key)
|
||||||
|
.build())
|
||||||
|
.build();
|
||||||
static final PermissionProvider DEFAULT_PERMISSIONS = s -> PermissionFunction.ALWAYS_UNDEFINED;
|
static final PermissionProvider DEFAULT_PERMISSIONS = s -> PermissionFunction.ALWAYS_UNDEFINED;
|
||||||
|
|
||||||
private static final Logger logger = LogManager.getLogger(ConnectedPlayer.class);
|
private static final Logger logger = LogManager.getLogger(ConnectedPlayer.class);
|
||||||
|
@ -45,7 +45,8 @@ import java.util.List;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
|
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
public class GS4QueryHandler extends SimpleChannelInboundHandler<DatagramPacket> {
|
public class GS4QueryHandler extends SimpleChannelInboundHandler<DatagramPacket> {
|
||||||
@ -83,7 +84,7 @@ public class GS4QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
|
|||||||
|
|
||||||
private QueryResponse createInitialResponse() {
|
private QueryResponse createInitialResponse() {
|
||||||
return QueryResponse.builder()
|
return QueryResponse.builder()
|
||||||
.hostname(PlainComponentSerializer.plain().serialize(server.getConfiguration().getMotd()))
|
.hostname(PlainTextComponentSerializer.plainText().serialize(server.getConfiguration().getMotd()))
|
||||||
.gameVersion(ProtocolVersion.SUPPORTED_VERSION_STRING)
|
.gameVersion(ProtocolVersion.SUPPORTED_VERSION_STRING)
|
||||||
.map(server.getConfiguration().getQueryMap())
|
.map(server.getConfiguration().getQueryMap())
|
||||||
.currentPlayers(server.getPlayerCount())
|
.currentPlayers(server.getPlayerCount())
|
||||||
|
@ -23,7 +23,7 @@ import com.velocitypowered.api.proxy.server.ServerPing.Players;
|
|||||||
import com.velocitypowered.proxy.protocol.packet.legacyping.LegacyMinecraftPingVersion;
|
import com.velocitypowered.proxy.protocol.packet.legacyping.LegacyMinecraftPingVersion;
|
||||||
import net.kyori.adventure.text.TextComponent;
|
import net.kyori.adventure.text.TextComponent;
|
||||||
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
||||||
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
|
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
|
||||||
|
|
||||||
public class LegacyDisconnect {
|
public class LegacyDisconnect {
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ public class LegacyDisconnect {
|
|||||||
// remove all section symbols, along with fetching just the first line of an (unformatted)
|
// remove all section symbols, along with fetching just the first line of an (unformatted)
|
||||||
// MOTD.
|
// MOTD.
|
||||||
return new LegacyDisconnect(String.join(LEGACY_COLOR_CODE,
|
return new LegacyDisconnect(String.join(LEGACY_COLOR_CODE,
|
||||||
cleanSectionSymbol(getFirstLine(PlainComponentSerializer.plain().serialize(
|
cleanSectionSymbol(getFirstLine(PlainTextComponentSerializer.plainText().serialize(
|
||||||
response.getDescriptionComponent()))),
|
response.getDescriptionComponent()))),
|
||||||
Integer.toString(players.getOnline()),
|
Integer.toString(players.getOnline()),
|
||||||
Integer.toString(players.getMax())));
|
Integer.toString(players.getMax())));
|
||||||
|
@ -29,7 +29,7 @@ import net.kyori.adventure.text.event.HoverEvent;
|
|||||||
import net.kyori.adventure.text.event.HoverEvent.ShowEntity;
|
import net.kyori.adventure.text.event.HoverEvent.ShowEntity;
|
||||||
import net.kyori.adventure.text.event.HoverEvent.ShowItem;
|
import net.kyori.adventure.text.event.HoverEvent.ShowItem;
|
||||||
import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
|
import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
|
||||||
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
|
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
|
||||||
import net.kyori.adventure.util.Codec.Decoder;
|
import net.kyori.adventure.util.Codec.Decoder;
|
||||||
import net.kyori.adventure.util.Codec.Encoder;
|
import net.kyori.adventure.util.Codec.Encoder;
|
||||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||||
@ -54,7 +54,7 @@ public class VelocityLegacyHoverEventSerializer implements LegacyHoverEventSeria
|
|||||||
@Override
|
@Override
|
||||||
public HoverEvent.@NonNull ShowItem deserializeShowItem(@NonNull Component input)
|
public HoverEvent.@NonNull ShowItem deserializeShowItem(@NonNull Component input)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
String snbt = PlainComponentSerializer.plain().serialize(input);
|
String snbt = PlainTextComponentSerializer.plainText().serialize(input);
|
||||||
CompoundBinaryTag item = TagStringIO.get().asCompound(snbt);
|
CompoundBinaryTag item = TagStringIO.get().asCompound(snbt);
|
||||||
|
|
||||||
Key key;
|
Key key;
|
||||||
@ -66,13 +66,13 @@ public class VelocityLegacyHoverEventSerializer implements LegacyHoverEventSeria
|
|||||||
}
|
}
|
||||||
|
|
||||||
byte count = item.getByte("Count", (byte) 1);
|
byte count = item.getByte("Count", (byte) 1);
|
||||||
return ShowItem.of(key, count, BinaryTagHolder.of(snbt));
|
return ShowItem.of(key, count, BinaryTagHolder.binaryTagHolder(snbt));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public HoverEvent.@NonNull ShowEntity deserializeShowEntity(@NonNull Component input,
|
public HoverEvent.@NonNull ShowEntity deserializeShowEntity(@NonNull Component input,
|
||||||
Decoder<Component, String, ? extends RuntimeException> componentDecoder) throws IOException {
|
Decoder<Component, String, ? extends RuntimeException> componentDecoder) throws IOException {
|
||||||
String snbt = PlainComponentSerializer.plain().serialize(input);
|
String snbt = PlainTextComponentSerializer.plainText().serialize(input);
|
||||||
CompoundBinaryTag item = TagStringIO.get().asCompound(snbt);
|
CompoundBinaryTag item = TagStringIO.get().asCompound(snbt);
|
||||||
|
|
||||||
Component name;
|
Component name;
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren