From ddd406bad39f74f1e08f4fa930031550c5d3bdc5 Mon Sep 17 00:00:00 2001 From: Draake Date: Mon, 13 Aug 2012 18:36:55 -0700 Subject: [PATCH] Added additional sound events to allow manipulation of a sound source at its creation. --- .../sound/PlaySoundEffectSourceEvent.java | 14 +++++ .../event/sound/PlaySoundSourceEvent.java | 20 +++++++ .../event/sound/PlayStreamingSourceEvent.java | 20 +++++++ .../event/sound/SoundSetListenerEvent.java | 26 ++++++++++ .../net/minecraft/src/SoundManager.java.patch | 52 ++++++++++++++++--- 5 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java create mode 100644 client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java create mode 100644 client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java create mode 100644 client/net/minecraftforge/client/event/sound/SoundSetListenerEvent.java diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java new file mode 100644 index 0000000000..03fb7fbda2 --- /dev/null +++ b/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java @@ -0,0 +1,14 @@ +package net.minecraftforge.client.event.sound; + +import net.minecraft.src.SoundManager; + +public class PlaySoundEffectSourceEvent extends SoundEvent +{ + public final SoundManager manager; + public final String name; + public PlaySoundEffectSourceEvent(SoundManager manager, String name) + { + this.manager = manager; + this.name = name; + } +} diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java new file mode 100644 index 0000000000..fb627f24e6 --- /dev/null +++ b/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java @@ -0,0 +1,20 @@ +package net.minecraftforge.client.event.sound; + +import net.minecraft.src.SoundManager; + +public class PlaySoundSourceEvent extends SoundEvent +{ + public final SoundManager manager; + public final String name; + public final float x; + public final float y; + public final float z; + public PlaySoundSourceEvent(SoundManager manager, String name, float x, float y, float z) + { + this.manager = manager; + this.name = name; + this.x = x; + this.y = y; + this.z = z; + } +} \ No newline at end of file diff --git a/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java new file mode 100644 index 0000000000..116e7843c1 --- /dev/null +++ b/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java @@ -0,0 +1,20 @@ +package net.minecraftforge.client.event.sound; + +import net.minecraft.src.SoundManager; + +public class PlayStreamingSourceEvent extends SoundEvent +{ + public final SoundManager manager; + public final String name; + public final float x; + public final float y; + public final float z; + public PlayStreamingSourceEvent(SoundManager manager, String name, float x, float y, float z) + { + this.manager = manager; + this.name = name; + this.x = x; + this.y = y; + this.z = z; + } +} \ No newline at end of file diff --git a/client/net/minecraftforge/client/event/sound/SoundSetListenerEvent.java b/client/net/minecraftforge/client/event/sound/SoundSetListenerEvent.java new file mode 100644 index 0000000000..93e6d69f58 --- /dev/null +++ b/client/net/minecraftforge/client/event/sound/SoundSetListenerEvent.java @@ -0,0 +1,26 @@ +package net.minecraftforge.client.event.sound; + +import net.minecraft.src.SoundManager; + +public class SoundSetListenerEvent extends SoundEvent +{ + public final SoundManager manager; + public final float elapsed; + public final float posX; + public final float posY; + public final float posZ; + public final float lookX; + public final float lookY; + public final float lookZ; + public SoundSetListenerEvent(SoundManager manager, float elapsed, float posX, float posY, float posZ, float lookX, float lookY, float lookZ) + { + this.manager = manager; + this.elapsed = elapsed; + this.posX = posX; + this.posY = posY; + this.posZ = posZ; + this.lookX = lookX; + this.lookY = lookY; + this.lookZ = lookZ; + } +} diff --git a/patches/minecraft/net/minecraft/src/SoundManager.java.patch b/patches/minecraft/net/minecraft/src/SoundManager.java.patch index 2123d5fd22..11c6a607c9 100644 --- a/patches/minecraft/net/minecraft/src/SoundManager.java.patch +++ b/patches/minecraft/net/minecraft/src/SoundManager.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/SoundManager.java +++ ../src_work/minecraft/net/minecraft/src/SoundManager.java -@@ -2,6 +2,18 @@ +@@ -2,6 +2,22 @@ import java.io.File; import java.util.Random; @@ -8,18 +8,22 @@ +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.ModCompatibilityClient; +import net.minecraftforge.client.event.sound.PlaySoundEffectEvent; ++import net.minecraftforge.client.event.sound.PlaySoundEffectSourceEvent; +import net.minecraftforge.client.event.sound.PlaySoundEvent; ++import net.minecraftforge.client.event.sound.PlaySoundSourceEvent; +import net.minecraftforge.client.event.sound.PlayStreamingEvent; ++import net.minecraftforge.client.event.sound.PlayStreamingSourceEvent; +import net.minecraftforge.client.event.sound.SoundEvent; +import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent; +import net.minecraftforge.client.event.sound.SoundLoadEvent; ++import net.minecraftforge.client.event.sound.SoundSetListenerEvent; +import net.minecraftforge.client.event.sound.SoundSetupEvent; +import net.minecraftforge.common.MinecraftForge; +import static net.minecraftforge.client.event.sound.SoundEvent.*; import paulscode.sound.SoundSystem; import paulscode.sound.SoundSystemConfig; import paulscode.sound.codecs.CodecJOrbis; -@@ -37,9 +49,11 @@ +@@ -37,9 +53,11 @@ private Random rand = new Random(); private int ticksBeforeMusic; @@ -32,7 +36,7 @@ } /** -@@ -54,6 +68,8 @@ +@@ -54,6 +72,8 @@ { this.tryToSetLibraryAndCodecs(); } @@ -41,7 +45,7 @@ } /** -@@ -73,6 +89,8 @@ +@@ -73,6 +93,8 @@ SoundSystemConfig.setCodec("ogg", CodecJOrbis.class); SoundSystemConfig.setCodec("mus", CodecMus.class); SoundSystemConfig.setCodec("wav", CodecWav.class); @@ -50,7 +54,7 @@ sndSystem = new SoundSystem(); this.options.soundVolume = var1; this.options.musicVolume = var2; -@@ -161,10 +179,12 @@ +@@ -161,10 +183,12 @@ } SoundPoolEntry var1 = this.soundPoolMusic.getRandomSound(); @@ -64,7 +68,15 @@ sndSystem.backgroundMusic("BgMusic", var1.soundUrl, var1.soundName, false); sndSystem.setVolume("BgMusic", this.options.musicVolume); sndSystem.play("BgMusic"); -@@ -214,6 +234,7 @@ +@@ -196,6 +220,7 @@ + float var17 = 0.0F; + sndSystem.setListenerPosition((float)var4, (float)var6, (float)var8); + sndSystem.setListenerOrientation(var12, var13, var14, var15, var16, var17); ++ MinecraftForge.EVENT_BUS.post(new SoundSetListenerEvent(this, par2, (float)var4, (float)var6, (float)var8, var12, var13, var14)); + } + } + } +@@ -214,6 +239,7 @@ if (par1Str != null) { SoundPoolEntry var8 = this.soundPoolStreaming.getRandomSoundFromSoundPool(par1Str); @@ -72,7 +84,15 @@ if (var8 != null && par5 > 0.0F) { -@@ -239,6 +260,7 @@ +@@ -225,6 +251,7 @@ + float var9 = 16.0F; + sndSystem.newStreamingSource(true, var7, var8.soundUrl, var8.soundName, false, par2, par3, par4, 2, var9 * 4.0F); + sndSystem.setVolume(var7, 0.5F * this.options.soundVolume); ++ MinecraftForge.EVENT_BUS.post(new PlayStreamingSourceEvent(this, var7, par2, par3, par4)); + sndSystem.play(var7); + } + } +@@ -239,6 +266,7 @@ if (loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry var7 = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); @@ -80,7 +100,15 @@ if (var7 != null && par5 > 0.0F) { -@@ -274,6 +296,7 @@ +@@ -260,6 +288,7 @@ + } + + sndSystem.setVolume(var8, par5 * this.options.soundVolume); ++ MinecraftForge.EVENT_BUS.post(new PlaySoundSourceEvent(this, var8, par2, par3, par4)); + sndSystem.play(var8); + } + } +@@ -274,6 +303,7 @@ if (loaded && this.options.soundVolume != 0.0F) { SoundPoolEntry var4 = this.soundPoolSounds.getRandomSoundFromSoundPool(par1Str); @@ -88,3 +116,11 @@ if (var4 != null) { +@@ -289,6 +319,7 @@ + par2 *= 0.25F; + sndSystem.setPitch(var5, par3); + sndSystem.setVolume(var5, par2 * this.options.soundVolume); ++ MinecraftForge.EVENT_BUS.post(new PlaySoundEffectSourceEvent(this, var5)); + sndSystem.play(var5); + } + }