#20240630.0

gradle.properties

@@ -3,7 +3,7 @@ version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
 
-paperCommit = dd49fba8c534d48c3693a751075ecb5836a9d458
+paperCommit = 1f5db504244fe6563ab32cee646dad0c53360e01
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/0023-Add-Event-Metadata-API.patch → patches/0005-Add-more-Event-API.patch

@@ -1,18 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LemonCaramel <[email protected]>
 Date: Sun, 9 Apr 2023 14:33:20 +0900
-Subject: [PATCH] Add Event Metadata API
+Subject: [PATCH] Add more Event API
 
 
 diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
-index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..7791aa0ca77acbfc9486c7ca04078f8613465d5f 100644
+index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..3df96b64ad5ce31a69229f6fd14ca750f041e422 100644
 --- a/src/main/java/org/bukkit/event/Event.java
 +++ b/src/main/java/org/bukkit/event/Event.java
-@@ -51,6 +51,20 @@ public abstract class Event {
+@@ -51,6 +51,29 @@ public abstract class Event {
      }
      // Paper end
 
-+    // Daydream start - Add Event Metadata API
++    // Daydream start - Add more Event API
 +    private final java.util.Map<String, Object> metadata = new java.util.HashMap<>();
 +
 +    /**
@@ -24,7 +24,16 @@ index 8ec56cd6b8e0f5c5dd8c7c88b4671e18dcf109d0..7791aa0ca77acbfc9486c7ca04078f86
 +    public java.util.Map<String, Object> getEventMetadata() {
 +        return metadata;
 +    }
-+    // Daydream end - Add Event Metadata API
++
++    /**
++     * 이 이벤트가 인터럽트를 지원하는지 여부를 가져옵니다.
++     *
++     * @return 인터럽트 지원 여부
++     */
++    public boolean isSupportInterrupt() {
++        return false;
++    }
++    // Daydream end - Add more Event API
 +
      /**
       * Convenience method for providing a user-friendly identifier. By

patches/0005-Add-more-Player-API.patch → patches/0006-Add-more-Player-API.patch

@@ -67,18 +67,20 @@ index 7411f58f9f36beaadcc47c2264a4af313956ee03..201fe24d393beb8d0be4c4212aff5643
      public HandlerList getHandlers() {
 diff --git a/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java b/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..96b35864b50695c27f22005aa5581e5c2bc38735
+index 0000000000000000000000000000000000000000..694fbd96528244bc24f9116bd2cc78eb6214c1a0
 --- /dev/null
 +++ b/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,106 @@
 +package moe.caramel.daydream.event.player;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
 +import com.mojang.authlib.GameProfile;
++import net.kyori.adventure.text.Component;
 +import org.bukkit.event.Event;
 +import org.bukkit.event.HandlerList;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
 +import java.net.InetAddress;
 +import java.util.UUID;
 +
@@ -95,11 +97,18 @@ index 0000000000000000000000000000000000000000..96b35864b50695c27f22005aa5581e5c
 +    public @NotNull HandlerList getHandlers() { return HANDLER_LIST; }
 +    public static @NotNull HandlerList getHandlerList() { return HANDLER_LIST; }
 +
++    private @Nullable net.kyori.adventure.text.Component disconnectMessage;
++
 +    @ApiStatus.Internal
 +    public AsyncPlayerDataPreLoadEvent() {
 +        super(true);
 +    }
 +
++    @Override
++    public final boolean isSupportInterrupt() {
++        return true;
++    }
++
 +    /**
 +     * 플레이어의 프로필을 가져옵니다.
 +     *
@@ -146,6 +155,27 @@ index 0000000000000000000000000000000000000000..96b35864b50695c27f22005aa5581e5c
 +     */
 +    @NotNull
 +    public abstract InetAddress getAddress();
++
++    /**
++     * 연결 해제 메시지를 가져옵니다. 메시지가 설정되지 않은 경우
++     * 플레이어의 연결을 해제하지 않습니다.
++     *
++     * @return 연결 해제 메시지
++     */
++    @Nullable
++    public final Component getDisconnectMessage() {
++        return disconnectMessage;
++    }
++
++    /**
++     * 연결 해제 메시지를 설정합니다. 메시지가 설정되지 않은 경우
++     * 플레이어의 연결을 해제하지 않습니다.
++     *
++     * @param disconnectMessage 연결 해제 메시지
++     */
++    public final void setDisconnectMessage(final @Nullable Component disconnectMessage) {
++        this.disconnectMessage = disconnectMessage;
++    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 7c56182acaf827f4b1a986a61cea8e9960604c98..83517098f9523c6c9d6a20991297d1e71f3aa9a8 100644