2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-03-01 00:09:49 +01:00
|
|
|
From: Techcable <Techcable@outlook.com>
|
|
|
|
Date: Thu, 3 Mar 2016 02:32:10 -0600
|
|
|
|
Subject: [PATCH] Player Tab List and Title APIs
|
|
|
|
|
|
|
|
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/network/PacketDataSerializer.java b/src/main/java/net/minecraft/network/PacketDataSerializer.java
|
|
|
|
index 5f1c5dd7902f6cff5acae05e8c6bf58a1ba5bdf1..df459918c14589155a574730205cb35d463b8079 100644
|
|
|
|
--- a/src/main/java/net/minecraft/network/PacketDataSerializer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/PacketDataSerializer.java
|
|
|
|
@@ -171,6 +171,11 @@ public class PacketDataSerializer extends ByteBuf {
|
2021-02-27 12:02:06 +01:00
|
|
|
public PacketDataSerializer writeComponent(final net.kyori.adventure.text.Component component) {
|
|
|
|
return this.writeUtf(PaperAdventure.asJsonString(component, this.adventure$locale), 262144);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Deprecated
|
|
|
|
+ public PacketDataSerializer writeComponent(final net.md_5.bungee.api.chat.BaseComponent[] component) {
|
|
|
|
+ return this.writeUtf(net.md_5.bungee.chat.ComponentSerializer.toString(component), 262144);
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
public PacketDataSerializer a(IChatBaseComponent ichatbasecomponent) {
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java b/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
|
2021-05-06 12:32:52 +02:00
|
|
|
index e96fa348a37a39c381b6659f612232933686c2a7..a002125e454f8a86924e9010e0b20a95742fa04b 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/chat/IChatBaseComponent.java
|
2021-05-06 12:32:52 +02:00
|
|
|
@@ -364,6 +364,7 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
|
2021-03-16 08:19:45 +01:00
|
|
|
return IChatBaseComponent.ChatSerializer.a.toJsonTree(ichatbasecomponent);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ @Nullable public static IChatBaseComponent jsonToComponent(String json) { return a(json);} // Paper - OBFHELPER
|
|
|
|
@Nullable
|
|
|
|
public static IChatMutableComponent a(String s) {
|
|
|
|
return (IChatMutableComponent) ChatDeserializer.a(IChatBaseComponent.ChatSerializer.a, s, IChatMutableComponent.class, false);
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
|
|
|
|
index fff22c40ba38575951e8e4821ade22b29d580a89..c397c52e8e24b85d892e4906178720cc70edc143 100644
|
|
|
|
--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayOutTitle.java
|
|
|
|
@@ -47,6 +47,17 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
|
2019-01-01 04:15:55 +01:00
|
|
|
}
|
2016-03-23 07:05:09 +01:00
|
|
|
|
2018-09-01 00:56:57 +02:00
|
|
|
}
|
2016-03-23 07:05:09 +01:00
|
|
|
+ // Paper start
|
|
|
|
+ public net.md_5.bungee.api.chat.BaseComponent[] components;
|
|
|
|
+
|
|
|
|
+ public PacketPlayOutTitle(EnumTitleAction action, net.md_5.bungee.api.chat.BaseComponent[] components, int fadeIn, int stay, int fadeOut) {
|
|
|
|
+ this.a = action;
|
|
|
|
+ this.components = components;
|
|
|
|
+ this.c = fadeIn;
|
|
|
|
+ this.d = stay;
|
|
|
|
+ this.e = fadeOut;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
2019-04-26 03:24:00 +02:00
|
|
|
@Override
|
2016-03-23 07:05:09 +01:00
|
|
|
public void b(PacketDataSerializer packetdataserializer) throws IOException {
|
2021-03-16 08:19:45 +01:00
|
|
|
@@ -55,6 +66,8 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
|
2021-02-27 12:02:06 +01:00
|
|
|
// Paper start
|
|
|
|
if (this.adventure$text != null) {
|
|
|
|
packetdataserializer.writeComponent(this.adventure$text);
|
|
|
|
+ } else if (this.components != null) {
|
|
|
|
+ packetdataserializer.writeComponent(this.components);
|
|
|
|
} else
|
|
|
|
// Paper end
|
|
|
|
packetdataserializer.a(this.b);
|
2016-03-01 00:09:49 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2021-03-16 08:19:45 +01:00
|
|
|
index 62f8d96f996ece87b7ab8d5d05d1dc214d10dbfa..9837f7364f3efd0aa22d33058bec369c41cd03ef 100644
|
2016-03-01 00:09:49 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
|
|
|
|
+import com.destroystokyo.paper.Title;
|
|
|
|
import com.google.common.base.Preconditions;
|
|
|
|
import com.google.common.collect.ImmutableSet;
|
2017-02-18 03:03:38 +01:00
|
|
|
import com.google.common.io.BaseEncoding;
|
2021-02-24 10:32:17 +01:00
|
|
|
@@ -238,6 +239,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2016-12-20 23:34:27 +01:00
|
|
|
}
|
2016-03-01 00:09:49 +01:00
|
|
|
}
|
2016-12-20 23:34:27 +01:00
|
|
|
|
|
|
|
+ // Paper start
|
2016-03-01 00:09:49 +01:00
|
|
|
+ @Override
|
|
|
|
+ public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
|
2018-09-01 12:09:13 +02:00
|
|
|
+ if (header != null) {
|
2018-10-15 07:05:02 +02:00
|
|
|
+ String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(header);
|
2021-02-21 20:45:33 +01:00
|
|
|
+ playerListHeader = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(headerJson);
|
2018-09-01 12:09:13 +02:00
|
|
|
+ } else {
|
|
|
|
+ playerListHeader = null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (footer != null) {
|
2018-10-15 07:05:02 +02:00
|
|
|
+ String footerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
|
2021-02-21 20:45:33 +01:00
|
|
|
+ playerListFooter = net.kyori.adventure.text.serializer.gson.GsonComponentSerializer.gson().deserialize(footerJson);
|
|
|
|
+ } else {
|
2018-09-01 12:09:13 +02:00
|
|
|
+ playerListFooter = null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ updatePlayerListHeaderFooter();
|
2016-03-01 00:09:49 +01:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setPlayerListHeaderFooter(BaseComponent header, BaseComponent footer) {
|
|
|
|
+ this.setPlayerListHeaderFooter(header == null ? null : new BaseComponent[]{header},
|
|
|
|
+ footer == null ? null : new BaseComponent[]{footer});
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setTitleTimes(int fadeInTicks, int stayTicks, int fadeOutTicks) {
|
|
|
|
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TIMES, (BaseComponent[]) null, fadeInTicks, stayTicks, fadeOutTicks));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setSubtitle(BaseComponent[] subtitle) {
|
|
|
|
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.SUBTITLE, subtitle, 0, 0, 0));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setSubtitle(BaseComponent subtitle) {
|
|
|
|
+ setSubtitle(new BaseComponent[]{subtitle});
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void showTitle(BaseComponent[] title) {
|
|
|
|
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TITLE, title, 0, 0, 0));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void showTitle(BaseComponent title) {
|
|
|
|
+ showTitle(new BaseComponent[]{title});
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void showTitle(BaseComponent[] title, BaseComponent[] subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
|
|
|
|
+ setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
|
|
|
|
+ setSubtitle(subtitle);
|
|
|
|
+ showTitle(title);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void showTitle(BaseComponent title, BaseComponent subtitle, int fadeInTicks, int stayTicks, int fadeOutTicks) {
|
|
|
|
+ setTitleTimes(fadeInTicks, stayTicks, fadeOutTicks);
|
|
|
|
+ setSubtitle(subtitle);
|
|
|
|
+ showTitle(title);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void sendTitle(Title title) {
|
|
|
|
+ Preconditions.checkNotNull(title, "Title is null");
|
|
|
|
+ setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
|
|
|
|
+ setSubtitle(title.getSubtitle() == null ? new BaseComponent[0] : title.getSubtitle());
|
|
|
|
+ showTitle(title.getTitle());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void updateTitle(Title title) {
|
|
|
|
+ Preconditions.checkNotNull(title, "Title is null");
|
|
|
|
+ setTitleTimes(title.getFadeIn(), title.getStay(), title.getFadeOut());
|
|
|
|
+ if (title.getSubtitle() != null) {
|
|
|
|
+ setSubtitle(title.getSubtitle());
|
|
|
|
+ }
|
|
|
|
+ showTitle(title.getTitle());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void hideTitle() {
|
|
|
|
+ getHandle().playerConnection.sendPacket(new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.CLEAR, (BaseComponent[]) null, 0, 0, 0));
|
|
|
|
+ }
|
2016-12-20 23:34:27 +01:00
|
|
|
+ // Paper end
|
|
|
|
+
|
2016-03-01 00:09:49 +01:00
|
|
|
@Override
|
2016-12-20 23:34:27 +01:00
|
|
|
public String getDisplayName() {
|
2021-03-09 19:03:27 +01:00
|
|
|
if(true) return io.papermc.paper.adventure.DisplayNames.getLegacy(this); // Paper
|