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
|
2022-08-09 09:18:08 +02:00
|
|
|
index 5475f7df443a31e839d353e251b0d9d55e53a84f..7a8eaf46ecd37163dbe34beb2cf8754bddae302f 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
|
2022-08-09 09:18:08 +02:00
|
|
|
@@ -379,6 +379,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
|
2022-08-09 09:18:08 +02:00
|
|
|
index 2dac2c6e01b4f230750605ab1f49317927705c6b..1aed052ea337f2875b581064bd8e79d8a5a1a9ec 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
|
2022-08-09 09:18:08 +02:00
|
|
|
@@ -312,6 +312,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
|
2022-09-24 03:38:12 +02:00
|
|
|
index 292f7827df666c10d7b82aa9b1688bf3f0da5c7b..b91c12089ba0723356ef2d3d1b8b0c66ca8850bf 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
|
2022-09-24 03:38:12 +02:00
|
|
|
@@ -778,6 +778,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
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Forces an update of the player's entire inventory.
|
|
|
|
*
|