mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
ebb727e629
Upstream has released updates that appear 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: 810cb078 Add hideEntity / showEntity API CraftBukkit Changes: 04f8e7e2 SPIGOT-6814: (Chunk) PersistentData is lost after restart 37fd1917 Add hideEntity / showEntity API 7e2214da Move checkstyle to slightly later compile phase 45c3f826 SPIGOT-6816: Fix ChunkSnapshot#getBiome Spigot Changes: b11f318f Rebuild patches 622b2310 SPIGOT-6811: Fix mob spawning mismatch 2b2a3d56 Rebuild patches
87 lines
4.0 KiB
Diff
87 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 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 ad246bc21e9877b70b4e3687d8ae8bcd013b80e3..757e92e11752e8c244b46a75d5265fa3f11d5a79 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3,6 +3,7 @@ package org.bukkit.entity;
|
|
import java.net.InetSocketAddress;
|
|
import java.util.UUID;
|
|
import com.destroystokyo.paper.Title; // Paper
|
|
+import net.kyori.adventure.text.Component;
|
|
import org.bukkit.DyeColor;
|
|
import org.bukkit.Effect;
|
|
import org.bukkit.GameMode;
|
|
@@ -709,6 +710,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
public void sendMap(@NotNull 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
|
|
+ * @deprecated use {@link #sendActionBar(Component)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public void sendActionBar(@NotNull 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
|
|
+ * @deprecated use {@link #sendActionBar(Component)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public void sendActionBar(char alternateChar, @NotNull String message);
|
|
+
|
|
+ /**
|
|
+ * Sends an Action Bar message to the client.
|
|
+ *
|
|
+ * @param message The components to send
|
|
+ * @deprecated use {@link #sendActionBar(Component)}
|
|
+ */
|
|
+ @Deprecated
|
|
+ public void sendActionBar(@NotNull net.md_5.bungee.api.chat.BaseComponent... message);
|
|
+
|
|
/**
|
|
* Sends the component to the player
|
|
*
|
|
@@ -736,9 +770,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);
|
|
}
|
|
@@ -1969,6 +2005,7 @@ 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 use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|
|
@@ -1981,6 +2018,7 @@ 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 use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
|