geforkt von Mirrors/Paper
bc0dd0df3d
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: 716b4fce Revert SnakeYAML upgrade ca6f8942 Update to Minecraft 1.18-rc3 57e7e952 #683: Add Player#showDemoScreen CraftBukkit Changes: c98abfb0 Update to Minecraft 1.18-rc3 9b258501 #960: Add Player#showDemoScreen d9542247 Produce remapped jars after bootstrap jar 99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome Spigot Changes: b7a4222e Update to Minecraft 1.18-rc3
87 Zeilen
4.0 KiB
Diff
87 Zeilen
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 7816aa9fa7f64a9e24acfaba0c9b5e721559f97f..1022fa402b8235ba130cf2122b8a64f9aeacbfdf 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);
|
|
}
|
|
@@ -1936,6 +1972,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}
|
|
@@ -1948,6 +1985,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}
|