[Sound] Add an alternative constructor omitting World, deprecate old one

Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>
This commit is contained in:
Irmo van den Berge committed 2023-10-12 21:58:47 +02:00
1 parent 085529db28
commit 6a9232c534
2 files changed
+16 -4

No files matched your search

@@ -43,13 +43,19 @@ public abstract class PacketPlayOutCustomSoundEffectHandle extends PacketHandle
public static final java.util.Random SOUND_RANDOM_SEED_SOURCE = new java.util.Random();
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.Location location, float volume, float pitch) {
return createNew(soundEffect, category, location.getWorld(), location.getX(), location.getY(), location.getZ(), volume, pitch);
return createNew(soundEffect, category, location.getX(), location.getY(), location.getZ(), volume, pitch);
}
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.World world, double x, double y, double z, float volume, float pitch) {
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, double x, double y, double z, float volume, float pitch) {
long randomSeed = SOUND_RANDOM_SEED_SOURCE.nextLong();
return createNew(soundEffect, category, x, y, z, volume, pitch, randomSeed);
}
@Deprecated
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.World world, double x, double y, double z, float volume, float pitch) {
return createNew(soundEffect, category, x, y, z, volume, pitch);
}
public abstract ResourceKey<SoundEffect> getSound();
public abstract void setSound(ResourceKey<SoundEffect> value);
public abstract float getVolume();
@@ -1531,13 +1531,19 @@ class PacketPlayOutCustomSoundEffect extends Packet {
public static final java.util.Random SOUND_RANDOM_SEED_SOURCE = new java.util.Random();
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.Location location, float volume, float pitch) {
return createNew(soundEffect, category, location.getWorld(), location.getX(), location.getY(), location.getZ(), volume, pitch);
return createNew(soundEffect, category, location.getX(), location.getY(), location.getZ(), volume, pitch);
}
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.World world, double x, double y, double z, float volume, float pitch) {
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, double x, double y, double z, float volume, float pitch) {
long randomSeed = SOUND_RANDOM_SEED_SOURCE.nextLong();
return createNew(soundEffect, category, x, y, z, volume, pitch, randomSeed);
}
/** @deprecated World argument is no longer needed */
@Deprecated
public static PacketPlayOutCustomSoundEffectHandle createNew(com.bergerkiller.bukkit.common.resources.ResourceKey<com.bergerkiller.bukkit.common.resources.SoundEffect> soundEffect, String category, org.bukkit.World world, double x, double y, double z, float volume, float pitch) {
return createNew(soundEffect, category, x, y, z, volume, pitch);
}
</code>
#if version >= 1.17