Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 12:36:07 +01:00
Code Issues Projects Releases Wiki Activity

refactor: do not import List; use FQN

Browse Source 
Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
This commit is contained in:
Mariell Hoversholm 2021-08-06 13:57:36 +02:00 committed by MiniDigger | Martin
parent 415f7ca165
commit 37df95b189
19 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
patches/api/0007-Adventure.patch
View File

@ -1352,18 +1352,10 @@ index 25a6f9313a1953def7470e411b53016f2ca14bef..d7a4cfed4f46b34f83fb2c07bdab5a71
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2ac18ac691 100644 index 6c910e09eda6f4f08226ccc75189171015a72b85..d68b2c6044db7740ef4d737e1b2955dfa653edb3 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1,6 +1,7 @@ @@ -33,7 +33,28 @@ import org.jetbrains.annotations.Nullable;
package org.bukkit.entity;
import java.net.InetSocketAddress;
+import java.util.List; // Paper
import java.util.UUID;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
@@ -33,7 +34,28 @@ import org.jetbrains.annotations.Nullable;
/** /**
* Represents a player, connected or not * Represents a player, connected or not
*/ */
@ -1393,7 +1385,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
/** /**
* Gets the "friendly" name to display of this player. This may include * Gets the "friendly" name to display of this player. This may include
@@ -43,7 +65,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -43,7 +64,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins. * places defined by plugins.
* *
* @return the friendly name * @return the friendly name
@ -1403,7 +1395,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
@NotNull @NotNull
public String getDisplayName(); public String getDisplayName();
@@ -55,15 +79,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -55,15 +78,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins. * places defined by plugins.
* *
* @param name The new display name. * @param name The new display name.
@ -1454,7 +1446,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public String getPlayerListName(); public String getPlayerListName();
/** /**
@@ -72,14 +131,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -72,14 +130,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* If the value is null, the name will be identical to {@link #getName()}. * If the value is null, the name will be identical to {@link #getName()}.
* *
* @param name new player list name * @param name new player list name
@ -1473,7 +1465,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
@Nullable @Nullable
public String getPlayerListHeader(); public String getPlayerListHeader();
@@ -87,7 +150,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -87,7 +149,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Gets the currently displayed player list footer for this player. * Gets the currently displayed player list footer for this player.
* *
* @return player list header or null * @return player list header or null
@ -1483,7 +1475,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
@Nullable @Nullable
public String getPlayerListFooter(); public String getPlayerListFooter();
@@ -95,14 +160,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -95,14 +159,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Sets the currently displayed player list header for this player. * Sets the currently displayed player list header for this player.
* *
* @param header player list header, null for empty * @param header player list header, null for empty
@ -1502,7 +1494,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void setPlayerListFooter(@Nullable String footer); public void setPlayerListFooter(@Nullable String footer);
/** /**
@@ -111,7 +180,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -111,7 +179,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* *
* @param header player list header, null for empty * @param header player list header, null for empty
* @param footer player list footer, null for empty * @param footer player list footer, null for empty
@ -1512,7 +1504,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/** /**
@@ -149,9 +220,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -149,9 +219,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Kicks player with custom kick message. * Kicks player with custom kick message.
* *
* @param message kick message * @param message kick message
@ -1533,7 +1525,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
/** /**
* Says a message (or runs a command). * Says a message (or runs a command).
* *
@@ -475,6 +557,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -475,6 +556,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated @Deprecated
public boolean sendChunkChange(@NotNull Location loc, int sx, int sy, int sz, @NotNull byte[] data); public boolean sendChunkChange(@NotNull Location loc, int sx, int sy, int sz, @NotNull byte[] data);
@ -1560,7 +1552,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
/** /**
* Send a sign change. This fakes a sign change packet for a user at * Send a sign change. This fakes a sign change packet for a user at
* a certain location. This will not actually change the world in any way. * a certain location. This will not actually change the world in any way.
@@ -487,9 +589,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -487,9 +588,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* *
* @param loc the location of the sign * @param loc the location of the sign
* @param lines the new text on the sign or null to clear it * @param lines the new text on the sign or null to clear it
@ -1636,7 +1628,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/** /**
@@ -508,7 +676,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -508,7 +675,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if dyeColor is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4 * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@ -1646,17 +1638,17 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/** /**
@@ -528,7 +698,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -528,7 +697,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if dyeColor is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4 * @throws IllegalArgumentException if lines is non-null and has a length less than 4
+ * @deprecated Deprecated in favour of {@link #sendSignChange(Location, List, DyeColor, boolean)} + * @deprecated Deprecated in favour of {@link #sendSignChange(Location, java.util.List, DyeColor, boolean)}
*/ */
+ @Deprecated // Paper + @Deprecated // Paper
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
/** /**
@@ -1266,6 +1438,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1266,6 +1437,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
public int getClientViewDistance(); public int getClientViewDistance();
@ -1671,7 +1663,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
/** /**
* Gets the player's estimated ping in milliseconds. * Gets the player's estimated ping in milliseconds.
* *
@@ -1291,8 +1471,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1291,8 +1470,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* they wish. * they wish.
* *
* @return the player's locale * @return the player's locale
@ -1682,7 +1674,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public String getLocale(); public String getLocale();
/** /**
@@ -1310,6 +1492,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1310,6 +1491,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
public void openBook(@NotNull ItemStack book); public void openBook(@NotNull ItemStack book);
@ -1697,7 +1689,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
// Spigot start // Spigot start
public class Spigot extends Entity.Spigot { public class Spigot extends Entity.Spigot {
@@ -1364,11 +1554,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1364,11 +1553,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@ -1711,7 +1703,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
@Override @Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
@@ -1379,7 +1571,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1379,7 +1570,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* *
* @param position the screen position * @param position the screen position
* @param component the components to send * @param component the components to send
@ -1721,7 +1713,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@@ -1389,7 +1583,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1389,7 +1582,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* *
* @param position the screen position * @param position the screen position
* @param components the components to send * @param components the components to send
@ -1731,7 +1723,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@@ -1400,7 +1596,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1400,7 +1595,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position * @param position the screen position
* @param sender the sender of the message * @param sender the sender of the message
* @param component the components to send * @param component the components to send
@ -1741,7 +1733,7 @@ index 6c910e09eda6f4f08226ccc75189171015a72b85..fd5e85e2b20a88ab245eba113fe67f2a
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@@ -1411,7 +1609,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1411,7 +1608,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position * @param position the screen position
* @param sender the sender of the message * @param sender the sender of the message
* @param components the components to send * @param components the components to send

4
patches/api/0008-Player-affects-spawning-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index fd5e85e2b20a88ab245eba113fe67f2ac18ac691..35b4669a40ad2277d058207028c3143bf010dd9b 100644 index d68b2c6044db7740ef4d737e1b2955dfa653edb3..1786b6c230cabaf962b27f9d95c49b42e2b5cc67 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1477,6 +1477,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1476,6 +1476,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper @Deprecated // Paper
public String getLocale(); public String getLocale();

4
patches/api/0013-Add-player-view-distance-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 35b4669a40ad2277d058207028c3143bf010dd9b..54affc99338908e1af4537d4d6935c78300447d0 100644 index 1786b6c230cabaf962b27f9d95c49b42e2b5cc67..28ef62e9e04501dbf4fe7b0fec52b1435621cffb 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1491,6 +1491,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1490,6 +1490,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param affects Whether the player can affect mob spawning * @param affects Whether the player can affect mob spawning
*/ */
public void setAffectsSpawning(boolean affects); public void setAffectsSpawning(boolean affects);

