Deploying to Daydream-API

daydream-api/paper-patches/features/0002-Add-Brigadier-Command-API.patch

@@ -1067,7 +1067,7 @@ index 0000000000000000000000000000000000000000..b21df77a52d31e7e0c38b33a6d77808a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 79237fa43eb425a26d03724caff6af0f736ba9db..6429d23052cf44a5603008bb5054c1b805cb5826 100644
+index 5677883497844477c50133d14ca0c95a2b281007..2f3edce4e3e17d4a17d817da563a442ede0a629d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1106,6 +1106,41 @@ public final class Bukkit {
@@ -1113,7 +1113,7 @@ index 79237fa43eb425a26d03724caff6af0f736ba9db..6429d23052cf44a5603008bb5054c1b8
       * Writes loaded players to disk.
       */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bc6f0a8f77d4d494bfec5f3e9c47fabe41037a6b..48118358de82f0f28a5968ff48e317f7eb1aea9a 100644
+index 58e369a965001f118940372cbfed09d1753fce95..4f07da031693620534edfdfadf143cf0b867022d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -980,6 +980,35 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1180,11 +1180,11 @@ index 83193bfd215d9e0c6ed896480b2d4e35b0e4333d..faf4524f47a074c61962f62b948a0cf4
       * Sets the list of aliases to request on registration for this command.
       * This is not effective outside of defining aliases in the {@link
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index a04100646040c0342f219e489a0a6b8c46f219e5..97e2c3ad70a6d59ced5f9b7d358c0c95ae73b36e 100644
+index fa65a03ec8fa3b57086aae3b9fa317c39d5bbba3..cd38488118444fc1fb3377656ad1b4e5bf1f5bae 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -362,6 +362,38 @@ public abstract class JavaPlugin extends PluginBase {
-         }
+@@ -440,6 +440,36 @@ public abstract class JavaPlugin extends PluginBase {
+         });
      }
 
 +    // Daydream start - (feature) Add Brigadier Command API
@@ -1193,7 +1193,7 @@ index a04100646040c0342f219e489a0a6b8c46f219e5..97e2c3ad70a6d59ced5f9b7d358c0c95
 +     *
 +     * @param command 명령어 노드
 +     */
