MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove AdventureCompact in favor of the text 3.x serializer added in KyoriPowered/adventure-platform#23

Browse Source
This commit is contained in:
Andrew Steinborn
2020-06-29 23:34:59 -04:00
parent 5b9dbb74c9
commit 5285a3c155
11 changed files with 40 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
View File

@@ -7,7 +7,6 @@ import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.velocitypowered.api.proxy.config.ProxyConfig;
import com.velocitypowered.api.util.AdventureCompat;
import com.velocitypowered.api.util.Favicon;
import com.velocitypowered.proxy.util.AddressUtil;
import java.io.IOException;
@@ -25,6 +24,7 @@ import java.util.Random;
import java.util.UUID;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.legacytext3.LegacyText3ComponentSerializer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@@ -230,7 +230,7 @@ public class VelocityConfiguration implements ProxyConfig {
*/
@Override
public net.kyori.text.Component getMotdComponent() {
return AdventureCompat.asOriginalTextComponent(this.getMotd());
return LegacyText3ComponentSerializer.get().serialize(this.getMotd());
}
@Override

4
proxy/src/main/java/com/velocitypowered/proxy/connection/util/ConnectionRequestResults.java
View File

@@ -3,12 +3,12 @@ package com.velocitypowered.proxy.connection.util;
import com.velocitypowered.api.proxy.ConnectionRequestBuilder;
import com.velocitypowered.api.proxy.ConnectionRequestBuilder.Status;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import com.velocitypowered.api.util.AdventureCompat;
import com.velocitypowered.proxy.protocol.packet.Disconnect;
import java.util.Optional;
import javax.annotation.Nullable;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.legacytext3.LegacyText3ComponentSerializer;
public class ConnectionRequestResults {
@@ -74,7 +74,7 @@ public class ConnectionRequestResults {
@Override
public Optional<net.kyori.text.Component> getReason() {
return Optional.ofNullable(component).map(AdventureCompat::asOriginalTextComponent);
return Optional.ofNullable(component).map(LegacyText3ComponentSerializer.get()::serialize);
}
@Override

9
proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListEntry.java
View File

@@ -2,10 +2,10 @@ package com.velocitypowered.proxy.tablist;
import com.velocitypowered.api.proxy.player.TabList;
import com.velocitypowered.api.proxy.player.TabListEntry;
import com.velocitypowered.api.util.AdventureCompat;
import com.velocitypowered.api.util.GameProfile;
import com.velocitypowered.proxy.protocol.packet.PlayerListItem;
import java.util.Optional;
import net.kyori.adventure.text.serializer.legacytext3.LegacyText3ComponentSerializer;
import net.kyori.text.Component;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -38,7 +38,7 @@ public class VelocityTabListEntry implements TabListEntry {
@Override
public Optional<Component> getDisplayName() {
return Optional.ofNullable(displayName).map(AdventureCompat::asOriginalTextComponent);
return Optional.ofNullable(displayName).map(LegacyText3ComponentSerializer.get()::serialize);
}
@Override
@@ -48,7 +48,10 @@ public class VelocityTabListEntry implements TabListEntry {
@Override
public TabListEntry setDisplayName(@Nullable Component displayName) {
return this.setDisplayName(AdventureCompat.asAdventureComponent(displayName));
if (displayName == null) {
return this.setDisplayName((net.kyori.adventure.text.Component) null);
}
return this.setDisplayName(LegacyText3ComponentSerializer.get().deserialize(displayName));
}
@Override