4
patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View File

@ -76,10 +76,10 @@ index 53455bbe675bdfd424d8cebeb057c1d8defd0dd5..5ae4b3c4a20fd8fd727efbfe7b721c9b
* Gets the name of the update folder. The update folder is used to safely * Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load. * 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 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 54affc99338908e1af4537d4d6935c78300447d0..5fb7d1243ba103766cfe362de09e504bbf5cebf3 100644 index 28ef62e9e04501dbf4fe7b0fec52b1435621cffb..bd652a0c20335be67aae67ea663a23ea215d237a 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -711,6 +711,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -710,6 +710,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
public void sendMap(@NotNull MapView map); public void sendMap(@NotNull MapView map);

8
patches/api/0020-Player-Tab-List-and-Title-APIs.patch
View File

@ -432,18 +432,18 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5fb7d1243ba103766cfe362de09e504bbf5cebf3..c5bb58e0bafaf89a8e83ce5452e623ad90c9ae0b 100644 index bd652a0c20335be67aae67ea663a23ea215d237a..9c9c9e504cb4db80e760207f6a27fd822a01ca3c 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/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; @@ -2,6 +2,7 @@ package org.bukkit.entity;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.List; // Paper
import java.util.UUID; import java.util.UUID;
+import com.destroystokyo.paper.Title; // Paper +import com.destroystokyo.paper.Title; // Paper
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@@ -745,6 +746,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -744,6 +745,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components); spigot().sendMessage(position, components);
} }

