mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
f9e1ad2c2d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
107 lines
3.5 KiB
Diff
107 lines
3.5 KiB
Diff
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..0000000000000000000000000000000000000000
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
|
|
@@ -0,0 +0,0 @@
|
|
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -0,0 +0,0 @@ public interface Block extends Metadatable, Translatable {
|
|
* @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
|
|
}
|