Deploying to Daydream-API

caramel-moe · Jan 27, 2025 · d890460 · d890460
1 parent c6dcfcd
commit d890460
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 3 deletions.
diff --git a/daydream-api/paper-patches/features/0008-Add-Packet-API.patch b/daydream-api/paper-patches/features/0008-Add-Packet-API.patch
@@ -333,6 +333,61 @@ index 0000000000000000000000000000000000000000..653a01aef06f20f5229bd08d36a3ebd6
 +     */
 +    ContainerSetSlotPacket create(int windowId, int revision, int slot, ItemStack stack);
 +}
+diff --git a/src/main/java/moe/caramel/daydream/packet/ExplodePacket.java b/src/main/java/moe/caramel/daydream/packet/ExplodePacket.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..7e3e60bfea4ebf860eb4aa939e7f56e37739cef2
+--- /dev/null
++++ b/src/main/java/moe/caramel/daydream/packet/ExplodePacket.java
+@@ -0,0 +1,49 @@
++package moe.caramel.daydream.packet;
++
++import org.bukkit.NamespacedKey;
++import org.bukkit.Particle;
++import org.bukkit.Sound;
++import org.bukkit.util.Vector;
++import org.jspecify.annotations.NullMarked;
++import org.jspecify.annotations.Nullable;
++
++@NullMarked
++public interface ExplodePacket extends Packet {
++
++    /**
++     * 패킷을 생성합니다.
++     *
++     * @param center 폭발 위치
++     * @param knockback 플레이어에게 주어질 넉백
++     * @return this
++     */
++    default ExplodePacket create(final Vector center, final @Nullable Vector knockback) {
++        return create(center, knockback, Particle.EXPLOSION_EMITTER, null, Sound.ENTITY_GENERIC_EXPLODE);
++    }
++
++    /**
++     * 패킷을 생성합니다.
++     *
++     * @param center 폭발 위치
++     * @param knockback 플레이어에게 주어질 넉백
++     * @param particle 폭발 파티클
++     * @param particleData 파티클 데이터
++     * @param sound 폭발 소리
++     * @return this
++     * @param <T> 파티클 데이터 타입
++     */
++    <T> ExplodePacket create(Vector center, @Nullable Vector knockback, Particle particle, @Nullable T particleData, NamespacedKey sound);
++
++    /**
++     * 패킷을 생성합니다.
++     *
++     * @param center 폭발 위치
++     * @param knockback 플레이어에게 주어질 넉백
++     * @param particle 폭발 파티클
++     * @param particleData 파티클 데이터
++     * @param sound 폭발 소리
++     * @return this
++     * @param <T> 파티클 데이터 타입
++     */
++    <T> ExplodePacket create(Vector center, @Nullable Vector knockback, Particle particle, @Nullable T particleData, Sound sound);
++}
 diff --git a/src/main/java/moe/caramel/daydream/packet/GameEventPacket.java b/src/main/java/moe/caramel/daydream/packet/GameEventPacket.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..278df2d2a00f92b0d50fb22175e5a25b0a791123

diff --git a/daydream-api/paper-patches/features/0009-Add-more-Explosion-API.patch b/daydream-api/paper-patches/features/0009-Add-more-Explosion-API.patch
@@ -175,7 +175,7 @@ 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..ffe987fbad8b32c04293621ee3b1a6a520604066 100644
+index 294aa555e0bc88390bbab070466abc70940cfd5f..f697a1ed59a8c074ba4ee13db7204675783c0d59 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
@@ -218,7 +218,7 @@ index 294aa555e0bc88390bbab070466abc70940cfd5f..ffe987fbad8b32c04293621ee3b1a6a5
 +    default moe.caramel.daydream.world.Explosion explosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, @Nullable Entity source) {
 +        return explosion(
 +            x, y, z, power, setFire, (breakBlocks ? ExplosionAction.MOB : ExplosionAction.NONE),
-+            Particle.EXPLOSION, null, Particle.EXPLOSION_EMITTER, null,
++            Particle.EXPLOSION_EMITTER, null, Particle.EXPLOSION, null,
 +            Sound.ENTITY_GENERIC_EXPLODE, source
 +        );
 +    }
@@ -268,7 +268,7 @@ index 294aa555e0bc88390bbab070466abc70940cfd5f..ffe987fbad8b32c04293621ee3b1a6a5
 +     * explode and finalize should be called.
 +     */
 +    @NotNull
-+    default  <T> moe.caramel.daydream.world.Explosion explosion(
++    default <T> moe.caramel.daydream.world.Explosion explosion(
 +        @NotNull Location loc, float power, boolean setFire, @NotNull ExplosionAction explosionAction,
 +        @NotNull Particle largeParticle, @Nullable T largeData,
 +        @NotNull Particle smallParticle, @Nullable T smallData,