6
patches/api/0024-Complete-resource-pack-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c5bb58e0bafaf89a8e83ce5452e623ad90c9ae0b..91e2f81b39ff421a7e6e1bef5f431e693679e073 100644 index 9c9c9e504cb4db80e760207f6a27fd822a01ca3c..ea119d5f6f29cdb93a5586357375b476caec5655 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1221,7 +1221,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1220,7 +1220,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The * @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value. * length restriction is an implementation specific arbitrary value.
@ -18,7 +18,7 @@ index c5bb58e0bafaf89a8e83ce5452e623ad90c9ae0b..91e2f81b39ff421a7e6e1bef5f431e69
public void setResourcePack(@NotNull String url); public void setResourcePack(@NotNull String url);
/** /**
@@ -1698,6 +1700,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1697,6 +1699,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) { default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName()))); return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
} }

14
patches/api/0044-Add-String-based-Action-Bar-API.patch
View File

@ -5,18 +5,18 @@ 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 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 91e2f81b39ff421a7e6e1bef5f431e693679e073..c41bb4edffda834a596e323f0ab1f191d5d5a4d1 100644 index ea119d5f6f29cdb93a5586357375b476caec5655..9d5c5b5f7d7ae4f0278410833d9d385242872498 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,6 +4,7 @@ import java.net.InetSocketAddress; @@ -3,6 +3,7 @@ package org.bukkit.entity;
import java.util.List; // Paper import java.net.InetSocketAddress;
import java.util.UUID; import java.util.UUID;
import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.Title; // Paper
+import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.Component;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@@ -713,6 +714,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -712,6 +713,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map); public void sendMap(@NotNull MapView map);
// Paper start // Paper start
@ -56,7 +56,7 @@ index 91e2f81b39ff421a7e6e1bef5f431e693679e073..c41bb4edffda834a596e323f0ab1f191
/** /**
* Sends the component to the player * Sends the component to the player
* *
@@ -740,9 +774,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -739,9 +773,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 * Sends an array of components as a single message to the specified screen position of this player
* *
@ -68,7 +68,7 @@ index 91e2f81b39ff421a7e6e1bef5f431e693679e073..c41bb4edffda834a596e323f0ab1f191
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components); spigot().sendMessage(position, components);
} }
@@ -1889,6 +1925,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1888,6 +1924,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/** /**
* Sends the component to the specified screen position of this player * Sends the component to the specified screen position of this player
* *
@ -76,7 +76,7 @@ index 91e2f81b39ff421a7e6e1bef5f431e693679e073..c41bb4edffda834a596e323f0ab1f191
* @param position the screen position * @param position the screen position
* @param component the components to send * @param component the components to send
* @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component} * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
@@ -1901,6 +1938,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1900,6 +1937,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 * Sends an array of components as a single message to the specified screen position of this player
* *

4
patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c41bb4edffda834a596e323f0ab1f191d5d5a4d1..c3d84c7a178fc4d34de40ccb3b3c0319bfcfe4fb 100644 index 9d5c5b5f7d7ae4f0278410833d9d385242872498..2301a5c6ada86b63b1c0207a6d89b0da4c167bbb 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -731,7 +731,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -730,7 +730,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* *
* Use supplied alternative character to the section symbol to represent legacy color codes. * Use supplied alternative character to the section symbol to represent legacy color codes.
* *

4
patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch
View File

@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
+ +
+} +}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c3d84c7a178fc4d34de40ccb3b3c0319bfcfe4fb..2dc16a03701fc4e8a74c5d750a58388924f98498 100644 index 2301a5c6ada86b63b1c0207a6d89b0da4c167bbb..4dc4811d608e51aea3cd2c26beaebc7c25f4b69b 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
/** /**
* Represents a player, connected or not * Represents a player, connected or not
*/ */

