diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 4035606..37201ea 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -1,8 +1,14 @@ package StevenDimDoors.mod_pocketDim; +import paulscode.sound.SoundSystem; +import net.minecraft.client.audio.SoundPool; +import net.minecraft.client.audio.SoundPoolEntry; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent; +import net.minecraftforge.client.event.sound.PlaySoundEffectEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.EventPriority; import net.minecraftforge.event.ForgeSubscribe; @@ -15,6 +21,7 @@ import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator; import StevenDimDoors.mod_pocketDim.util.Point4D; import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.PocketProvider; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,8 +46,18 @@ public class EventHookContainer event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftEnd.ogg"))); event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftClose.ogg"))); event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftDoor.ogg"))); - } + event.manager.soundPoolMusic.addSound("mods/DimDoors/sfx/creepy.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/creepy.ogg"))); + } + @SideOnly(Side.CLIENT) + @ForgeSubscribe + public void onSoundEffectResult(PlayBackgroundMusicEvent event) + { + if (FMLClientHandler.instance().getClient().thePlayer.worldObj.provider.dimensionId==mod_pocketDim.properties.LimboDimensionID); + { + this.playMusicForDim(FMLClientHandler.instance().getClient().thePlayer.worldObj); + } + } @ForgeSubscribe public void onWorldLoad(WorldEvent.Load event) { @@ -56,6 +73,8 @@ public class EventHookContainer { RiftRegenerator.regenerateRiftsInAllWorlds(); } + + this.playMusicForDim(event.world); } @ForgeSubscribe @@ -63,8 +82,6 @@ public class EventHookContainer { event.setCanceled(event.entity.worldObj.provider.dimensionId == properties.LimboDimensionID); } - - @ForgeSubscribe(priority=EventPriority.HIGHEST) public boolean LivingDeathEvent(LivingDeathEvent event) { @@ -96,4 +113,20 @@ public class EventHookContainer PocketManager.save(); } } + + public void playMusicForDim(World world) + { + if(world.isRemote&&world.provider instanceof LimboProvider) + { + SoundSystem sndSystem = FMLClientHandler.instance().getClient().sndManager.sndSystem; + sndSystem.stop("BgMusic"); + SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool("mods.DimDoors.sfx.creepy"); + sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.soundUrl, soundPoolEntry.soundName, false); + sndSystem.play("LimboMusic"); + } + else if(world.isRemote && !(world.provider instanceof LimboProvider)) + { + FMLClientHandler.instance().getClient().sndManager.sndSystem.stop("LimboMusic"); + } + } } \ No newline at end of file diff --git a/resources/mods/DimDoors/sfx/creeepysound.aup b/resources/mods/DimDoors/sfx/creeepysound.aup deleted file mode 100644 index ed4281f..0000000 --- a/resources/mods/DimDoors/sfx/creeepysound.aup +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000014d.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000014d.au deleted file mode 100644 index fee6c05..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000014d.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000041b.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000041b.au deleted file mode 100644 index 5f58ad4..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e000041b.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e00006cb.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e00006cb.au deleted file mode 100644 index 07fc144..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e00006cb.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000805.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000805.au deleted file mode 100644 index f23c3f6..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000805.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000a54.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000a54.au deleted file mode 100644 index 075f9a6..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000a54.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000d4e.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000d4e.au deleted file mode 100644 index 3e5f3c7..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000d4e.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000f7b.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000f7b.au deleted file mode 100644 index f04da05..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000f7b.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000fde.au b/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000fde.au deleted file mode 100644 index 7341d57..0000000 Binary files a/resources/mods/DimDoors/sfx/creeepysound_data/e00/d00/e0000fde.au and /dev/null differ diff --git a/resources/mods/DimDoors/sfx/creepy.ogg b/resources/mods/DimDoors/sfx/creepy.ogg new file mode 100644 index 0000000..ef2b38a Binary files /dev/null and b/resources/mods/DimDoors/sfx/creepy.ogg differ