mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-11-27 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get everything compiling and Checkstyle clean

Browse Source
This commit is contained in:
Andrew Steinborn 2020-06-28 23:20:46 -04:00
parent c2edd82b16
commit 70698246bf
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/main/java/com/velocitypowered/api/util/AdventureCompat.java
View File

@ -12,6 +12,12 @@ public class AdventureCompat {
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(
net.kyori.text.Component component) {
String json = net.kyori.text.serializer.gson.GsonComponentSerializer.INSTANCE
@ -20,6 +26,12 @@ public class AdventureCompat {
.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(
net.kyori.adventure.text.Component component) {
String json = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer

4
proxy/src/main/java/com/velocitypowered/proxy/command/ShutdownCommand.java
View File

@ -3,7 +3,7 @@ package com.velocitypowered.proxy.command;
import com.velocitypowered.api.command.Command;
import com.velocitypowered.api.command.CommandSource;
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;
public class ShutdownCommand implements Command {
@ -20,7 +20,7 @@ public class ShutdownCommand implements Command {
server.shutdown(true);
} else {
String reason = String.join(" ", args);
server.shutdown(true, LegacyComponentSerializer.legacy().deserialize(reason, '&'));
server.shutdown(true, LegacyComponentSerializer.legacy('&').deserialize(reason));
}
}

3
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@ -281,7 +281,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
@Override
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();
titlePkt.setAction(TitlePacket.SET_TITLE);