Deploying to Daydream-API

daydream-api/paper-patches/features/0004-Add-PlayerInteractManager.patch

@@ -198,11 +198,11 @@ index 0000000000000000000000000000000000000000..af8d728a2a8dc1ca0e853da5db6dbb51
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f5d261c01c79b2f6bcbe69e590141a692cf7fae0..00ee81ed102fabc79d12e4c4971faa78f527ad61 100644
+index 01276cc6ba720d8ed593c3820ab26e910d1f3d37..5950a6a9f06f06f8b019ef2319b8379279cdb194 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -63,6 +63,16 @@ import org.jetbrains.annotations.Nullable;
-  */
+@@ -64,6 +64,15 @@ import org.jspecify.annotations.Nullable;
+ @NullMarked
  public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient { // Paper
 
 +    // Daydream start- (feature) Add PlayerInteractManager
@@ -211,10 +211,9 @@ index f5d261c01c79b2f6bcbe69e590141a692cf7fae0..00ee81ed102fabc79d12e4c4971faa78
 +     *
 +     * @return 플레이어의 상호작용 관리자 인스턴스
 +     */
-+    @NotNull
 +    moe.caramel.daydream.player.InteractManager getInteractManager();
 +    // Daydream end- (feature) Add PlayerInteractManager
 +
      // Paper start
      @Override
-     default net.kyori.adventure.identity.@NotNull Identity identity() {
+     default net.kyori.adventure.identity.Identity identity() {

daydream-api/paper-patches/features/0007-Add-more-Advancement-API.patch

@@ -1101,10 +1101,10 @@ index 778946665dfef224f766101e831b254efa3604af..712d2548017f6f0aa484f028b2d43dc4
 +    // Daydream end - (feature) Add more Advancement API
  }
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6429d23052cf44a5603008bb5054c1b805cb5826..25a7f46a246367ce25126589fdfc4b354f297d0c 100644
+index 26d0eaa9edf49703db09442711db6763943de203..0a29c19cf8e04daed2c97323ae7cf7804a1970e7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2510,6 +2510,67 @@ public final class Bukkit {
+@@ -2514,6 +2514,67 @@ public final class Bukkit {
          return server.advancementIterator();
      }
 
@@ -1173,10 +1173,10 @@ index 6429d23052cf44a5603008bb5054c1b805cb5826..25a7f46a246367ce25126589fdfc4b35
       * Creates a new {@link BlockData} instance for the specified Material, with
       * all properties initialized to unspecified defaults.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 48118358de82f0f28a5968ff48e317f7eb1aea9a..ba5d2022c5ebec490b3ac36f5a651acb2cac8559 100644
+index c032c142e6318af7f6cb19e6d59b90079b69b022..8bf8626624a63e996e620823e670a18b0413e340 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2189,6 +2189,57 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2193,6 +2193,57 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      Iterator<Advancement> advancementIterator();
 
@@ -1398,20 +1398,19 @@ index f9bc179da071e7bd57cefc50d6763317fb643b74..1da6a39e7decac009527a24e10b25ad1
 +    // Daydream end - (feature) Add more Advancement API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 00ee81ed102fabc79d12e4c4971faa78f527ad61..e7805f763ae23971ceea36265502257fb0e0b45c 100644
+index 5950a6a9f06f06f8b019ef2319b8379279cdb194..1a760766bea817fd6b3046ceb00cd468c036c99e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3380,6 +3380,46 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @NotNull
-     public AdvancementProgress getAdvancementProgress(@NotNull Advancement advancement);
+@@ -3357,6 +3357,43 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      */
+     public AdvancementProgress getAdvancementProgress(Advancement advancement);
 
 +    // Daydream start - (feature) Add more Advancement API
 +    /**
 +     * 플레이어의 발전 과제 데이터 인스턴스를 가져옵니다.
 +     *
 +     * @return 발전 과제 데이터 인스턴스
 +     */
-+    @NotNull
 +    public moe.caramel.daydream.advancement.PlayerAdvancementData getAdvancementData();
 +
 +    /**
@@ -1421,8 +1420,7 @@ index 00ee81ed102fabc79d12e4c4971faa78f527ad61..e7805f763ae23971ceea36265502257f
 +     * @return 직렬화된 발전 과제 데이터
 +     * @param <T> 데이터 타입
 +     */
-+    @NotNull
-+    public <T> T serializeAdvancementProgress(@NotNull moe.caramel.daydream.advancement.AdvancementFormat<T> format);
++    public <T> T serializeAdvancementProgress(moe.caramel.daydream.advancement.AdvancementFormat<T> format);
 +
 +    /**
 +     * 플레이어의 직렬화된 발전 과제 데이터를 가져옵니다.
@@ -1432,8 +1430,7 @@ index 00ee81ed102fabc79d12e4c4971faa78f527ad61..e7805f763ae23971ceea36265502257f
 +     * @return 직렬화된 발전 과제 데이터
 +     * @param <T> 데이터 타입
 +     */
-+    @NotNull
-+    public <T> T serializeAdvancementProgress(@NotNull moe.caramel.daydream.advancement.AdvancementFormat<T> format, @NotNull org.bukkit.NamespacedKey saveSection);
++    public <T> T serializeAdvancementProgress(moe.caramel.daydream.advancement.AdvancementFormat<T> format, org.bukkit.NamespacedKey saveSection);
 +
 +    /**
 +     * 플레이어에게 발전 과제 알림을 전송합니다.
@@ -1442,7 +1439,7 @@ index 00ee81ed102fabc79d12e4c4971faa78f527ad61..e7805f763ae23971ceea36265502257f
 +     * @param title 표시할 제목
 +     * @param frame 표시할 프레임
 +     */
-+    public void sendAdvancementAlert(@NotNull ItemStack item, @NotNull net.kyori.adventure.text.Component title, @NotNull io.papermc.paper.advancement.AdvancementDisplay.Frame frame);
++    public void sendAdvancementAlert(ItemStack item, net.kyori.adventure.text.Component title, io.papermc.paper.advancement.AdvancementDisplay.Frame frame);
 +    // Daydream end - (feature) Add more Advancement API
 +
      /**

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

@@ -972,10 +972,10 @@ 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 25a7f46a246367ce25126589fdfc4b354f297d0c..c47c6fdfb17bff93d7b3041b5b4ec258fe9ac206 100644
+index 0a29c19cf8e04daed2c97323ae7cf7804a1970e7..cad115a87bf3341dbe47cabf8c443f23c158f449 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -3096,6 +3096,20 @@ public final class Bukkit {
+@@ -3100,6 +3100,20 @@ public final class Bukkit {
      }
      // Daydream end - Add Individual Sidebar API
 
@@ -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 ba5d2022c5ebec490b3ac36f5a651acb2cac8559..ea1b6f2b69a4e4c299eab857b68cc37f56d3ce53 100644
+index 8bf8626624a63e996e620823e670a18b0413e340..362af8763909b8a06017e246cbd725462faeeacb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2762,4 +2762,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2766,4 +2766,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      @NotNull
      moe.caramel.daydream.sidebar.SidebarProcessor sidebarProcessor();
      // Daydream end - Add Individual Sidebar API
@@ -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 e7805f763ae23971ceea36265502257fb0e0b45c..065888eefc711bcfa9d68d80d754d5b8b09f8107 100644
+index 1a760766bea817fd6b3046ceb00cd468c036c99e..581082734f0741797086fe43921bea3d0fee845c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1096,6 +1096,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1088,6 +1088,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
-     public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
+     public void sendEquipmentChange(LivingEntity entity, Map<EquipmentSlot, ItemStack> items);
 
 +    // Daydream start - (feature) Add Packet API
 +    /**
@@ -1094,21 +1094,21 @@ index e7805f763ae23971ceea36265502257fb0e0b45c..065888eefc711bcfa9d68d80d754d5b8
 +     * @deprecated {@link Player#sendPacket(moe.caramel.daydream.packet.Packet)}를 사용해주세요
 +     */
 +    @Deprecated
-+    public void sendRawPacket(@NotNull Object nmsPacket);
++    public void sendRawPacket(Object nmsPacket);
 +
 +    /**
 +     * 플레이어에게 패킷을 전송합니다.
 +     *
 +     * @param packet 패킷 인스턴스
 +     */
-+    public void sendPacket(@NotNull moe.caramel.daydream.packet.Packet packet);
++    public void sendPacket(moe.caramel.daydream.packet.Packet packet);
 +
 +    /**
 +     * 플레이어 및 플레이어를 트래킹하고 있는 플레이어에게 패킷을 전송합니다.
 +     *
 +     * @param packet 패킷 인스턴스
 +     */
-+    public void sendAndBroadcastPacket(@NotNull moe.caramel.daydream.packet.Packet packet);
++    public void sendAndBroadcastPacket(moe.caramel.daydream.packet.Packet packet);
 +    // Daydream end - (feature) Add Packet API
 +
      // Paper start

daydream-api/paper-patches/features/0012-Add-Client-Detector.patch

@@ -123,10 +123,10 @@ index 0000000000000000000000000000000000000000..963d3aa970ef24bafd2aaa17bde4b8c2
 +    NEOFORGE,
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 065888eefc711bcfa9d68d80d754d5b8b09f8107..46e9eedf74a14986115e691120c00900a6c80b75 100644
+index 581082734f0741797086fe43921bea3d0fee845c..f38781d05c4a2674afa1df7e185af6a72ef787b2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3877,6 +3877,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3846,6 +3846,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 
@@ -139,7 +139,6 @@ index 065888eefc711bcfa9d68d80d754d5b8b09f8107..46e9eedf74a14986115e691120c00900
 +     *
 +     * @return 클라이언트의 종류
 +     */
-+    @NotNull
 +    moe.caramel.daydream.player.ClientType getClientType();
 +    // Daydream end - (feature) Add Client Detector
 +

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

@@ -47,10 +47,10 @@ index 0000000000000000000000000000000000000000..5282d9353d8629f025ae89518fa07960
 +    UnsafeValues getUnsafe();
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c47c6fdfb17bff93d7b3041b5b4ec258fe9ac206..31c3c0c212a2c6438a5bccea6a759292ebbdd7a3 100644
+index cad115a87bf3341dbe47cabf8c443f23c158f449..eb3a47d8a66d319b83714ab62255015e38e16058 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2211,7 +2211,7 @@ public final class Bukkit {
+@@ -2215,7 +2215,7 @@ public final class Bukkit {
       */
      @NotNull
      public static ItemFactory getItemFactory() {
@@ -59,7 +59,7 @@ index c47c6fdfb17bff93d7b3041b5b4ec258fe9ac206..31c3c0c212a2c6438a5bccea6a759292
      }
 
      /**
-@@ -2739,7 +2739,7 @@ public final class Bukkit {
+@@ -2743,7 +2743,7 @@ public final class Bukkit {
      @Deprecated(since = "1.7.2")
      @NotNull
      public static UnsafeValues getUnsafe() {

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

@@ -19,7 +19,7 @@
      /**
       * Writes loaded players to disk.
       */
-@@ -2975,6 +_,18 @@
+@@ -2979,6 +_,18 @@
          return server.isGlobalTickThread();
      }
      // Paper end - Folia region threading API

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

@@ -17,7 +17,7 @@
      /**
       * Writes loaded players to disk.
       */
-@@ -2330,6 +_,14 @@
+@@ -2334,6 +_,14 @@
          }
          // Paper end
 
@@ -32,7 +32,7 @@
          /**
           * Sends the component to the player
           *
-@@ -2654,4 +_,14 @@
+@@ -2658,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/entity/HumanEntity.java.patch

@@ -1,7 +1,7 @@
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -66,6 +_,15 @@
-     @NotNull
+@@ -63,6 +_,15 @@
+      */
      public MainHand getMainHand();
 
 +    // Daydream start - Settable Player Arm
@@ -10,16 +10,16 @@
 +     *
 +     * @param mainHand 주로 사용하는 손
 +     */
-+    public void setMainHand(@NotNull MainHand mainHand);
++    public void setMainHand(MainHand mainHand);
 +    // Daydream end - Settable Player Arm
 +
      /**
       * If the player currently has an inventory window open, this method will
       * set a property of that window, such as the state of a progress bar.
-@@ -387,6 +_,32 @@
+@@ -381,6 +_,32 @@
       * @throws IllegalArgumentException if the material is not an item
       */
-     public void setCooldown(@NotNull Material material, int ticks);
+     public void setCooldown(Material material, int ticks);
 +
 +    // Daydream start - Add Group cooldown methods
 +    /**
@@ -28,23 +28,23 @@
 +     * @param cooldownGroup 쿨다운 그룹
 +     * @return 쿨다운을 가지고 있다면 {@code true}
 +     */
-+    public boolean hasCooldown(@NotNull NamespacedKey cooldownGroup);
++    public boolean hasCooldown(NamespacedKey cooldownGroup);
 +
 +    /**
 +     * 이 그룹에 대한 쿨다운 틱을 가져옵니다.
 +     *
 +     * @param cooldownGroup 쿨다운 그룹
 +     * @return 남은 쿨다운 틱 시간
 +     */
-+    public int getCooldown(@NotNull NamespacedKey cooldownGroup);
++    public int getCooldown(NamespacedKey cooldownGroup);
 +
 +    /**
 +     * 이 그룹에 대한 쿨다운 시간을 설정합니다.
 +     *
 +     * @param cooldownGroup 쿨다운 그룹
 +     * @param ticks 쿨다운 틱 시간
 +     */
-+    public void setCooldown(@NotNull NamespacedKey cooldownGroup, int ticks);
++    public void setCooldown(NamespacedKey cooldownGroup, int ticks);
 +    // Daydream end - Add Group cooldown methods
 
      // Paper start

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

@@ -1,30 +1,29 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -469,6 +_,23 @@
+@@ -465,6 +_,22 @@
       */
-     public boolean performCommand(@NotNull String command);
+     public boolean performCommand(String command);
 
 +    // Daydream start - Add more Chat API
 +    /**
 +     * 플레이어의 채팅 세션을 가져옵니다.
 +     *
 +     * @return 플레이어의 채팅 세션
 +     */
-+    @Nullable
-+    public moe.caramel.daydream.player.chat.ChatSession getChatSession();
++    public moe.caramel.daydream.player.chat.@Nullable ChatSession getChatSession();
 +
 +    /**
 +     * 플레이어의 채팅 세션을 설정합니다.
 +     *
 +     * @param session 플레이어의 채팅 세션
 +     */
-+    public void setChatSession(final @NotNull moe.caramel.daydream.player.chat.ChatSession session);
++    public void setChatSession(moe.caramel.daydream.player.chat.ChatSession session);
 +    // Daydream end - Add more Chat API
 +
      /**
       * Returns true if the entity is supported by a block.
       *
-@@ -1779,6 +_,24 @@
+@@ -1761,6 +_,24 @@
      @Nullable
      public GameMode getPreviousGameMode();
 
@@ -49,7 +48,7 @@
      /**
       * Sets the current time on the player's client. When relative is true the
       * player's time will be kept synchronized to its world time with the
-@@ -2041,6 +_,22 @@
+@@ -2023,6 +_,22 @@
       */
      public void setAllowFlight(boolean flight);
 
@@ -72,7 +71,7 @@
      // Paper start - flying fall damage
      /**
       * Allows you to enable fall damage while {@link #getAllowFlight()} is {@code true}
-@@ -2819,6 +_,23 @@
+@@ -2800,6 +_,23 @@
      }
      // Paper end - more resource pack API
 
@@ -82,21 +81,21 @@
 +     *
 +     * @return 리소스팩 목록
 +     */
-+    @NotNull Collection<? extends moe.caramel.daydream.player.ResourcePack> getAppliedResourcePacks();
++    Collection<? extends moe.caramel.daydream.player.ResourcePack> getAppliedResourcePacks();
 +
 +    /**
 +     * 리소스팩 적용 상태를 가져옵니다.
 +     *
 +     * @param uuid 리소스팩의 고유 ID
 +     * @return 적용을 하지 않았거나, 클라이언트에게 응답을 받지 않은 경우 {@code null}을 반환할 수도 있습니다.
 +     */
-+    @Nullable org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus(@NotNull UUID uuid);
++    org.bukkit.event.player.PlayerResourcePackStatusEvent.@Nullable Status getResourcePackStatus(UUID uuid);
 +    // Daydream end - Add more ResourcePack API
 +
      /**
       * Request that the player's client download and include another resource pack.
       * <p>
-@@ -3501,6 +_,16 @@
+@@ -3478,6 +_,15 @@
          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())));
      }
      // Paper end
@@ -107,7 +106,6 @@
 +     *
 +     * @return Mojang 프로필
 +     */
-+    @NotNull
 +    com.mojang.authlib.GameProfile getProfile();
 +    // Daydream end - Expose Player mojang profile
 

gradle.properties

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