2021-06-11 14:02:28 +02: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
|
2023-11-25 23:34:42 +01:00
|
|
|
index 4c5671cf75143e741d945834a2a8b56cb52f20dd..3118da2ad367b5bd547769214112ea5299c95866 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2023-11-11 21:25:45 +01:00
|
|
|
@@ -411,6 +411,30 @@ public final class Bukkit {
|
2021-06-11 14:02:28 +02: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
|
2023-11-25 23:34:42 +01:00
|
|
|
index 7ee7fdc8379078456492da00bb213a0738cc6f08..d94483d1481f233897faf378e6b34b6b97f02caf 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2023-11-11 21:25:45 +01:00
|
|
|
@@ -346,6 +346,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
2021-06-11 14:02:28 +02: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
|
2023-12-05 18:33:18 +01:00
|
|
|
index 17c3fcaca46e1e8f4c14026ee7a6a2d7a472b90c..602d8b81135eba0481280c887f44f1c1855044e1 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2023-12-05 18:33:18 +01:00
|
|
|
@@ -1103,6 +1103,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2021-06-11 14:02:28 +02: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
|
|
|
|
+
|
|
|
|
/**
|
2023-04-07 20:39:13 +02:00
|
|
|
* Send a hurt animation. This fakes incoming damage towards the player from
|
|
|
|
* the given yaw relative to the player's direction.
|