Reorder some patches

2022-06-08 18:13:02 +02:00 · 2022-06-08 18:13:02 +02:00 · 57dfcdf4eb
commit 57dfcdf4eb
parent a02874e014
164 changed files with 28 additions and 28 deletions
--- a/patches/api/0181-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0181-Add-BlockSoundGroup-interface.patch
@ -0,0 +1,107 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: simpleauthority <jacob@algorithmjunkie.com>
+Date: Tue, 28 May 2019 03:41:28 -0700
+Subject: [PATCH] Add BlockSoundGroup interface
+
+This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup
+
+diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ec36942128cbacae171584c89480b4aae3ae3e2f
+--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
+@@ -0,0 +1,64 @@
+package com.destroystokyo.paper.block;
+
+import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents the sounds that a {@link Block} makes in certain situations
+ * <p>
+ * The sound group includes break, step, place, hit, and fall sounds.
+ * @deprecated use {@link org.bukkit.SoundGroup}
+ */
+@Deprecated(forRemoval = true)
+public interface BlockSoundGroup {
+    /**
+     * Gets the sound that plays when breaking this block
+     *
+     * @return The break sound
+     * @deprecated use {@link org.bukkit.SoundGroup#getBreakSound()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    Sound getBreakSound();
+
+    /**
+     * Gets the sound that plays when stepping on this block
+     *
+     * @return The step sound
+     * @deprecated use {@link org.bukkit.SoundGroup#getStepSound()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    Sound getStepSound();
+
+    /**
+     * Gets the sound that plays when placing this block
+     *
+     * @return The place sound
+     * @deprecated use {@link org.bukkit.SoundGroup#getPlaceSound()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    Sound getPlaceSound();
+
+    /**
+     * Gets the sound that plays when hitting this block
+     *
+     * @return The hit sound
+     * @deprecated use {@link org.bukkit.SoundGroup#getHitSound()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    Sound getHitSound();
+
+    /**
+     * Gets the sound that plays when this block falls
+     *
+     * @return The fall sound
+     * @deprecated use {@link org.bukkit.SoundGroup#getFallSound()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    Sound getFallSound();
+}
+diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
+index b101f5264bdde8bd14913d5161c1047020830f8d..db441e463b02ee734f85c855f5538cd41041dbae 100644
+--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
+@@ -606,4 +606,25 @@ public interface Block extends Metadatable {
+      * @return <code>true</code> if the block data can be placed here
+      */
+     boolean canPlace(@NotNull BlockData data);
+
+    // Paper start
+    /**
+     * Gets the {@link com.destroystokyo.paper.block.BlockSoundGroup} for this block.
+     * <p>
+     * This object contains the block, step, place, hit, and fall sounds.
+     *
+     * @return the sound group for this block
+     * @deprecated use {@link #getBlockSoundGroup()}
+     */
+    @NotNull
+    @Deprecated(forRemoval = true)
+    com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
+
+    /**
+     * Gets the {@link org.bukkit.SoundGroup} for this block.
+     *
+     * @return the sound group for this block
+     */
+    @NotNull org.bukkit.SoundGroup getBlockSoundGroup();
+    // Paper end
+ }