Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

SoundEvent API fixes

Browse Source 
Brings the new override functions inline with the existing recipients override function
This commit is contained in:
Lexi
2022-06-14 02:38:11 -04:00
parent 7bab72aea8
commit dbd237b3ae
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/api/0002-Add-SoundEvent.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Add SoundEvent
diff --git a/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java diff --git a/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3540d7c38 index 0000000000000000000000000000000000000000..2a948f2c68cff28e4e0294b065020957dc34bc37
--- /dev/null --- /dev/null
+++ b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java +++ b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java
@@ -0,0 +1,380 @@ @@ -0,0 +1,382 @@
+package gg.projecteden.parchment.event.sound; +package gg.projecteden.parchment.event.sound;
+ +
+import gg.projecteden.parchment.OptionalHumanEntity; +import gg.projecteden.parchment.OptionalHumanEntity;
@@ -27,6 +27,7 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+import java.util.ArrayList; +import java.util.ArrayList;
+import java.util.List; +import java.util.List;
+import java.util.Objects; +import java.util.Objects;
+import java.util.function.BiFunction;
+import java.util.function.Function; +import java.util.function.Function;
+ +
+/** +/**
@@ -59,8 +60,8 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ private @NotNull Emitter emitter; + private @NotNull Emitter emitter;
+ private boolean cancelled; + private boolean cancelled;
+ private long seed; + private long seed;
+ private @Nullable Function<@NotNull Player, @Nullable Sound> soundOverrideFunction; + private @Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Sound> soundOverrideFunction;
+ private @Nullable Function<@NotNull Player, @Nullable Emitter> emitterOverrideFunction; + private @Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Emitter> emitterOverrideFunction;
+ +
+ public SoundEvent(@Nullable HumanEntity except, @NotNull Sound sound, @NotNull Emitter emitter, long seed, @Nullable Function<Sound, Double> distanceFunction, @Nullable Function<SoundEvent, List<Player>> recipientsFunction) { + public SoundEvent(@Nullable HumanEntity except, @NotNull Sound sound, @NotNull Emitter emitter, long seed, @Nullable Function<Sound, Double> distanceFunction, @Nullable Function<SoundEvent, List<Player>> recipientsFunction) {
+ super(true); + super(true);
@@ -237,17 +238,17 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ * + *
+ * @return sound override function (or {@code null} if not overridden) + * @return sound override function (or {@code null} if not overridden)
+ */ + */
+ public @Nullable Function<@NotNull Player, @Nullable Sound> getSoundOverrideFunction() { + public @Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Sound> getSoundOverrideFunction() {
+ return soundOverrideFunction; + return soundOverrideFunction;
+ } + }
+ +
+ /** + /**
+ * Sets the function that overrides what {@link Sound} is sent to a {@link Player}. + * Sets the function that overrides what {@link Sound} is sent to a {@link Player}.
+ * + *
+ * @param soundOverrideFunction function which accepts a player and returns a sound + * @param soundOverrideFunction function which accepts a sound event and a player and returns
+ * (or {@code null} if the default sound should be used) + * a sound (or {@code null} if the default sound should be used)
+ */ + */
+ public void setSoundOverrideFunction(@Nullable Function<@NotNull Player, @Nullable Sound> soundOverrideFunction) { + public void setSoundOverrideFunction(@Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Sound> soundOverrideFunction) {
+ this.soundOverrideFunction = soundOverrideFunction; + this.soundOverrideFunction = soundOverrideFunction;
+ } + }
+ +
@@ -260,7 +261,7 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ public @NotNull Sound calculateSound(@NotNull Player player) { + public @NotNull Sound calculateSound(@NotNull Player player) {
+ if (soundOverrideFunction != null) { + if (soundOverrideFunction != null) {
+ try { + try {
+ Sound override = soundOverrideFunction.apply(player); + Sound override = soundOverrideFunction.apply(this, player);
+ if (override != null) { + if (override != null) {
+ return override; + return override;
+ } + }
@@ -277,7 +278,7 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ * + *
+ * @return emitter override function (or {@code null} if not overridden) + * @return emitter override function (or {@code null} if not overridden)
+ */ + */
+ public @Nullable Function<@NotNull Player, @Nullable Emitter> getEmitterOverrideFunction() { + public @Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Emitter> getEmitterOverrideFunction() {
+ return emitterOverrideFunction; + return emitterOverrideFunction;
+ } + }
+ +
@@ -285,10 +286,11 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ * Sets the function that overrides what {@link Emitter} is used when playing this sound to a + * Sets the function that overrides what {@link Emitter} is used when playing this sound to a
+ * {@link Player}. + * {@link Player}.
+ * + *
+ * @param emitterOverrideFunction function which accepts a player and returns an emitter + * @param emitterOverrideFunction function which accepts a sound event and a player and returns
+ * an emitter
+ * (or {@code null} if the default emitter should be used) + * (or {@code null} if the default emitter should be used)
+ */ + */
+ public void setEmitterOverrideFunction(@Nullable Function<@NotNull Player, @Nullable Emitter> emitterOverrideFunction) { + public void setEmitterOverrideFunction(@Nullable BiFunction<@NotNull SoundEvent, @NotNull Player, @Nullable Emitter> emitterOverrideFunction) {
+ this.emitterOverrideFunction = emitterOverrideFunction; + this.emitterOverrideFunction = emitterOverrideFunction;
+ } + }
+ +
@@ -301,7 +303,7 @@ index 0000000000000000000000000000000000000000..427161356c432b5dc5d69a53801c1cd3
+ public @NotNull Emitter calculateEmitter(@NotNull Player player) { + public @NotNull Emitter calculateEmitter(@NotNull Player player) {
+ if (emitterOverrideFunction != null) { + if (emitterOverrideFunction != null) {
+ try { + try {
+ Emitter override = emitterOverrideFunction.apply(player); + Emitter override = emitterOverrideFunction.apply(this, player);
+ if (override != null) { + if (override != null) {
+ return override; + return override;
+ } + }