4
patches/api/0079-Ability-to-apply-mending-to-XP-API.patch
View File

@ -10,10 +10,10 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added. Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2dc16a03701fc4e8a74c5d750a58388924f98498..f858be54eb7659d4c320e305b82aea6647dcb721 100644 index 4dc4811d608e51aea3cd2c26beaebc7c25f4b69b..30e7cd8e35549022d68e9ca206e55a2537694b14 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -989,12 +989,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -988,12 +988,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
public void resetPlayerWeather(); public void resetPlayerWeather();

6
patches/api/0090-Player.setPlayerProfile-API.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in. This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f858be54eb7659d4c320e305b82aea6647dcb721..d16a606a3752d6ef3a6438eb4d870ae8d410cf24 100644 index 30e7cd8e35549022d68e9ca206e55a2537694b14..d12d7e421eb634a9a3b5e35f8970995ec7786055 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -5,6 +5,7 @@ import java.util.List; // Paper @@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
import java.util.UUID; import java.util.UUID;
import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -17,7 +17,7 @@ index f858be54eb7659d4c320e305b82aea6647dcb721..d16a606a3752d6ef3a6438eb4d870ae8
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@@ -1875,6 +1876,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1874,6 +1875,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/ */
boolean hasResourcePack(); boolean hasResourcePack();

6
patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch
View File

@ -74,10 +74,10 @@ index 58313929f81509030216a0e5e3869da63e11108e..6cf05fed701c67a2c797a4e0839c7958
/** /**
* Checks if this player is whitelisted or not * Checks if this player is whitelisted or not
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d16a606a3752d6ef3a6438eb4d870ae8d410cf24..4264802e21c715f1922fe362a37c28f9287ed303 100644 index d12d7e421eb634a9a3b5e35f8970995ec7786055..09d7ce67f711d48e63d71b6b8f19047aaa09d24d 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -6,6 +6,10 @@ import java.util.UUID; @@ -5,6 +5,10 @@ import java.util.UUID;
import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@ -88,7 +88,7 @@ index d16a606a3752d6ef3a6438eb4d870ae8d410cf24..4264802e21c715f1922fe362a37c28f9
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@@ -715,6 +719,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -714,6 +718,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map); public void sendMap(@NotNull MapView map);
// Paper start // Paper start

4
patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4264802e21c715f1922fe362a37c28f9287ed303..4a950df42c71cb336732807e422ddcacb981e44a 100644 index 09d7ce67f711d48e63d71b6b8f19047aaa09d24d..f42bf3bd0423850e7b7cba75b6c0d1d2c8421de0 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2050,6 +2050,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2049,6 +2049,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param profile The new profile to use * @param profile The new profile to use
*/ */
void setPlayerProfile(@NotNull PlayerProfile profile); void setPlayerProfile(@NotNull PlayerProfile profile);

8
patches/api/0198-Add-Player-Client-Options-API.patch
View File

