2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
|
|
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|
|
|
|
|
|
|
Change Javadoc to be accurate
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
2021-07-18 07:41:53 +00:00
|
|
|
index f01fca5854b161278f448788e4b391e764107490..914a435bc3651f1153dd4e8128abcdec779be97e 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2021-06-29 00:31:35 +00:00
|
|
|
@@ -309,6 +309,30 @@ public final class Bukkit {
|
2021-06-11 12:02:28 +00:00
|
|
|
return server.broadcastMessage(message);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Sends the component to all online players.
|
|
|
|
+ *
|
|
|
|
+ * @param component the component to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
|
|
+ server.broadcast(component);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sends an array of components as a single message to all online players.
|
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods on {@link #getServer()} that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
|
|
+ public static void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
|
|
+ server.broadcast(components);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
|
|
* update plugins at the right moment on a plugin load.
|
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2021-07-18 07:41:53 +00:00
|
|
|
index 019dcabdd21783cd4d14d407d4dcae739afcaadd..25d6c59728c616f47dea4254a9317807ed6863be 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2021-06-29 00:31:35 +00:00
|
|
|
@@ -254,6 +254,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2021-06-11 12:02:28 +00:00
|
|
|
@Deprecated // Paper
|
|
|
|
public int broadcastMessage(@NotNull String message);
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Sends the component to all online players.
|
|
|
|
+ *
|
|
|
|
+ * @param component the component to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
|
|
+ spigot().broadcast(component);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sends an array of components as a single message to all online players.
|
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
|
|
|
+ public default void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
|
|
+ spigot().broadcast(components);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
|
|
* update plugins at the right moment on a plugin load.
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
2021-07-18 07:41:53 +00:00
|
|
|
index f41d6a76f768c9ffa6c2ba9379564d07163f60c3..d3d412fc75ad0a849e8c81f0ba73ba980754c12e 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2021-06-13 05:13:07 +00:00
|
|
|
@@ -641,6 +641,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2021-06-11 12:02:28 +00:00
|
|
|
*/
|
|
|
|
public void sendMap(@NotNull MapView map);
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Sends the component to the player
|
|
|
|
+ *
|
|
|
|
+ * @param component the components to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ @Deprecated
|
|
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
|
|
|
|
+ spigot().sendMessage(component);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sends an array of components as a single message to the player
|
|
|
|
+ *
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ @Deprecated
|
|
|
|
+ public default void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
|
|
+ spigot().sendMessage(components);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sends an array of components as a single message to the specified screen position of this player
|
|
|
|
+ *
|
|
|
|
+ * @param position the screen position
|
|
|
|
+ * @param components the components to send
|
|
|
|
+ */
|
|
|
|
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
|
|
+ spigot().sendMessage(position, components);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Forces an update of the player's entire inventory.
|
|
|
|
*
|