Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

cursed rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 09:59:34 -05:00
parent 8336433ff1
commit 7fe89b5a84
167 changed files with 743 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/api/0031-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 365bb7c092cf7f008ba376ae3b511d69431a28f7..4ef8c75df64e670c55f13efaa69651fd636d5f12 100644
index b36fd9bd6b633bb2f8503d1ca19befa8a4936b56..fbef0ab6514f9a2ab1e48e9f973992221ab09552 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -370,7 +370,7 @@ public final class Bukkit {
@@ -72,7 +72,7 @@ index 365bb7c092cf7f008ba376ae3b511d69431a28f7..4ef8c75df64e670c55f13efaa69651fd
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7e138e0b7d9c0ced83911035c1d8a956e432b304..c641822847c8f5c3753fa5a4ea97d86fa44b1fa0 100644
index e2543cfced6cca1f10bcdfe1e28dd889f6ac5c5c..7fa99fadfe5558fddf2aeef51ca824a59a55f7d4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -290,7 +290,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -170,10 +170,10 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241139ba65d 100644
index d26103c4fb0c2d6d99abae962b5ff25d34bd0ab7..c2905745cd54ace5f84b7119692a4ebfd9864d16 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -75,7 +75,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -76,7 +76,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return the friendly name
* @deprecated in favour of {@link #displayName()}
*/
@@ -182,7 +182,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
@NotNull
public String getDisplayName();
@@ -89,7 +89,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -90,7 +90,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param name The new display name.
* @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
*/
@@ -191,7 +191,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void setDisplayName(@Nullable String name);
// Paper start
@@ -130,7 +130,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -131,7 +131,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #playerListName()}
*/
@NotNull
@@ -200,7 +200,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public String getPlayerListName();
/**
@@ -141,7 +141,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -142,7 +142,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param name new player list name
* @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)}
*/
@@ -209,7 +209,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void setPlayerListName(@Nullable String name);
/**
@@ -150,7 +150,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -151,7 +151,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return player list header or null
* @deprecated in favour of {@link #playerListHeader()}
*/
@@ -218,7 +218,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
@Nullable
public String getPlayerListHeader();
@@ -160,7 +160,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -161,7 +161,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return player list header or null
* @deprecated in favour of {@link #playerListFooter()}
*/
@@ -227,7 +227,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
@Nullable
public String getPlayerListFooter();
@@ -170,7 +170,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -171,7 +171,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param header player list header, null for empty
* @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)}
*/
@@ -236,7 +236,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void setPlayerListHeader(@Nullable String header);
/**
@@ -179,7 +179,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -180,7 +180,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param footer player list footer, null for empty
* @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)}
*/
@@ -245,7 +245,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void setPlayerListFooter(@Nullable String footer);
/**
@@ -190,7 +190,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -191,7 +191,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param footer player list footer, null for empty
* @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
*/
@@ -254,7 +254,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/**
@@ -230,7 +230,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -231,7 +231,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message
* @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)}
*/
@@ -263,7 +263,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void kickPlayer(@Nullable String message);
// Paper start
@@ -669,7 +669,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -670,7 +670,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List)}
*/
@@ -272,7 +272,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
@@ -690,7 +690,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -691,7 +691,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List, org.bukkit.DyeColor)}
*/
@@ -281,7 +281,7 @@ index b17e9e446aafc029d70b45fd7879d77cc82d8359..ba1894762ede0af3ba18a4105e12e241
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -1896,7 +1896,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1922,7 +1922,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #locale()}
*/
@NotNull