mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
243d2313b9
Upstream has released updates that appears 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: 323d6ca3 #535: Add EntityCategory API to LivingEntity 7d3323d8 #526: Add Block#applyBoneMeal() CraftBukkit Changes:bf451617SPIGOT-6109: Improve loot handlingbfea4559SPIGOT-6111: NPE in CraftHumanEntity#openWorkbench & CraftHumanEntity#openEnchantingee7116b4Add note to CONTRIBUTING.md to suggest keeping commit messages / titles the sameeae15943#721: Add EntityCategory API to LivingEntity8c611560#702: Add Block#applyBoneMeal()8408de02#716: Fix barrel open API playing sound twice74b6982b#711: Add Full RGB support to the console
95 lines
2.7 KiB
Diff
95 lines
2.7 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..8cf87d228a7006658d52ce0da16c2d74f4706545
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java
|
|
@@ -0,0 +1,52 @@
|
|
+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.
|
|
+ */
|
|
+public interface BlockSoundGroup {
|
|
+ /**
|
|
+ * Gets the sound that plays when breaking this block
|
|
+ *
|
|
+ * @return The break sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getBreakSound();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that plays when stepping on this block
|
|
+ *
|
|
+ * @return The step sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getStepSound();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that plays when placing this block
|
|
+ *
|
|
+ * @return The place sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getPlaceSound();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that plays when hitting this block
|
|
+ *
|
|
+ * @return The hit sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getHitSound();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that plays when this block falls
|
|
+ *
|
|
+ * @return The fall sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getFallSound();
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index d6f74dbcfeb153d4b17be2827e2989f2d8160d21..d4ba9c2b858204825d47fd6e91dab8c003df085a 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -1,6 +1,7 @@
|
|
package org.bukkit.block;
|
|
|
|
import java.util.Collection;
|
|
+
|
|
import org.bukkit.Chunk;
|
|
import org.bukkit.FluidCollisionMode;
|
|
import org.bukkit.Location;
|
|
@@ -549,4 +550,16 @@ public interface Block extends Metadatable {
|
|
*/
|
|
@NotNull
|
|
BoundingBox getBoundingBox();
|
|
+
|
|
+ // 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
|
|
+ */
|
|
+ @NotNull
|
|
+ com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
|
|
+ // Paper end
|
|
}
|