From f8f6d2cf300230c54f07ed0ff7d90fe6f6a96f3d Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 10bf160..d9fab10 100644 --- 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; import com.mojang.authlib.GameProfile; @@ -170,6 +171,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } + + @Override + public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { + PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); + packet.header = header; + packet.footer = footer; + getHandle().playerConnection.sendPacket(packet); + } + + @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)); + } // Paper end @Override @@ -1342,20 +1420,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void sendTitle(String title, String subtitle) { if (title != null) { - PacketPlayOutTitle packetTitle = new PacketPlayOutTitle(EnumTitleAction.TITLE, CraftChatMessage.fromString(title)[0]); - getHandle().playerConnection.sendPacket(packetTitle); + this.sendTitle(new Title(title)); // TODO: Paper - Double check these } if (subtitle != null) { - PacketPlayOutTitle packetSubtitle = new PacketPlayOutTitle(EnumTitleAction.SUBTITLE, CraftChatMessage.fromString(subtitle)[0]); - getHandle().playerConnection.sendPacket(packetSubtitle); + this.sendTitle(new Title(null, subtitle)); // TODO: Paper - Double check these } } @Override public void resetTitle() { - PacketPlayOutTitle packetReset = new PacketPlayOutTitle(EnumTitleAction.RESET, null); - getHandle().playerConnection.sendPacket(packetReset); + this.hideTitle(); // TODO: Paper - Double check these } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/org/bukkit/craftbukkit/entity/PacketPlayOutPlayerListHeaderFooter.java index 842db1d..2d1bc58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/PacketPlayOutPlayerListHeaderFooter.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/PacketPlayOutPlayerListHeaderFooter.java @@ -9,6 +9,8 @@ import java.io.IOException; public class PacketPlayOutPlayerListHeaderFooter implements Packet { + public net.md_5.bungee.api.chat.BaseComponent[] header, footer; // Paper + private IChatBaseComponent a; private IChatBaseComponent b; @@ -19,8 +21,19 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet { - private PacketPlayOutTitle.EnumTitleAction a; + private EnumTitleAction a; private IChatBaseComponent b; private int c; private int d; private int e; + // 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 + public PacketPlayOutTitle() {} - public PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction packetplayouttitle_enumtitleaction, IChatBaseComponent ichatbasecomponent) { + public PacketPlayOutTitle(EnumTitleAction packetplayouttitle_enumtitleaction, IChatBaseComponent ichatbasecomponent) { this(packetplayouttitle_enumtitleaction, ichatbasecomponent, -1, -1, -1); } public PacketPlayOutTitle(int i, int j, int k) { - this(PacketPlayOutTitle.EnumTitleAction.TIMES, (IChatBaseComponent) null, i, j, k); + this(EnumTitleAction.TIMES, (IChatBaseComponent) null, i, j, k); } - public PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction packetplayouttitle_enumtitleaction, IChatBaseComponent ichatbasecomponent, int i, int j, int k) { + public PacketPlayOutTitle(EnumTitleAction packetplayouttitle_enumtitleaction, IChatBaseComponent ichatbasecomponent, int i, int j, int k) { this.a = packetplayouttitle_enumtitleaction; this.b = ichatbasecomponent; this.c = i; @@ -29,12 +46,12 @@ public class PacketPlayOutTitle implements Packet { } public void a(PacketDataSerializer packetdataserializer) throws IOException { - this.a = (PacketPlayOutTitle.EnumTitleAction) packetdataserializer.a(PacketPlayOutTitle.EnumTitleAction.class); - if (this.a == PacketPlayOutTitle.EnumTitleAction.TITLE || this.a == PacketPlayOutTitle.EnumTitleAction.SUBTITLE) { + this.a = (EnumTitleAction) packetdataserializer.a(EnumTitleAction.class); + if (this.a == EnumTitleAction.TITLE || this.a == EnumTitleAction.SUBTITLE) { this.b = packetdataserializer.f(); } - if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { + if (this.a == EnumTitleAction.TIMES) { this.c = packetdataserializer.readInt(); this.d = packetdataserializer.readInt(); this.e = packetdataserializer.readInt(); @@ -44,11 +61,17 @@ public class PacketPlayOutTitle implements Packet { public void b(PacketDataSerializer packetdataserializer) throws IOException { packetdataserializer.a((Enum) this.a); - if (this.a == PacketPlayOutTitle.EnumTitleAction.TITLE || this.a == PacketPlayOutTitle.EnumTitleAction.SUBTITLE) { - packetdataserializer.a(this.b); + if (this.a == EnumTitleAction.TITLE || this.a == EnumTitleAction.SUBTITLE) { + // Paper start + if (this.components != null) { + packetdataserializer.a(net.md_5.bungee.chat.ComponentSerializer.toString(components)); + } else { + packetdataserializer.a(this.b); + } + // Paper end } - if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { + if (this.a == EnumTitleAction.TIMES) { packetdataserializer.writeInt(this.c); packetdataserializer.writeInt(this.d); packetdataserializer.writeInt(this.e); @@ -56,8 +79,9 @@ public class PacketPlayOutTitle implements Packet { } + // Paper - Fix compile error public void a(PacketListenerPlayOut packetlistenerplayout) { - packetlistenerplayout.a(this); + packetlistenerplayout.a((IChatBaseComponent) this); } public static enum EnumTitleAction { @@ -66,29 +90,29 @@ public class PacketPlayOutTitle implements Packet { private EnumTitleAction() {} - public static PacketPlayOutTitle.EnumTitleAction a(String s) { - PacketPlayOutTitle.EnumTitleAction[] apacketplayouttitle_enumtitleaction = values(); + public static EnumTitleAction a(String s) { + EnumTitleAction[] apacketplayouttitle_enumtitleaction = values(); int i = apacketplayouttitle_enumtitleaction.length; for (int j = 0; j < i; ++j) { - PacketPlayOutTitle.EnumTitleAction packetplayouttitle_enumtitleaction = apacketplayouttitle_enumtitleaction[j]; + EnumTitleAction packetplayouttitle_enumtitleaction = apacketplayouttitle_enumtitleaction[j]; if (packetplayouttitle_enumtitleaction.name().equalsIgnoreCase(s)) { return packetplayouttitle_enumtitleaction; } } - return PacketPlayOutTitle.EnumTitleAction.TITLE; + return EnumTitleAction.TITLE; } public static String[] a() { String[] astring = new String[values().length]; int i = 0; - PacketPlayOutTitle.EnumTitleAction[] apacketplayouttitle_enumtitleaction = values(); + EnumTitleAction[] apacketplayouttitle_enumtitleaction = values(); int j = apacketplayouttitle_enumtitleaction.length; for (int k = 0; k < j; ++k) { - PacketPlayOutTitle.EnumTitleAction packetplayouttitle_enumtitleaction = apacketplayouttitle_enumtitleaction[k]; + EnumTitleAction packetplayouttitle_enumtitleaction = apacketplayouttitle_enumtitleaction[k]; astring[i++] = packetplayouttitle_enumtitleaction.name().toLowerCase(); } -- 2.7.2