Deprecate duplicate SoundGroup API (#7509)

patches/api/0180-Add-BlockSoundGroup-interface.patch

@@ -7,10 +7,10 @@ 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..8cf87d228a7006658d52ce0da16c2d74f4706545
+index 0000000000000000000000000000000000000000..ec36942128cbacae171584c89480b4aae3ae3e2f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,64 @@
 +package com.destroystokyo.paper.block;
 +
 +import org.bukkit.Sound;
@@ -21,53 +21,65 @@ index 0000000000000000000000000000000000000000..8cf87d228a7006658d52ce0da16c2d74
 + * 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..7ea765d5d653b1b84e73fd8c4d9d923049bd06ff 100644
+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,16 @@ public interface Block extends Metadatable {
+@@ -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);
@@ -79,8 +91,17 @@ index b101f5264bdde8bd14913d5161c1047020830f8d..7ea765d5d653b1b84e73fd8c4d9d9230
 +     * 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
  }

patches/api/0220-Add-methods-to-get-translation-keys.patch

@@ -212,7 +212,7 @@ index 13eac9ad2c1672051635d1c35cc49239252e7a61..107e36ef02a9481954bd770ce9a55a0b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index c88c4223928c2e47f1a85b73165cf433806677df..7124f7134a0afb355c01cac9e0187164f9630bcd 100644
+index 1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02..2c837ea822f3b0c4ec312f0c956fe1b778cbd5e9 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
@@ -224,10 +224,10 @@ index c88c4223928c2e47f1a85b73165cf433806677df..7124f7134a0afb355c01cac9e0187164
  
      /**
       * Gets the metadata for this block
-@@ -637,5 +637,15 @@ public interface Block extends Metadatable {
+@@ -646,5 +646,15 @@ public interface Block extends Metadatable {
+      * @return the sound group for this block
       */
-     @NotNull
-     com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
+     @NotNull org.bukkit.SoundGroup getBlockSoundGroup();
 +
 +    /**
 +     * Return the translation key for the Block, so the client can translate it into the active

patches/api/0233-Add-Destroy-Speed-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7124f7134a0afb355c01cac9e0187164f9630bcd..839867cd0a92fc0ea2b9ea009b67a841f8c7edd6 100644
+index 3f1c58e813afe90eaf467e0b76949ed8df752939..68a91de4ab068fd32dc883a9427475c07218941e 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -647,5 +647,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
+@@ -656,5 +656,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
      @NotNull
      @Deprecated
      String getTranslationKey();