#20241128.0

gradle.properties

@@ -3,7 +3,7 @@ version = 1.21.1-R0.1-SNAPSHOT
 
 mcVersion = 1.21.1
 
-paperCommit = 84281ceeefb9d294758a9a292ba6c01da40e8409
+paperCommit = b48403bd69f534ffd43fe2afb4e8e1f1ffa95fe1
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -65,10 +65,10 @@ index 42a82ce2316a4aad2883d24c7e2ff95d95f5881a..5c3fc1707df4c921ddb01d3474e4f7db
          return HANDLER_LIST;
 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..18cd85f6c3a8eb7be560b5ca0b46dbfef6e9e6c2
+index 0000000000000000000000000000000000000000..29995bdec5a0be63f6595e67d1d7b4963426e92d
 --- /dev/null
 +++ b/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,117 @@
 +package moe.caramel.daydream.event.player;
 +
 +import com.destroystokyo.paper.profile.PlayerProfile;
@@ -105,6 +105,13 @@ index 0000000000000000000000000000000000000000..18cd85f6c3a8eb7be560b5ca0b46dbfe
 +    }
 +
 +    /**
++     * 플레이어의 원본 프로필을 가져옵니다.
++     *
++     * @return 플레이어의 원본 프로필
++     */
++    public abstract GameProfile getOriginalGameProfile();
++
++    /**
 +     * 플레이어의 프로필을 가져옵니다.
 +     *
 +     * @return 플레이어의 프로필
@@ -115,7 +122,7 @@ index 0000000000000000000000000000000000000000..18cd85f6c3a8eb7be560b5ca0b46dbfe
 +     * 플레이어의 프로필을 가져옵니다.
 +     *
 +     * @deprecated 메서드를 호출할 때마다 새로운 프로필 미러가 생성됩니다.
-+     * {@link #getGameProfile()}를 사용하세요.
++     * {@link #getOriginalGameProfile()}를 사용하세요.
 +     * @return 플레이어의 프로필
 +     */
 +    @Deprecated
@@ -127,7 +134,7 @@ index 0000000000000000000000000000000000000000..18cd85f6c3a8eb7be560b5ca0b46dbfe
 +     * @return 플레이어의 이름
 +     */
 +    public final String getName() {
-+        return getGameProfile().getName();
++        return getOriginalGameProfile().getName();
 +    }
 +
 +    /**
@@ -136,7 +143,7 @@ index 0000000000000000000000000000000000000000..18cd85f6c3a8eb7be560b5ca0b46dbfe
 +     * @return 플레이어의 UUID
 +     */
 +    public final UUID getUniqueId() {
-+        return getGameProfile().getId();
++        return getOriginalGameProfile().getId();
 +    }
 +
 +    /**

patches/0013-Add-Plugin-Datapack-System.patch

@@ -35,6 +35,27 @@ index 3c768d5ccf490e962d9638e92d4ea7c85670bad8..c7f9a96df7726bc0e5cc39a9eee9777f
      /**
       * Returns the phase of the server startup logic that the plugin should be loaded.
       *
+diff --git a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
+index 107705db2d82b7c191e5e625ec888e0bc3b03831..84d85a6d8a16050a41a44405cf8df6599ab84665 100644
+--- a/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
++++ b/src/main/java/io/papermc/paper/plugin/loader/library/impl/MavenLibraryResolver.java
+@@ -52,10 +52,12 @@ public class MavenLibraryResolver implements ClassPathLibrary {
+
+     private static final Logger LOGGER = LoggerFactory.getLogger("MavenLibraryResolver");
+
+-    private final RepositorySystem repository;
+-    private final DefaultRepositorySystemSession session;
+-    private final List<RemoteRepository> repositories = new ArrayList<>();
+-    private final List<Dependency> dependencies = new ArrayList<>();
++    // Daydream start - Add Plugin Datapack System (Expose PluginLoader Fields)
++    public final RepositorySystem repository;
++    public final DefaultRepositorySystemSession session;
++    public final List<RemoteRepository> repositories = new ArrayList<>();
++    public final List<Dependency> dependencies = new ArrayList<>();
++    // Daydream end - Add Plugin Datapack System (Expose PluginLoader Fields)
+
+     /**
+      * Creates a new maven library resolver instance.
 diff --git a/src/main/java/moe/caramel/daydream/plugin/PluginDatapackLoader.java b/src/main/java/moe/caramel/daydream/plugin/PluginDatapackLoader.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..778946665dfef224f766101e831b254efa3604af

patches/0014-Add-more-Advancement-API.patch

@@ -748,10 +748,10 @@ index 0000000000000000000000000000000000000000..5f7bda5dd47a84555e44820a059ef241
 +    @Nullable Instant getObtainedTime();
 +}
 diff --git a/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java b/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
-index 18cd85f6c3a8eb7be560b5ca0b46dbfef6e9e6c2..d03c4521931268c9c94722a5e340ff2f1711177c 100644
+index 29995bdec5a0be63f6595e67d1d7b4963426e92d..9e60e942b79c37281b586f51bfe8b88d6e7d39d4 100644
 --- a/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
 +++ b/src/main/java/moe/caramel/daydream/event/player/AsyncPlayerDataPreLoadEvent.java
-@@ -95,6 +95,19 @@ public abstract class AsyncPlayerDataPreLoadEvent extends Event {
+@@ -102,6 +102,19 @@ public abstract class AsyncPlayerDataPreLoadEvent extends Event {
          this.disconnectMessage = disconnectMessage;
      }