Updated Upstream (Bukkit/CraftBukkit) (#8270)

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: d43a1e72 SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 9d6e4847 SPIGOT-7122: New Allay Methods from 1.19.1 CraftBukkit Changes: c379a6b4e SPIGOT-2450: Improve scoreboard criteria API, add missing DisplaySlots 051fcced1 SPIGOT-7122: New Allay Methods from 1.19.1
2025-08-01 04:32:11 -07:00 · 2022-08-09 09:18:08 +02:00
parent eb5b0d0edf
commit d4b4d5b95b
8 changed files with 154 additions and 64 deletions
--- a/patches/api/Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/Add-missing-team-sidebar-display-slots.patch
@@ -18,7 +18,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 public enum DisplaySlot {
 -    BELOW_NAME,
 -    PLAYER_LIST,
-    SIDEBAR;
+-    SIDEBAR,
+-    SIDEBAR_BLACK,
+-    SIDEBAR_DARK_BLUE,
+-    SIDEBAR_DARK_GREEN,
+-    SIDEBAR_DARK_AQUA,
+-    SIDEBAR_DARK_RED,
+-    SIDEBAR_DARK_PURPLE,
+-    SIDEBAR_GOLD,
+-    SIDEBAR_GRAY,
+-    SIDEBAR_DARK_GRAY,
+-    SIDEBAR_BLUE,
+-    SIDEBAR_GREEN,
+-    SIDEBAR_AQUA,
+-    SIDEBAR_RED,
+-    SIDEBAR_LIGHT_PURPLE,
+-    SIDEBAR_YELLOW,
+-    SIDEBAR_WHITE;
 +    // Paper start
 +    BELOW_NAME("belowName"),
 +    PLAYER_LIST("list"),
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -4288,8 +4288,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     characters.
 +     * @throws IllegalArgumentException if an objective by that name already
 +     *     exists
+     * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
 +     */
 +    @NotNull
+    @Deprecated
 +    Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @Nullable net.kyori.adventure.text.Component displayName) throws IllegalArgumentException;
 +    /**
 +     * Registers an Objective on this Scoreboard
@@ -4309,18 +4311,57 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @throws IllegalArgumentException if renderType is null
 +     * @throws IllegalArgumentException if an objective by that name already
 +     *     exists
+     * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
+     */
+    @NotNull
+    @Deprecated
+    Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @Nullable net.kyori.adventure.text.Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
+    /**
+     * Registers an Objective on this Scoreboard
+     *
+     * @param name Name of the Objective
+     * @param criteria Criteria for the Objective
+     * @param displayName Name displayed to players for the Objective.
+     * @return The registered Objective
+     * @throws IllegalArgumentException if name is null
+     * @throws IllegalArgumentException if name is longer than 32767
+     *     characters.
+     * @throws IllegalArgumentException if criteria is null
+     * @throws IllegalArgumentException if displayName is null
+     * @throws IllegalArgumentException if displayName is longer than 128
+     *     characters.
+     * @throws IllegalArgumentException if an objective by that name already
+     *     exists
+     */
+    @NotNull
+    Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @Nullable net.kyori.adventure.text.Component displayName) throws IllegalArgumentException;
+    /**
+     * Registers an Objective on this Scoreboard
+     *
+     * @param name Name of the Objective
+     * @param criteria Criteria for the Objective
+     * @param displayName Name displayed to players for the Objective.
+     * @param renderType Manner of rendering the Objective
+     * @return The registered Objective
+     * @throws IllegalArgumentException if name is null
+     * @throws IllegalArgumentException if name is longer than 32767
+     *     characters.
+     * @throws IllegalArgumentException if criteria is null
+     * @throws IllegalArgumentException if displayName is null
+     * @throws IllegalArgumentException if displayName is longer than 128
+     *     characters.
+     * @throws IllegalArgumentException if renderType is null
+     * @throws IllegalArgumentException if an objective by that name already
+     *     exists
 +     */
 +    @NotNull
-+    Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @Nullable net.kyori.adventure.text.Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
+    Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @Nullable net.kyori.adventure.text.Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
 +    // Paper end
 
     /**
      * Registers an Objective on this Scoreboard
@@ -0,0 +0,0 @@ public interface Scoreboard {
-      *     characters.
-      * @throws IllegalArgumentException if an objective by that name already
-      *     exists
-+     * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component)}
+      * @deprecated use {@link #registerNewObjective(String, Criteria, String)}
      */
     @NotNull
 +    @Deprecated // Paper
@@ -4328,15 +4369,34 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 
     /**
@@ -0,0 +0,0 @@ public interface Scoreboard {
-      * @throws IllegalArgumentException if renderType is null
-      * @throws IllegalArgumentException if an objective by that name already
-      *     exists
-+     * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component, RenderType)}
+      * @deprecated use {@link #registerNewObjective(String, Criteria, String, RenderType)}
      */
     @NotNull
 +    @Deprecated // Paper
     Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
 
+     /**
+@@ -0,0 +0,0 @@ public interface Scoreboard {
+      *     characters.
+      * @throws IllegalArgumentException if an objective by that name already
+      *     exists
+     * @deprecated in favour of {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
+      */
+     @NotNull
+    @Deprecated // Paper
+     Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @NotNull String displayName) throws IllegalArgumentException;
+ 
+     /**
+@@ -0,0 +0,0 @@ public interface Scoreboard {
+      * @throws IllegalArgumentException if renderType is null
+      * @throws IllegalArgumentException if an objective by that name already
+      *     exists
+     * @deprecated in favour of {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
+      */
+     @NotNull
+    @Deprecated // Paper
+     Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @NotNull String displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
+ 
     /**
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644