13
0
geforkt von Mirrors/Velocity

Get everything compiling and Checkstyle clean

Dieser Commit ist enthalten in:
Andrew Steinborn 2020-06-28 23:20:46 -04:00
Ursprung c2edd82b16
Commit 70698246bf
3 geänderte Dateien mit 16 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -12,6 +12,12 @@ public class AdventureCompat {
throw new AssertionError("Do not create instances of this class."); throw new AssertionError("Do not create instances of this class.");
} }
/**
* Converts an {@link net.kyori.text.Component} component into an adventure
* {@link net.kyori.adventure.text.Component} component.
* @param component the component to translate
* @return the translated component
*/
public static net.kyori.adventure.text.Component asAdventureComponent( public static net.kyori.adventure.text.Component asAdventureComponent(
net.kyori.text.Component component) { net.kyori.text.Component component) {
String json = net.kyori.text.serializer.gson.GsonComponentSerializer.INSTANCE String json = net.kyori.text.serializer.gson.GsonComponentSerializer.INSTANCE
@ -20,6 +26,12 @@ public class AdventureCompat {
.deserialize(json); .deserialize(json);
} }
/**
* Converts an {@link net.kyori.adventure.text.Component} component into an text
* {@link net.kyori.text.Component} component.
* @param component the component to translate
* @return the translated component
*/
public static net.kyori.text.Component asOriginalTextComponent( public static net.kyori.text.Component asOriginalTextComponent(
net.kyori.adventure.text.Component component) { net.kyori.adventure.text.Component component) {
String json = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer String json = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer

Datei anzeigen

@ -3,7 +3,7 @@ package com.velocitypowered.proxy.command;
import com.velocitypowered.api.command.Command; import com.velocitypowered.api.command.Command;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.proxy.VelocityServer; import com.velocitypowered.proxy.VelocityServer;
import net.kyori.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
public class ShutdownCommand implements Command { public class ShutdownCommand implements Command {
@ -20,7 +20,7 @@ public class ShutdownCommand implements Command {
server.shutdown(true); server.shutdown(true);
} else { } else {
String reason = String.join(" ", args); String reason = String.join(" ", args);
server.shutdown(true, LegacyComponentSerializer.legacy().deserialize(reason, '&')); server.shutdown(true, LegacyComponentSerializer.legacy('&').deserialize(reason));
} }
} }

Datei anzeigen

@ -281,7 +281,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
@Override @Override
public void showTitle(net.kyori.adventure.title.@NonNull Title title) { public void showTitle(net.kyori.adventure.title.@NonNull Title title) {
GsonComponentSerializer serializer = ProtocolUtils.getJsonChatSerializer(this.getProtocolVersion()); GsonComponentSerializer serializer = ProtocolUtils.getJsonChatSerializer(this
.getProtocolVersion());
TitlePacket titlePkt = new TitlePacket(); TitlePacket titlePkt = new TitlePacket();
titlePkt.setAction(TitlePacket.SET_TITLE); titlePkt.setAction(TitlePacket.SET_TITLE);