spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
spigot/CraftBukkit-Patches/0081-BungeeCord-Chat-API.patch
md_5 fa893f0bb7
Revert "Fixed system messages shown in action bar" 
This reverts commit ee737122ad.
2022-06-08 19:32:02 +10:00

325 lines
13 KiB
Diff
Raw Blame History

From dcd46779df6556e8ae62d48b04811e83f0e77c5b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
index 69c974f42..114f48d80 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSystemChatPacket.java
@@ -8,7 +8,17 @@ import net.minecraft.network.chat.ChatMessageType;
import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.network.protocol.Packet;
-public record ClientboundSystemChatPacket(IChatBaseComponent content, int typeId) implements Packet<PacketListenerPlayOut> {
+// Spigot start
+public record ClientboundSystemChatPacket(String content, int typeId) implements Packet<PacketListenerPlayOut> {
+
+ public ClientboundSystemChatPacket(IChatBaseComponent content, int typeId) {
+ this(IChatBaseComponent.ChatSerializer.toJson(content), typeId);
+ }
+
+ public ClientboundSystemChatPacket(net.md_5.bungee.api.chat.BaseComponent[] content, int typeId) {
+ this(net.md_5.bungee.chat.ComponentSerializer.toString(content), typeId);
+ }
+ // Spigot end
public ClientboundSystemChatPacket(PacketDataSerializer packetdataserializer) {
this(packetdataserializer.readComponent(), packetdataserializer.readVarInt());
@@ -16,7 +26,7 @@ public record ClientboundSystemChatPacket(IChatBaseComponent content, int typeId
@Override
public void write(PacketDataSerializer packetdataserializer) {
- packetdataserializer.writeComponent(this.content);
+ packetdataserializer.writeUtf(this.content, 262144); // Spigot
packetdataserializer.writeVarInt(this.typeId);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 340765265..6f56e26bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -240,6 +240,8 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
+import net.md_5.bungee.api.chat.BaseComponent; // Spigot
+
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -2293,6 +2295,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
+
+ @Override
+ public void broadcast(BaseComponent component) {
+ for (Player player : getOnlinePlayers()) {
+ player.spigot().sendMessage(component);
+ }
+ }
+
+ @Override
+ public void broadcast(BaseComponent... components) {
+ for (Player player : getOnlinePlayers()) {
+ player.spigot().sendMessage(components);
+ }
+ }
};
public org.bukkit.Server.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
index 74558e852..13008357b 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -103,6 +103,29 @@ public abstract class ServerCommandSender implements CommandSender {
// Spigot start
private final org.bukkit.command.CommandSender.Spigot spigot = new org.bukkit.command.CommandSender.Spigot()
{
+ @Override
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component)
+ {
+ ServerCommandSender.this.sendMessage(net.md_5.bungee.api.chat.TextComponent.toLegacyText(component));
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components)
+ {
+ ServerCommandSender.this.sendMessage(net.md_5.bungee.api.chat.TextComponent.toLegacyText(components));
+ }
+
+ @Override
+ public void sendMessage(UUID sender, net.md_5.bungee.api.chat.BaseComponent... components)
+ {
+ this.sendMessage(components);
+ }
+
+ @Override
+ public void sendMessage(UUID sender, net.md_5.bungee.api.chat.BaseComponent component)
+ {
+ this.sendMessage(component);
+ }
};
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 2b95bfe26..a4e36b96e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
import java.util.List;
import java.util.Set;
import java.util.UUID;
+import net.md_5.bungee.api.chat.BaseComponent;
import net.minecraft.core.BlockPosition;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
@@ -1100,6 +1101,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
{
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent component)
+ {
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components)
+ {
+ }
+
+ @Override
+ public void sendMessage(UUID sender, BaseComponent... components)
+ {
+ }
+
+ @Override
+ public void sendMessage(UUID sender, BaseComponent component)
+ {
+ }
};
public org.bukkit.entity.Entity.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a9a615a1e..86adfa50d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -149,6 +149,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.profile.PlayerProfile;
import org.bukkit.scoreboard.Scoreboard;
+import net.md_5.bungee.api.chat.BaseComponent; // Spigot
+
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -1949,6 +1951,54 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}
+
+ @Override
+ public void sendMessage(BaseComponent component) {
+ sendMessage( new BaseComponent[] { component } );
+ }
+
+ @Override
+ public void sendMessage(BaseComponent... components) {
+ this.sendMessage(net.md_5.bungee.api.ChatMessageType.SYSTEM, components);
+ }
+
+ @Override
+ public void sendMessage(UUID sender, BaseComponent component) {
+ this.sendMessage(net.md_5.bungee.api.ChatMessageType.CHAT, sender, component);
+ }
+
+ @Override
+ public void sendMessage(UUID sender, BaseComponent... components) {
+ this.sendMessage(net.md_5.bungee.api.ChatMessageType.CHAT, sender, components);
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent component) {
+ sendMessage( position, new BaseComponent[] { component } );
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, BaseComponent... components) {
+ this.sendMessage(position, null, components);
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, UUID sender, BaseComponent component) {
+ sendMessage( position, sender, new BaseComponent[] { component } );
+ }
+
+ @Override
+ public void sendMessage(net.md_5.bungee.api.ChatMessageType position, UUID sender, BaseComponent... components) {
+ if ( getHandle().connection == null ) return;
+
+ // This position has client side formatting now, switch to system
+ if (position == net.md_5.bungee.api.ChatMessageType.CHAT) {
+ position = net.md_5.bungee.api.ChatMessageType.SYSTEM;
+ }
+ int i = position.ordinal();
+
+ getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, i));
+ }
};
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index d14b5c38d..93d2ce01d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -24,6 +24,9 @@ import org.bukkit.inventory.meta.BookMeta.Generation;
// Spigot start
import static org.spigotmc.ValidateUtils.*;
+import java.util.AbstractList;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.chat.ComponentSerializer;
// Spigot end
@DelegateDeserialization(SerializableMeta.class)
@@ -439,6 +442,94 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
// Spigot start
private BookMeta.Spigot spigot = new SpigotMeta();
private class SpigotMeta extends BookMeta.Spigot {
+
+ private String pageToJSON(String page) {
+ if (CraftMetaBook.this instanceof CraftMetaBookSigned) {
+ // Page data is already in JSON format:
+ return page;
+ } else {
+ // Convert from plain String to JSON (similar to conversion between writable books and written books):
+ IChatBaseComponent component = CraftChatMessage.fromString(page, true, true)[0];
+ return CraftChatMessage.toJSON(component);
+ }
+ }
+
+ private String componentsToPage(BaseComponent[] components) {
+ // asserted: components != null
+ if (CraftMetaBook.this instanceof CraftMetaBookSigned) {
+ // Pages are in JSON format:
+ return ComponentSerializer.toString(components);
+ } else {
+ // Convert component to plain String:
+ return CraftChatMessage.fromJSONComponent(ComponentSerializer.toString(components));
+ }
+ }
+
+ @Override
+ public BaseComponent[] getPage(final int page) {
+ Validate.isTrue(isValidPage(page), "Invalid page number");
+ return ComponentSerializer.parse(pageToJSON(pages.get(page - 1)));
+ }
+
+ @Override
+ public void setPage(final int page, final BaseComponent... text) {
+ if (!isValidPage(page)) {
+ throw new IllegalArgumentException("Invalid page number " + page + "/" + getPageCount());
+ }
+
+ BaseComponent[] newText = text == null ? new BaseComponent[0] : text;
+ CraftMetaBook.this.pages.set(page - 1, componentsToPage(newText));
+ }
+
+ @Override
+ public void setPages(final BaseComponent[]... pages) {
+ setPages(Arrays.asList(pages));
+ }
+
+ @Override
+ public void addPage(final BaseComponent[]... pages) {
+ for (BaseComponent[] page : pages) {
+ if (page == null) {
+ page = new BaseComponent[0];
+ }
+
+ CraftMetaBook.this.internalAddPage(componentsToPage(page));
+ }
+ }
+
+ @Override
+ public List<BaseComponent[]> getPages() {
+ if (CraftMetaBook.this.pages == null) return ImmutableList.of();
+ final List<String> copy = ImmutableList.copyOf(CraftMetaBook.this.pages);
+ return new AbstractList<BaseComponent[]>() {
+
+ @Override
+ public BaseComponent[] get(int index) {
+ return ComponentSerializer.parse(pageToJSON(copy.get(index)));
+ }
+
+ @Override
+ public int size() {
+ return copy.size();
+ }
+ };
+ }
+
+ @Override
+ public void setPages(List<BaseComponent[]> pages) {
+ if (pages.isEmpty()) {
+ CraftMetaBook.this.pages = null;
+ return;
+ }
+
+ if (CraftMetaBook.this.pages != null) {
+ CraftMetaBook.this.pages.clear();
+ }
+
+ for (BaseComponent[] page : pages) {
+ addPage(page);
+ }
+ }
};
@Override
--
2.25.1
Reference in a new issue View git blame Copy permalink