@ -176,18 +176,18 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4a950df42c71cb336732807e422ddcacb981e44a..935fbfc776e723b2f4a6dd9a49828827d0f59d70 100644 index f42bf3bd0423850e7b7cba75b6c0d1d2c8421de0..768eca64aba4446fc341b71c12ff538169399f76 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/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; @@ -2,6 +2,7 @@ package org.bukkit.entity;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.List; // Paper
import java.util.UUID; import java.util.UUID;
+import com.destroystokyo.paper.ClientOption; // Paper +import com.destroystokyo.paper.ClientOption; // Paper
import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@@ -2070,6 +2071,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2069,6 +2070,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the cooldown counter to 0, effectively starting the cooldown period. * Reset the cooldown counter to 0, effectively starting the cooldown period.
*/ */
void resetCooldown(); void resetCooldown();

4
patches/api/0223-Brand-support.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 935fbfc776e723b2f4a6dd9a49828827d0f59d70..368d14d6ca1ace90f2c999304243b36e204c799b 100644 index 768eca64aba4446fc341b71c12ff538169399f76..95bc3af2b14126caaf2394941ea6cbb60afeac0d 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2205,6 +2205,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2204,6 +2204,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end // Paper end
} }

4
patches/api/0232-Player-elytra-boost-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 368d14d6ca1ace90f2c999304243b36e204c799b..04a3630c80da1bfb986fce9b5ff84faa61511bbb 100644 index 95bc3af2b14126caaf2394941ea6cbb60afeac0d..046476fdfcd9ceecb6e0f314228c3f81ad46ec80 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2077,6 +2077,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2076,6 +2076,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
@NotNull @NotNull
<T> T getClientOption(@NotNull ClientOption<T> option); <T> T getClientOption(@NotNull ClientOption<T> option);

4
patches/api/0261-Add-sendOpLevel-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 04a3630c80da1bfb986fce9b5ff84faa61511bbb..83758e7bd4210056769a8b91a2eb53f28a8aa7fd 100644 index 046476fdfcd9ceecb6e0f314228c3f81ad46ec80..bb3c29cc5121232e93ec8d5a5c308b1f85071f0c 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2090,6 +2090,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2089,6 +2089,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/ */
@Nullable @Nullable
Firework boostElytra(@NotNull ItemStack firework); Firework boostElytra(@NotNull ItemStack firework);

8
patches/api/0276-Expose-Tracked-Players.patch
View File

@ -5,18 +5,18 @@ Subject: [PATCH] Expose Tracked Players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 83758e7bd4210056769a8b91a2eb53f28a8aa7fd..58aabad5eaa2af4b3db03450c7266e8f7d793a55 100644 index bb3c29cc5121232e93ec8d5a5c308b1f85071f0c..97ace842faa16d02d10181bc4ec3a382bc7e4e65 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -1,6 +1,7 @@
package org.bukkit.entity;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.List; // Paper
+import java.util.Set; // Paper +import java.util.Set; // Paper
import java.util.UUID; import java.util.UUID;
import com.destroystokyo.paper.ClientOption; // Paper import com.destroystokyo.paper.ClientOption; // Paper
import com.destroystokyo.paper.Title; // Paper import com.destroystokyo.paper.Title; // Paper
@@ -2103,6 +2104,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -2102,6 +2103,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void sendOpLevel(byte level); void sendOpLevel(byte level);
// Paper end // Paper end

4
patches/api/0314-Add-PlayerKickEvent-causes.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 58aabad5eaa2af4b3db03450c7266e8f7d793a55..446db64cef0dd583f5f2be9d76142eb8ebf81673 100644 index 97ace842faa16d02d10181bc4ec3a382bc7e4e65..3ec1be36b90dbedb8631135555da4b69110e4791 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -241,6 +241,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -240,6 +240,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message * @param message kick message
*/ */
void kick(final @Nullable net.kyori.adventure.text.Component message); void kick(final @Nullable net.kyori.adventure.text.Component message);