ccbeb5c4ed
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 6ffe5a68 Add RecipeChoice.ExactChoice API for NBT matches on ingredients ffccf6b7 SPIGOT-4560: Add HumanEntity.sleep and related APIs CraftBukkit Changes: 917411fd Remove redundant BlockPosition creation from sleep API 756c38d1 Add RecipeChoice.ExactChoice API for NBT matches on ingredients 8e65d8df SPIGOT-4560: Add HumanEntity.sleep and related APIs a8382862 SPIGOT-4562: reducedDebugInfo not updated on world change
76 lines
3.5 KiB
Diff
76 lines
3.5 KiB
Diff
From 38f50835d8432bd0552c5fbeb5d53b3aa9aa42f6 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 20 Dec 2016 15:55:55 -0500
|
|
Subject: [PATCH] Add String based Action Bar API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 96d97bf3..d9965ddc 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -416,6 +416,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
public void sendMap(MapView map);
|
|
|
|
// Paper start
|
|
+
|
|
+ /**
|
|
+ * Sends an Action Bar message to the client.
|
|
+ *
|
|
+ * Use Section symbols for legacy color codes to send formatting.
|
|
+ *
|
|
+ * @param message The message to send
|
|
+ */
|
|
+ public void sendActionBar(String message);
|
|
+
|
|
+ /**
|
|
+ * Sends an Action Bar message to the client.
|
|
+ *
|
|
+ * Use supplied alternative character to the section symbol to represent legacy color codes.
|
|
+ *
|
|
+ * @param alternateChar Alternate symbol such as '&'
|
|
+ * @param message The message to send
|
|
+ */
|
|
+ public void sendActionBar(char alternateChar, String message);
|
|
+
|
|
/**
|
|
* Sends the component to the player
|
|
*
|
|
@@ -439,9 +459,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
/**
|
|
* Sends an array of components as a single message to the specified screen position of this player
|
|
*
|
|
+ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
|
|
* @param position the screen position
|
|
* @param components the components to send
|
|
*/
|
|
+ @Deprecated
|
|
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
spigot().sendMessage(position, components);
|
|
}
|
|
@@ -1764,9 +1786,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
/**
|
|
* Sends the component to the specified screen position of this player
|
|
*
|
|
+ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
|
|
* @param position the screen position
|
|
* @param component the components to send
|
|
*/
|
|
+ @Deprecated
|
|
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
|
|
throw new UnsupportedOperationException("Not supported yet.");
|
|
}
|
|
@@ -1774,9 +1798,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
/**
|
|
* Sends an array of components as a single message to the specified screen position of this player
|
|
*
|
|
+ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client.
|
|
* @param position the screen position
|
|
* @param components the components to send
|
|
*/
|
|
+ @Deprecated
|
|
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
throw new UnsupportedOperationException("Not supported yet.");
|
|
}
|
|
--
|
|
2.20.1
|
|
|