aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0176-Add-BlockSoundGroup-interface.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2024-05-09 14:51:33 +0100
committerShane Freeder <[email protected]>2024-05-09 14:51:33 +0100
commit3693bbdc6b65e68db10375d3eeab70f06708b729 (patch)
tree4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/api/0176-Add-BlockSoundGroup-interface.patch
parentf2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff)
downloadPaper-timings/use-internals.tar.gz
Paper-timings/use-internals.zip
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally as this would allow us to avoid hitting systems like block state snapshots which can create issues as many of the spigot implementations of this stuff are increasingly broken, leading to unexpected crashes during ticking, even if the API cannot properly interact with these such states/items, it's generally more preferable to not crash the server in the course, and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/api/0176-Add-BlockSoundGroup-interface.patch')
-rw-r--r--patches/api/0176-Add-BlockSoundGroup-interface.patch107
1 files changed, 107 insertions, 0 deletions
diff --git a/patches/api/0176-Add-BlockSoundGroup-interface.patch b/patches/api/0176-Add-BlockSoundGroup-interface.patch
new file mode 100644
index 0000000000..91f609d1e3
--- /dev/null
+++ b/patches/api/0176-Add-BlockSoundGroup-interface.patch
@@ -0,0 +1,107 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: simpleauthority <[email protected]>
+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 c7ef0386a09a07a2317c56274ed41218dfd7153d..f468e9751f75fd355512e033c180de967de5b2d8 100644
+--- a/src/main/java/org/bukkit/block/Block.java
++++ b/src/main/java/org/bukkit/block/Block.java
+@@ -616,4 +616,25 @@ 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
+ }