-+    public void registerCommand(@NotNull moe.caramel.daydream.brigadier.BrigadierCommand command) {
++    public void registerCommand(final moe.caramel.daydream.brigadier.BrigadierCommand command) {
 +        this.getServer().registerCommand(this, command);
 +    }
 +
@@ -1203,8 +1203,7 @@ index a04100646040c0342f219e489a0a6b8c46f219e5..97e2c3ad70a6d59ced5f9b7d358c0c95
 +     * @param commands 명령어 레이블 배열
 +     * @return 제거에 성공한 명령어 목록
 +     */
-+    @NotNull
-+    public List<String> unregisterCommands(@NotNull String... commands) {
++    public List<String> unregisterCommands(final String... commands) {
 +        return this.getServer().unregisterCommands(this, commands);
 +    }
 +
@@ -1213,7 +1212,6 @@ index a04100646040c0342f219e489a0a6b8c46f219e5..97e2c3ad70a6d59ced5f9b7d358c0c95
 +     *
 +     * @return 제거에 성공한 명령어 목록
 +     */
-+    @NotNull
 +    public List<String> unregisterAllCommands() {
 +        return this.getServer().unregisterAllCommands(this);
 +    }

daydream-api/paper-patches/features/0003-Add-more-Damage-API.patch

@@ -142,10 +142,10 @@ index 4ab29ec24aeb31af9168cc158033d599693d7729..2f3937e00bf83de7467c391abe589d5a
 +    @NotNull moe.caramel.daydream.world.DamageContext getDamageContext(@NotNull Object damageSource); // Daydream - (feature) Add more Damage API
  }
 diff --git a/src/main/java/org/bukkit/damage/DamageSource.java b/src/main/java/org/bukkit/damage/DamageSource.java
-index 7635610e56c051ce3c8a876911ba5cd0a9248496..1ba69a8c73a58b53d23bcc395fb8c92c9041c8ae 100644
+index 54fa3ebe541aa45829c672ea1a96296b123da48e..66574f2ccb4b16332dcd9e235021a7fcf6cd60a8 100644
 --- a/src/main/java/org/bukkit/damage/DamageSource.java
 +++ b/src/main/java/org/bukkit/damage/DamageSource.java
-@@ -13,6 +13,44 @@ import org.jetbrains.annotations.Nullable;
+@@ -13,6 +13,23 @@ import org.jetbrains.annotations.Nullable;
  @ApiStatus.Experimental
  public interface DamageSource {
 
@@ -164,27 +164,6 @@ index 7635610e56c051ce3c8a876911ba5cd0a9248496..1ba69a8c73a58b53d23bcc395fb8c92c
 +     * @return 크리티컬 대미지 여부
 +     */
 +    boolean isCritical();
-+
-+    /**
-+     * 검에 의한 쓸기 공격 여부를 가져옵니다.
-+     *
-+     * @return 쓸기 공격 여부
-+     */
-+    boolean isSweep();
-+
-+    /**
-+     * 눈골렘이 녹아 발생한 대미지인지 확인합니다.
-+     *
-+     * @return 눈골렘이 녹아 발생한 대미지 여부
-+     */
-+    boolean isMelting();
-+
-+    /**
-+     * 독 포션에 의한 대미지인지 확인합니다.
-+     *
-+     * @return 독 포션에 의한 대미지 여부
-+     */
-+    boolean isPoison();
 +    // Daydream end - (feature) Add more Damage API
 +
      /**

daydream-api/paper-patches/features/0008-Add-Packet-API.patch

@@ -972,7 +972,7 @@ index 0000000000000000000000000000000000000000..257c535f5b0802f2289df1ee3eb2b2cf
 +    SetPlayerTeamPacket createTeamJoinOrLeavePacket(String teamName, Collection<String> players, boolean join);
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0a29c19cf8e04daed2c97323ae7cf7804a1970e7..cad115a87bf3341dbe47cabf8c443f23c158f449 100644
+index 3ec6eff4eeac6df1ebb88799083606e5c7320332..ca8d342043359768d052d2ec0812cda426e0d65d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -3100,6 +3100,20 @@ public final class Bukkit {
@@ -993,9 +993,9 @@ index 0a29c19cf8e04daed2c97323ae7cf7804a1970e7..cad115a87bf3341dbe47cabf8c443f23
 +    }
 +    // Daydream end - (feature) Add Packet API
 +
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
+     /**
+      * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
+      */
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
 index 918a045165cdcde264bc24082b7afebb407271de..893f1e80871e67d427c379410a83ecd88bc2b8ac 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
@@ -1012,10 +1012,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..893f1e80871e67d427c379410a83ecd8
      /**
       * Represents black
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8bf8626624a63e996e620823e670a18b0413e340..362af8763909b8a06017e246cbd725462faeeacb 100644
+index f2728d1405b51cc557a167076395c92e157f37a5..207901b74916f2c9d1de4f7007ec3e5a3fa8a370 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2766,4 +2766,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2806,4 +2806,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      moe.caramel.daydream.sidebar.SidebarProcessor sidebarProcessor();
      // Daydream end - Add Individual Sidebar API
@@ -1033,10 +1033,10 @@ index 8bf8626624a63e996e620823e670a18b0413e340..362af8763909b8a06017e246cbd72546
 +    // Daydream end - (feature) Add Packet API
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d95349839e47465826bab456d7fd414a2a96d40d..294aa555e0bc88390bbab070466abc70940cfd5f 100644
+index 9c733d81f5f45db6d85f3e4137b042a18b6a6c2c..8ca48edbef4c6a62eaf6c6f98854cfc7d6449a05 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1627,6 +1627,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1650,6 +1650,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      public Entity getEntity(@NotNull java.util.UUID uuid);
      // Paper end
 
@@ -1055,7 +1055,7 @@ index d95349839e47465826bab456d7fd414a2a96d40d..294aa555e0bc88390bbab070466abc70
       * Returns a list of entities within a bounding box centered around a
       * Location.
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6fba6948e937b079bedf3cc08d7659cf50c927d5..6e65ebccf9c037dba1179dfb697ce56580589d3d 100644
+index 3e79bed26e80cce9d6e8d3dc480d64d832dba330..44f29fec99f831c2f36c957c46256e622eb7fd15 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -591,6 +591,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1079,12 +1079,12 @@ index 6fba6948e937b079bedf3cc08d7659cf50c927d5..6e65ebccf9c037dba1179dfb697ce565
       * Gets the amount of ticks this entity has lived for.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1a760766bea817fd6b3046ceb00cd468c036c99e..581082734f0741797086fe43921bea3d0fee845c 100644
+index d31af376315e7e495e92fb915758c4a4a4f07794..8b92924a193cffdf3a203683087cd960cc3693d9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1088,6 +1088,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
-     public void sendEquipmentChange(LivingEntity entity, Map<EquipmentSlot, ItemStack> items);
+     public void sendEquipmentChange(LivingEntity entity, Map<EquipmentSlot, @Nullable ItemStack> items);
 
 +    // Daydream start - (feature) Add Packet API
 +    /**

daydream-api/paper-patches/features/0009-Add-more-Explosion-API.patch

@@ -194,10 +194,10 @@ index de260586b1d92d943039b03777ff3667b7883a50..dbaf0d58ed60c308fd5822e559c224fe
      /**
       * Returns whether or not this tag has an entry for the specified item.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 294aa555e0bc88390bbab070466abc70940cfd5f..f697a1ed59a8c074ba4ee13db7204675783c0d59 100644
+index 8ca48edbef4c6a62eaf6c6f98854cfc7d6449a05..087e59ad3921b60912f94f839d0e10ffcfb9fcf1 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2160,6 +2160,246 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2183,6 +2183,246 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       */
      public int getClearWeatherDuration();
 

daydream-api/paper-patches/features/0014-Add-Early-Loader.patch

@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..5282d9353d8629f025ae89518fa07960
 +    UnsafeValues getUnsafe();
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index cad115a87bf3341dbe47cabf8c443f23c158f449..eb3a47d8a66d319b83714ab62255015e38e16058 100644
+index ca8d342043359768d052d2ec0812cda426e0d65d..feae9a160b02dae258d9fa965c081253562f9c9a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2215,7 +2215,7 @@ public final class Bukkit {
@@ -69,10 +69,10 @@ index cad115a87bf3341dbe47cabf8c443f23c158f449..eb3a47d8a66d319b83714ab62255015e
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 325d74a4e5886e3af57ba7075541190a7bd813e6..31d23f5228e012661bd0f1b58f5b1f1c31011b53 100644
+index b896e40bdf1e6b0c34a65863c934432ce25210ad..63f1909cd4938f5fcf147dfc76a2b15c914ae20e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -764,7 +764,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -780,7 +780,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       */
      @NotNull
      public ItemStack enchantWithLevels(final @org.jetbrains.annotations.Range(from = 1, to = 30) int levels, final boolean allowTreasure, final @NotNull java.util.Random random) {
@@ -81,7 +81,7 @@ index 325d74a4e5886e3af57ba7075541190a7bd813e6..31d23f5228e012661bd0f1b58f5b1f1c
      }
 
      /**
-@@ -787,7 +787,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -803,7 +803,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      @NotNull
      @Override
      public net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowItem> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowItem> op) {
@@ -90,7 +90,7 @@ index 325d74a4e5886e3af57ba7075541190a7bd813e6..31d23f5228e012661bd0f1b58f5b1f1c
      }
 
      /**
-@@ -796,7 +796,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -812,7 +812,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * @return display name of the {@link ItemStack}
       */
      public net.kyori.adventure.text.@NotNull Component displayName() {
@@ -99,7 +99,7 @@ index 325d74a4e5886e3af57ba7075541190a7bd813e6..31d23f5228e012661bd0f1b58f5b1f1c
      }
 
      /**
-@@ -820,7 +820,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -836,7 +836,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       */
      @NotNull
      public ItemStack ensureServerConversions() {
@@ -108,7 +108,7 @@ index 325d74a4e5886e3af57ba7075541190a7bd813e6..31d23f5228e012661bd0f1b58f5b1f1c
      }
 
      /**
-@@ -944,7 +944,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -960,7 +960,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      @Nullable
      @Deprecated
      public String getI18NDisplayName() {

daydream-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch

@@ -36,5 +36,5 @@
 +    }
 +    // Daydream end - Add Individual Sidebar API
 
-     @NotNull
-     public static Server.Spigot spigot() {
+     /**
+      * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.

daydream-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch

@@ -17,7 +17,7 @@
      /**
       * Writes loaded players to disk.
       */
-@@ -2334,6 +_,14 @@
+@@ -2362,6 +_,14 @@
          }
          // Paper end
 
@@ -32,7 +32,7 @@
          /**
           * Sends the component to the player
           *
-@@ -2658,4 +_,14 @@
+@@ -2698,4 +_,14 @@
       */
      void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
      // Paper end - API to check if the server is sleeping

daydream-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3452,6 +_,38 @@
+@@ -3477,6 +_,38 @@
       */
      void playSound(@NotNull Location location, @NotNull String sound, @NotNull SoundCategory category, float volume, float pitch);
 

daydream-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -70,6 +_,93 @@
+@@ -86,6 +_,93 @@
      }
      // Paper end - pdc
 

gradle.properties

@@ -3,7 +3,7 @@ version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
 
-paperCommit = edacfdf4624735d093413e64b4efd192f72d844e
+paperCommit = 0a6e7435b319d658e60d437f092481f51e7f7ece
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true