From f2f1ee7af970dbccf91eca0bc362b94774364f8f Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Wed, 6 Nov 2013 22:46:55 -0500 Subject: [PATCH] Finished Sounds --- .../mod_pocketDim/EventHookContainer.java | 31 ++++++++++-------- .../mod_pocketDim/items/ItemRiftBlade.java | 2 +- .../items/ItemRiftSignature.java | 4 +-- .../mod_pocketDim/ticking/MobMonolith.java | 8 ++--- .../sfx => dimdoors/music}/creepy.ogg | Bin .../sfx => dimdoors/sound}/crack.ogg | Bin .../{DimDoors/sfx => dimdoors/sound}/monk.ogg | Bin .../sfx => dimdoors/sound}/monkLarge.ogg | Bin .../{DimDoors/sfx => dimdoors/sound}/rift.ogg | Bin .../sfx => dimdoors/sound}/riftClose.ogg | Bin .../sfx => dimdoors/sound}/riftDoor.ogg | Bin .../sfx => dimdoors/sound}/riftEnd.ogg | Bin .../sfx => dimdoors/sound}/riftStart.ogg | Bin .../sfx => dimdoors/sound}/tearing.ogg | Bin 14 files changed, 24 insertions(+), 21 deletions(-) rename resources/mods/{DimDoors/sfx => dimdoors/music}/creepy.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/crack.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/monk.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/monkLarge.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/rift.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/riftClose.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/riftDoor.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/riftEnd.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/riftStart.ogg (100%) rename resources/mods/{DimDoors/sfx => dimdoors/sound}/tearing.ogg (100%) diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 6fe6e410..19b7b1cb 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -117,21 +117,24 @@ public class EventHookContainer public void playMusicForDim(World world) { - if(world.isRemote&&world.provider instanceof LimboProvider) + if(world.isRemote) { - SoundSystem sndSystem = FMLClientHandler.instance().getClient().sndManager.sndSystem; - sndSystem.stop("BgMusic"); - SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy"); - - if(soundPoolEntry!=null) - { - sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); - sndSystem.play("LimboMusic"); - } - } - else if(world.isRemote && !(world.provider instanceof LimboProvider)) - { - FMLClientHandler.instance().getClient().sndManager.sndSystem.stop("LimboMusic"); + SoundManager sndManager = FMLClientHandler.instance().getClient().sndManager; + + if(world.provider instanceof LimboProvider) + { + sndManager.sndSystem.stop("BgMusic"); + SoundPoolEntry soundPoolEntry = sndManager.soundPoolMusic.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy"); + if(soundPoolEntry!=null) + { + sndManager.sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); + sndManager.sndSystem.play("LimboMusic"); + } + } + else if(!(world.provider instanceof LimboProvider)) + { + sndManager.sndSystem.stop("LimboMusic"); + } } } } \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java index 48164fe9..0f95d7a5 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java @@ -185,7 +185,7 @@ public class ItemRiftBlade extends ItemSword BaseItemDoor.canPlace(world, x, y - 1, z)) { ItemDimensionalDoor.placeDoorBlock(world, x, y - 1, z, orientation, mod_pocketDim.transientDoor); - player.worldObj.playSoundAtEntity(player,"mods.DimDoors.sfx.riftDoor", 0.6f, 1); + player.worldObj.playSoundAtEntity(player,mod_pocketDim.modid+":riftDoor", 0.6f, 1); stack.damageItem(3, player); return stack; } diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java index d42d625c..ee6a62f9 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java @@ -99,14 +99,14 @@ public class ItemRiftSignature extends Item } clearSource(stack); mod_pocketDim.sendChat(player,("Rift Created")); - world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1); + world.playSoundAtEntity(player,mod_pocketDim.modid+":riftEnd", 0.6f, 1); } else { //The link signature has not been used. Store its current target as the first location. setSource(stack, x, adjustedY, z,orientation, PocketManager.getDimensionData(world)); mod_pocketDim.sendChat(player,("Location Stored in Rift Signature")); - world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1); + world.playSoundAtEntity(player,mod_pocketDim.modid+":riftStart", 0.6f, 1); } return true; } diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java index 8e69e0b2..78eef0f4 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java @@ -101,7 +101,7 @@ public class MobMonolith extends EntityFlying implements IMob { if(this.soundTime<=0) { - this.playSound("mods.DimDoors.sfx.monk", 1F, 1F); + this.playSound(mod_pocketDim.modid+":monk", 1F, 1F); this.soundTime=100; } @@ -128,12 +128,12 @@ public class MobMonolith extends EntityFlying implements IMob } if (aggro>430&&this.soundTime<100) { - this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",2F, 1F); + this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,mod_pocketDim.modid+":tearing",2F, 1F); this.soundTime=100; } if (aggro>445&&this.soundTime<200) { - this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",5F, 1F); + this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,mod_pocketDim.modid+":tearing",5F, 1F); this.soundTime=200; } } @@ -144,7 +144,7 @@ public class MobMonolith extends EntityFlying implements IMob DDTeleporter.teleportEntity(entityPlayer, destination, false); this.aggro = 0; - entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1); + entityPlayer.worldObj.playSoundAtEntity(entityPlayer,mod_pocketDim.modid+":crack",13, 1); } if (!(this.worldObj.provider instanceof LimboProvider || this.worldObj.getClosestPlayerToEntity(this, 5) != null) || this.aggro > 300) { diff --git a/resources/mods/DimDoors/sfx/creepy.ogg b/resources/mods/dimdoors/music/creepy.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/creepy.ogg rename to resources/mods/dimdoors/music/creepy.ogg diff --git a/resources/mods/DimDoors/sfx/crack.ogg b/resources/mods/dimdoors/sound/crack.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/crack.ogg rename to resources/mods/dimdoors/sound/crack.ogg diff --git a/resources/mods/DimDoors/sfx/monk.ogg b/resources/mods/dimdoors/sound/monk.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/monk.ogg rename to resources/mods/dimdoors/sound/monk.ogg diff --git a/resources/mods/DimDoors/sfx/monkLarge.ogg b/resources/mods/dimdoors/sound/monkLarge.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/monkLarge.ogg rename to resources/mods/dimdoors/sound/monkLarge.ogg diff --git a/resources/mods/DimDoors/sfx/rift.ogg b/resources/mods/dimdoors/sound/rift.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/rift.ogg rename to resources/mods/dimdoors/sound/rift.ogg diff --git a/resources/mods/DimDoors/sfx/riftClose.ogg b/resources/mods/dimdoors/sound/riftClose.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/riftClose.ogg rename to resources/mods/dimdoors/sound/riftClose.ogg diff --git a/resources/mods/DimDoors/sfx/riftDoor.ogg b/resources/mods/dimdoors/sound/riftDoor.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/riftDoor.ogg rename to resources/mods/dimdoors/sound/riftDoor.ogg diff --git a/resources/mods/DimDoors/sfx/riftEnd.ogg b/resources/mods/dimdoors/sound/riftEnd.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/riftEnd.ogg rename to resources/mods/dimdoors/sound/riftEnd.ogg diff --git a/resources/mods/DimDoors/sfx/riftStart.ogg b/resources/mods/dimdoors/sound/riftStart.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/riftStart.ogg rename to resources/mods/dimdoors/sound/riftStart.ogg diff --git a/resources/mods/DimDoors/sfx/tearing.ogg b/resources/mods/dimdoors/sound/tearing.ogg similarity index 100% rename from resources/mods/DimDoors/sfx/tearing.ogg rename to resources/mods/dimdoors/sound/tearing.ogg