Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-21 07:59:19 +00:00
Code Issues Releases Activity

修改

Browse Source
This commit is contained in:
jhqwqmc
2025-11-25 22:34:31 +08:00
parent 276c49ea3f
commit c1883648ef
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/PlayTotemAnimationFunction.java
View File

@@ -29,8 +29,6 @@ public class PlayTotemAnimationFunction<CTX extends Context> extends AbstractCon
private final Key sound; private final Key sound;
private final NumberProvider volume; private final NumberProvider volume;
private final NumberProvider pitch; private final NumberProvider pitch;
private final NumberProvider minVolume;
private final NumberProvider minPitch;
private final boolean silent; private final boolean silent;
public PlayTotemAnimationFunction( public PlayTotemAnimationFunction(
@@ -40,8 +38,6 @@ public class PlayTotemAnimationFunction<CTX extends Context> extends AbstractCon
@Nullable Key sound, @Nullable Key sound,
NumberProvider volume, NumberProvider volume,
NumberProvider pitch, NumberProvider pitch,
NumberProvider minVolume,
NumberProvider minPitch,
boolean silent boolean silent
) { ) {
super(predicates); super(predicates);
@@ -50,8 +46,6 @@ public class PlayTotemAnimationFunction<CTX extends Context> extends AbstractCon
this.sound = sound; this.sound = sound;
this.volume = volume; this.volume = volume;
this.pitch = pitch; this.pitch = pitch;
this.minVolume = minVolume;
this.minPitch = minPitch;
this.silent = silent; this.silent = silent;
} }
@@ -65,8 +59,8 @@ public class PlayTotemAnimationFunction<CTX extends Context> extends AbstractCon
if (this.sound != null) { if (this.sound != null) {
soundData = SoundData.of( soundData = SoundData.of(
this.sound, this.sound,
SoundData.SoundValue.ranged(Math.max(this.minVolume.getFloat(ctx), 0f), Math.max(this.volume.getFloat(ctx), 0f)), SoundData.SoundValue.fixed(Math.max(this.volume.getFloat(ctx), 0f)),
SoundData.SoundValue.ranged(MiscUtils.clamp(this.minPitch.getFloat(ctx), 0f, 2f), MiscUtils.clamp(this.pitch.getFloat(ctx), 0f, 2f)) SoundData.SoundValue.fixed(MiscUtils.clamp(this.pitch.getFloat(ctx), 0f, 2f))
); );
} }
for (Player player : this.selector.get(ctx)) { for (Player player : this.selector.get(ctx)) {
@@ -96,10 +90,8 @@ public class PlayTotemAnimationFunction<CTX extends Context> extends AbstractCon
@Nullable Key sound = Optional.ofNullable(arguments.get("sound")).map(String::valueOf).map(Key::of).orElse(null); @Nullable Key sound = Optional.ofNullable(arguments.get("sound")).map(String::valueOf).map(Key::of).orElse(null);
NumberProvider volume = NumberProviders.fromObject(arguments.getOrDefault("volume", 1f)); NumberProvider volume = NumberProviders.fromObject(arguments.getOrDefault("volume", 1f));
NumberProvider pitch = NumberProviders.fromObject(arguments.getOrDefault("pitch", 1f)); NumberProvider pitch = NumberProviders.fromObject(arguments.getOrDefault("pitch", 1f));
NumberProvider minVolume = NumberProviders.fromObject(arguments.getOrDefault("min-volume", 1f));
NumberProvider minPitch = NumberProviders.fromObject(arguments.getOrDefault("min-pitch", 1f));
boolean silent = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("silent", false), "silent"); boolean silent = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("silent", false), "silent");
return new PlayTotemAnimationFunction<>(getPredicates(arguments), selector, item, sound, volume, pitch, minVolume, minPitch, silent); return new PlayTotemAnimationFunction<>(getPredicates(arguments), selector, item, sound, volume, pitch, silent);
} }
} }
} }