mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 11:50:06 +01:00
125 lines
4.9 KiB
Diff
125 lines
4.9 KiB
Diff
|
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
|
||
|
index 10274053320f1ec690a65d3794abb44b58658059..22b83b142de97dcba28fa9a49730de7880d0b5d2 100644
|
||
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
||
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||
|
@@ -285,6 +285,30 @@ public final class Bukkit {
|
||
|
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
|
||
|
index 7e4a728ceb943b6a32b9ba9b84bada34e71c0980..9ce9b4ce2da6c57c62607502ae2042e30fc26d88 100644
|
||
|
--- a/src/main/java/org/bukkit/Server.java
|
||
|
+++ b/src/main/java/org/bukkit/Server.java
|
||
|
@@ -234,6 +234,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||
|
@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
|
||
|
index 68795a48cb15d322906ce0569b7701231c1f94c2..88853cc165c67fd60a0a8f87e4ce356e4ca045f9 100644
|
||
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||
|
@@ -614,6 +614,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||
|
*/
|
||
|
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.
|
||
|
*
|