diff --git a/changelog b/changelog index b871fa462..191d5f9a9 100644 --- a/changelog +++ b/changelog @@ -7,10 +7,12 @@ * Doubled bismuth and tantalum yields from high-performance solvent bedrock ore processing * Hoppers and buckets can now be made out of steel * RoR gauges now show the lowest and highest configured value on the actual gauge -* The steel sword now looks like a medival broad sword with the appropriate scale +* The steel sword now looks like a medieval broad sword with the appropriate scale * All remaining items have been removed from the template folder, siren tracks and plate stamps are now made in the anvil * Gerald assembly now requires stellar flux +* The DFC parts are now made in the plasma forge, with the recipes being more expensive * The restrictions for firing Folly (using the scope, waiting for the startup) no longer apply to NPCs (which can never fulfill them anyway), allowing them to actually use it +* The plinking sound played when a drill cannot break a block now only plays once for the entire AoE instead of once for every single block that couldnt be broken ## Fixed * Fixed size 15 dual kerosene thruster not rendering at all diff --git a/src/main/java/com/hbm/blocks/generic/BlockPlushie.java b/src/main/java/com/hbm/blocks/generic/BlockPlushie.java index 9fd7a32b0..a9d1b6f85 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockPlushie.java +++ b/src/main/java/com/hbm/blocks/generic/BlockPlushie.java @@ -5,6 +5,7 @@ import java.util.Random; import com.hbm.blocks.IBlockMulti; import com.hbm.blocks.ITooltipProvider; +import com.hbm.main.NTMSounds; import com.hbm.world.gen.nbt.INBTTileEntityTransformable; import com.hbm.world.gen.nbt.INBTBlockTransformable; @@ -102,9 +103,9 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti return true; } else { if(plushie.type == PlushieType.HUNDUN) { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.hunduns_magnificent_howl", 100F, 1F); + world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, NTMSounds.BLOCK_HUNDUNS_MAGNIFICENT_HOWL, 100F, 1F); } else { - world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.squeakyToy", 0.25F, 1F); + world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, NTMSounds.BLOCK_PLUSHY, 0.25F, 1F); } return true; } @@ -160,7 +161,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti YOMI( "Yomi", "Hi! Can I be your rabbit friend?"), NUMBERNINE( "Number Nine", "None of y'all deserve coal."), HUNDUN( "Hundun", "混沌"), - DERG( "Dragon", "Squeeze him."); + DERG( "Dragon", "Squeeze him."); // blerg public String label; public String inscription; diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenBobble.java b/src/main/java/com/hbm/inventory/gui/GUIScreenBobble.java index edd779896..931166e71 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenBobble.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenBobble.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.generic.BlockBobble.BobbleType; import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; +import com.hbm.main.NTMSounds; import com.hbm.util.Tuple.Pair; import net.minecraft.client.audio.PositionedSoundRecord; @@ -26,7 +27,7 @@ public class GUIScreenBobble extends GuiScreen { @Override public void initGui() { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.bobble"), 1.0F)); + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation(NTMSounds.BLOCK_FALLOUT_3_POPUP), 1.0F)); } @Override diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenSnowglobe.java b/src/main/java/com/hbm/inventory/gui/GUIScreenSnowglobe.java index ef877a21c..1639e128c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenSnowglobe.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenSnowglobe.java @@ -5,6 +5,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; import com.hbm.blocks.generic.BlockSnowglobe.TileEntitySnowglobe; +import com.hbm.main.NTMSounds; import com.hbm.util.i18n.I18nUtil; import net.minecraft.client.audio.PositionedSoundRecord; @@ -23,7 +24,7 @@ public class GUIScreenSnowglobe extends GuiScreen { @Override public void initGui() { - mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("hbm:block.bobble"), 1.0F)); + mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation(NTMSounds.BLOCK_FALLOUT_3_POPUP), 1.0F)); } @Override diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java index c4c909308..1b15796fc 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java @@ -14,6 +14,7 @@ import com.hbm.items.weapon.sedna.mags.IMagazine; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.packet.toclient.MuzzleFlashPacket; @@ -47,10 +48,10 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 3) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 3) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); if(timer == 16) { Receiver rec = ctx.config.getReceivers(stack)[0]; @@ -61,15 +62,15 @@ public class Orchestras { } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 3) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 3) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -80,23 +81,23 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 55) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 55) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 21) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.6F); + if(timer == 21) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.6F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.6F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.8F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.6F); } if(type == GunAnimation.INSPECT) { - if(timer == 3) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 1F); + if(timer == 3) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 28) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 45) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.6F); + if(timer == 28) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 45) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.6F); } }; @@ -107,25 +108,25 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 44) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.9F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.9F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -136,25 +137,25 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 44) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.9F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.9F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.9F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -166,21 +167,21 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.RELOAD) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.RELOAD_CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.RELOAD_END) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.9F); - if(timer == 12 && ctx.config.getReceivers(stack)[0].getMagazine(stack).getAmountBeforeReload(stack) <= 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.9F); + if(timer == 12 && ctx.config.getReceivers(stack)[0].getMagazine(stack).getAmountBeforeReload(stack) <= 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.9F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); - if(timer == 44) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.9F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); + if(timer == 44) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -188,11 +189,11 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.5, -0.125, aiming ? -0.125 : -0.375D, 0, 0.12, -0.12, 0.01, -7.5F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 1.5F, casing.getName(), true, 60, 0.5D, 20); } - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 1F); } }; @@ -204,7 +205,7 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.EQUIP) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -214,22 +215,22 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.8F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.INSPECT) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.8F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1.25F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.8F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1.25F); } if(type == GunAnimation.JAMMED) { - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } }; @@ -241,19 +242,19 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.RELOAD) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.8F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.8F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.RELOAD_CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.RELOAD_END) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.7F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.7F); } if(type == GunAnimation.JAMMED) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.7F); - if(timer == 17) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); - if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.7F); + if(timer == 17) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -261,11 +262,11 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, 0.18, -0.12, 0.01, -10F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20); } - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } }; @@ -277,19 +278,19 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.RELOAD) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.8F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.8F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.RELOAD_CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.RELOAD_END) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.7F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.7F); } if(type == GunAnimation.JAMMED) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.7F); - if(timer == 17) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); - if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.7F); + if(timer == 17) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -297,11 +298,11 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 : -0.375D, 0, -0.08, 0, 0.01, -15F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20); } - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); } }; @@ -319,7 +320,7 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.3125, -0.125, aiming ? -0.125 * offset : -0.375D * offset, 0, -0.08, 0, 0.01, -15F + (float)entity.getRNG().nextGaussian() * 5F, (float)entity.getRNG().nextGaussian() * 2.5F, casing.getName(), true, 60, 0.5D, 20); } - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.leverCock", 1F, 0.8F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LEVER_COCK, 1F, 0.8F); return; } @@ -334,7 +335,7 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.8F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.8F); if(timer == 4) { IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack); if(mag.getAmountAfterReload(stack) > 0) { @@ -343,19 +344,19 @@ public class Orchestras { mag.setAmountBeforeReload(stack, 0); } } - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.8F); - if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.8F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.CYCLE) { - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } }; @@ -366,10 +367,10 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 3) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 3) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); if(timer == 16) { Receiver rec = ctx.config.getReceivers(stack)[0]; @@ -380,15 +381,15 @@ public class Orchestras { } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 3) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 3) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -407,23 +408,23 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } if(type == GunAnimation.RELOAD_END) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.JAMMED) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); - if(timer == 31) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); + if(timer == 31) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.INSPECT) { - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); } }; @@ -443,21 +444,21 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.25F, 1F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.25F, 1F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); } if(type == GunAnimation.JAMMED) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } } else { if(type == GunAnimation.CYCLE) { @@ -468,22 +469,22 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); } if(type == GunAnimation.RELOAD) { - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.25F, 1F); - if(timer == 48) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 54) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.25F, 1F); + if(timer == 48) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 54) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); } if(type == GunAnimation.JAMMED) { - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.8F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1.0F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.8F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1.0F); } if(type == GunAnimation.INSPECT) { - if(timer == 6) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 53) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 6) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 53) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } } }; @@ -498,31 +499,31 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); if(timer == 4) { IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack); int toEject = mag.getAmountAfterReload(stack) - mag.getAmount(stack, ctx.inventory); SpentCasing casing = mag.getCasing(stack, ctx.inventory); if(casing != null) for(int i = 0; i < toEject; i++) CasingCreator.composeEffect(entity.worldObj, entity, 0.625, -0.1875, -0.375D, -0.12, 0.18, 0, 0.01, -15F + (float)entity.getRNG().nextGaussian() * 7.5F, (float)entity.getRNG().nextGaussian() * 5F, casing.getName(), true, 60, 0.5D, 20); } - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.RELOAD_CYCLE) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); } if(type == GunAnimation.RELOAD_END) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); } if(type == GunAnimation.JAMMED) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack); int toEject = mag.getAmountAfterReload(stack) - mag.getAmount(stack, ctx.inventory); if(timer == 4 && toEject > 0) { @@ -530,7 +531,7 @@ public class Orchestras { if(casing != null) for(int i = 0; i < toEject; i++) CasingCreator.composeEffect(entity.worldObj, entity, 0.625, -0.1875, -0.375D, -0.12, 0.18, 0, 0.01, -15F * (float)entity.getRNG().nextGaussian() * 7.5F, (float)entity.getRNG().nextGaussian() * 5F, casing.getName(), true, 60, 0.5D, 20); mag.setAmountAfterReload(stack, 0); } - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); } }; @@ -550,11 +551,11 @@ public class Orchestras { } } if(type == GunAnimation.RELOAD || type == GunAnimation.RELOAD_CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.glReload", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_GRENADE_RELOAD, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 9) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.glOpen", 1F, 1F); - if(timer == 27) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.glClose", 1F, 1F); + if(timer == 9) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_GRENADE_OPEN, 1F, 1F); + if(timer == 27) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_GRENADE_CLOSE, 1F, 1F); } }; @@ -569,7 +570,7 @@ public class Orchestras { if(timer < 5) { //start sound if(runningAudio == null || !runningAudio.isPlaying()) { - AudioWrapper audio = MainRegistry.proxy.getLoopedSound("hbm:weapon.fire.flameLoop", (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); + AudioWrapper audio = MainRegistry.proxy.getLoopedSound(NTMSounds.GUN_FLAMER_LOOP, (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); ItemGunBaseNT.loopedSounds.put(entity, audio); audio.startSound(); audio.attachTo(entity); @@ -591,11 +592,11 @@ public class Orchestras { if(entity.worldObj.isRemote) return; if(type == GunAnimation.RELOAD) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1F); - if(timer == 60) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); - if(timer == 70) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); - if(timer == 85) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pressureValve", 1F, 1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.5F, 1F); + if(timer == 60) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.75F); + if(timer == 70) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); + if(timer == 85) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_VALVE, 1F, 1F); } }; @@ -606,11 +607,11 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1F); - if(timer == 60) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); - if(timer == 70) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); - if(timer == 85) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pressureValve", 1F, 1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.5F, 1F); + if(timer == 60) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.75F); + if(timer == 70) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); + if(timer == 85) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_VALVE, 1F, 1F); } }; @@ -629,19 +630,19 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1.6F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.5F, 1.6F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } }; @@ -653,7 +654,7 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.EQUIP) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1.25F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -663,18 +664,18 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 4) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 4) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 17) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); - if(timer == 31) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 17) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); + if(timer == 31) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } }; @@ -685,7 +686,7 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.EQUIP) { - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1.25F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1.25F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); @@ -696,18 +697,18 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 4) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 4) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 17) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); - if(timer == 31) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1F); + if(timer == 17) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); + if(timer == 31) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1F); } }; @@ -720,35 +721,35 @@ public class Orchestras { if(type == GunAnimation.CYCLE || type == GunAnimation.ALT_CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCock", 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_COCK, 1F, 1F); if(timer == 10) { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); //turns out there's a reason why stovepipes look like that if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.375, aiming ? 0 : -0.125, aiming ? 0 : -0.25D, 0, 0.18, -0.12, 0.01, -3F + (float)entity.getRNG().nextGaussian() * 2.5F, -15F + entity.getRNG().nextFloat() * -5F, casing.getName()); } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 8) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 8) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_COCK, 1F, 1F); } if(type == GunAnimation.RELOAD) { IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack); if(mag.getAmount(stack, ctx.inventory) == 0) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.RELOAD_CYCLE) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunReload", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_LOAD, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockOpen", 1F, 1F); - if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockClose", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_OPEN, 1F, 1F); + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_CLOSE, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.foley.gunWhack", 1F, 1F); - if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.foley.gunWhack", 1F, 1F); - if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.shotgunCockClose", 1F, 1F); + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_WHACK, 1F, 1F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_WHACK, 1F, 1F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHOTGUN_CLOSE, 1F, 1F); } }; @@ -761,7 +762,7 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.RELOAD) { - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); } }; @@ -780,25 +781,25 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.9F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1.1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.9F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1.1F); } if(type == GunAnimation.RELOAD) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 22) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 22) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } if(type == GunAnimation.JAMMED) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); - if(timer == 23) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 27) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 19) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); + if(timer == 23) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 27) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } if(type == GunAnimation.INSPECT) { - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } }; @@ -818,25 +819,25 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.9F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 1.1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.9F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 1.1F); } if(type == GunAnimation.RELOAD) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 22) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 22) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } if(type == GunAnimation.JAMMED) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); - if(timer == 23) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 27) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 19) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); + if(timer == 23) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 27) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } if(type == GunAnimation.INSPECT) { - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.1F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.1F); } }; @@ -856,25 +857,25 @@ public class Orchestras { } } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 4) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 4) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 28) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 28) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -888,7 +889,7 @@ public class Orchestras { if(ItemGunStinger.getLockonProgress(stack) > 0 && !ItemGunStinger.getIsLockedOn(stack)) { //start sound if(runningAudio == null || !runningAudio.isPlaying()) { - AudioWrapper audio = MainRegistry.proxy.getLoopedSound("hbm:weapon.fire.lockon", (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); + AudioWrapper audio = MainRegistry.proxy.getLoopedSound(NTMSounds.GUN_LOCKON, (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); ItemGunBaseNT.loopedSounds.put(entity, audio); audio.startSound(); } @@ -907,7 +908,7 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.RELOAD) { - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); } }; @@ -922,7 +923,7 @@ public class Orchestras { if(timer < 5) { //start sound if(runningAudio == null || !runningAudio.isPlaying()) { - AudioWrapper audio = MainRegistry.proxy.getLoopedSound("hbm:weapon.fire.flameLoop", (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); + AudioWrapper audio = MainRegistry.proxy.getLoopedSound(NTMSounds.GUN_FLAMER_LOOP, (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 1F, 10); ItemGunBaseNT.loopedSounds.put(entity, audio); audio.startSound(); audio.attachTo(entity); @@ -952,14 +953,14 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.EQUIP) { - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 0.5F, 1.25F); - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 0.5F, 1.25F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 0.5F, 1.25F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 0.5F, 1.25F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); if(timer == 12) { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, @@ -970,28 +971,28 @@ public class Orchestras { } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 41) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 41) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 23) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 23) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 0.5F, 1F); - if(timer == 45) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 0.5F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 0.5F, 1F); + if(timer == 45) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 0.5F, 1F); } }; @@ -1003,7 +1004,7 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.EQUIP) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:turret.howard_reload", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.TURRET_CIWS_RELOAD, 1F, 1F); } if(type == GunAnimation.CYCLE) { @@ -1023,19 +1024,19 @@ public class Orchestras { if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHREDDER_CYCLE, 0.25F, 1.5F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.5F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHREDDER_CYCLE, 0.25F, 1.5F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 28) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 28) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } }; @@ -1061,28 +1062,28 @@ public class Orchestras { } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 4) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 55) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1F); - if(timer == 65) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 74) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 88) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); - if(timer == 100) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 4) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.75F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 55) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.5F, 1F); + if(timer == 65) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 74) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 88) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.75F); + if(timer == 100) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); if(timer == 55) ctx.config.getReceivers(stack)[0].getMagazine(stack).reloadAction(stack, ctx.inventory); } if(type == GunAnimation.INSPECT) { - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); - if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:player.gulp", 1F, 1F); - if(timer == 50) entity.worldObj.playSoundAtEntity(entity, "hbm:player.groan", 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.PLAYER_GULP, 1F, 1F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, NTMSounds.PLAYER_GULP, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.PLAYER_GULP, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.PLAYER_GULP, 1F, 1F); + if(timer == 50) entity.worldObj.playSoundAtEntity(entity, NTMSounds.PLAYER_GROAN, 1F, 1F); if(timer == 60) { entity.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 2)); entity.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 2)); @@ -1101,7 +1102,7 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.RELOAD) { - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); } }; @@ -1121,17 +1122,17 @@ public class Orchestras { if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.5, aiming ? -0.125 : -0.25, aiming ? -0.25 : -0.5D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 15F, (float)entity.getRNG().nextGaussian() * 15F, casing.getName()); } } - if(timer == (XWeaponModManager.hasUpgrade(stack, 0, 207) ? 3 : 1)) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == (XWeaponModManager.hasUpgrade(stack, 0, 207) ? 3 : 1)) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 1) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 1) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } }; @@ -1151,17 +1152,17 @@ public class Orchestras { if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, 0.25, -0.25, -0.5D * index, 0, 0.18, -0.12 * index, 0.01, (float)entity.getRNG().nextGaussian() * 15F, (float)entity.getRNG().nextGaussian() * 15F, casing.getName()); } } - if(timer == (XWeaponModManager.hasUpgrade(stack, 0, 207) ? 3 : 1)) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == (XWeaponModManager.hasUpgrade(stack, 0, 207) ? 3 : 1)) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 1) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 1) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverSpin", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_SPIN, 1F, 0.75F); } }; @@ -1175,17 +1176,17 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.25F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1.25F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 1F, 0.9F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); - if(timer == 42) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 1F, 0.9F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 1F, 0.9F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); + if(timer == 42) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 1F, 0.9F); } if(type == GunAnimation.JAMMED || type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 1F, 0.9F); - if(timer == 27) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 1F, 0.9F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 1F, 0.9F); + if(timer == 27) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 1F, 0.9F); } }; @@ -1196,14 +1197,14 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.CYCLE) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.25F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHREDDER_CYCLE, 0.25F, 1.25F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.shredderCycle", 0.25F, 1.25F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SHREDDER_CYCLE, 0.25F, 1.25F); } if(type == GunAnimation.INSPECT) { - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:block.squeakyToy", 0.25F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.BLOCK_PLUSHY, 0.25F, 1F); } }; @@ -1217,20 +1218,20 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1.5F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1.25F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1.25F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.25F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1.25F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1.25F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.25F); } if(type == GunAnimation.JAMMED) { - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 1F); - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1.25F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.25F, 1.5F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1.25F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.25F, 1.5F); } }; @@ -1248,25 +1249,25 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.125, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName()); } - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 0.25F, 1.25F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 0.25F, 1.25F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 0.25F, 1.25F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 0.25F, 1.25F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 24) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 34) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 24) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 34) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); - if(timer == 114) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 124) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 114) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 124) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } } else { if(type == GunAnimation.CYCLE) { @@ -1275,26 +1276,26 @@ public class Orchestras { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, aiming ? 0.125 : 0.25, aiming ? -0.125 : -0.25, aiming ? -0.125 : -0.25D, 0, 0.18, -0.12, 0.01, (float)entity.getRNG().nextGaussian() * 5F, 7.5F + entity.getRNG().nextFloat() * 5F, casing.getName()); } - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 0.25F, 1.25F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 0.25F, 1.25F); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.8F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.9F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 0.25F, 1.25F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.9F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 0.25F, 1.25F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.25F, 1.25F); - if(timer == 38) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 43) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.25F, 1.25F); + if(timer == 38) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 43) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.9F); - if(timer == 11) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.9F); + if(timer == 11) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); - if(timer == 72) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 1F); - if(timer == 84) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 72) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 1F); + if(timer == 84) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } } }; @@ -1309,7 +1310,7 @@ public class Orchestras { if(timer < 300) { if(runningAudio == null || !runningAudio.isPlaying()) { - AudioWrapper audio = MainRegistry.proxy.getLoopedSound("hbm:weapon.fire.tauLoop", (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 0.75F, 10); + AudioWrapper audio = MainRegistry.proxy.getLoopedSound(NTMSounds.GUN_TAU_LOOP, (float) entity.posX, (float) entity.posY, (float) entity.posZ, 1F, 15F, 0.75F, 10); audio.updatePitch(0.75F); ItemGunBaseNT.loopedSounds.put(entity, audio); audio.startSound(); @@ -1332,11 +1333,11 @@ public class Orchestras { if(entity.worldObj.isRemote) return; if(type == GunAnimation.CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.tau", 0.5F, 0.9F + entity.getRNG().nextFloat() * 0.2F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_TAU_FIRE, 0.5F, 0.9F + entity.getRNG().nextFloat() * 0.2F); } if(type == GunAnimation.ALT_CYCLE) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.fire.tau", 0.5F, 0.7F + entity.getRNG().nextFloat() * 0.2F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_TAU_FIRE, 0.5F, 0.7F + entity.getRNG().nextFloat() * 0.2F); } if(type == GunAnimation.SPINUP) { @@ -1356,8 +1357,8 @@ public class Orchestras { ItemGunBaseNT.setWear(stack, ctx.configIndex, Math.min(ItemGunBaseNT.getWear(stack, ctx.configIndex) + 10_000F, ctx.config.getDurability(stack))); - entity.worldObj.playSoundEffect(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ, "hbm:entity.ufoBlast", 5.0F, 0.9F); - entity.worldObj.playSoundEffect(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ, "fireworks.blast", 5.0F, 0.5F); + entity.worldObj.playSoundEffect(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ, NTMSounds.GUN_TESLA_BLAST, 5.0F, 0.9F); + entity.worldObj.playSoundEffect(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ, NTMSounds.VANILLA_FIREWORKS_BANG, 5.0F, 0.5F); float yaw = entity.worldObj.rand.nextFloat() * 180F; for(int i = 0; i < 3; i++) { @@ -1383,7 +1384,7 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.fatmanFull", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_FATMAN_RELOAD, 1F, 1F); } }; @@ -1397,26 +1398,26 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1.5F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1.5F); } if(type == GunAnimation.RELOAD) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.25F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 38) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.25F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 38) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 1F); - if(timer == 22) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 1F); + if(timer == 22) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } }; @@ -1430,7 +1431,7 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.coilgunReload", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_COIL_RELOAD, 1F, 1F); } }; @@ -1444,15 +1445,15 @@ public class Orchestras { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.8F); - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.8F); - if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.8F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); if(timer == 10) { Receiver rec = ctx.config.getReceivers(stack)[0]; @@ -1471,7 +1472,7 @@ public class Orchestras { mop.entityHit.attackEntityFrom(DamageSource.causePlayerDamage(ctx.getPlayer()), damage); mop.entityHit.motionX *= 2; mop.entityHit.motionZ *= 2; - entity.worldObj.playSoundAtEntity(mop.entityHit, "hbm:weapon.fire.smack", 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); + entity.worldObj.playSoundAtEntity(mop.entityHit, NTMSounds.GUN_SMACK, 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); } if(mop.typeOfHit == mop.typeOfHit.BLOCK) { Block b = entity.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); @@ -1482,10 +1483,10 @@ public class Orchestras { } if(type == GunAnimation.JAMMED) { - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.8F); - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.8F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); - if(timer == 25) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.8F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.8F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); + if(timer == 25) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); } }; @@ -1504,8 +1505,8 @@ public class Orchestras { } if(type == GunAnimation.RELOAD) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magRemove", 1F, 1F); - if(timer == 26) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magInsert", 1F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_REMOVE, 1F, 1F); + if(timer == 26) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_INSERT, 1F, 1F); } }; @@ -1516,9 +1517,9 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.screw", 1F, 1F); - if(timer == 80) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertRocket", 1F, 1F); - if(timer == 120) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.screw", 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SCREW, 1F, 1F); + if(timer == 80) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_ROCKET_INSERT, 1F, 1F); + if(timer == 120) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_SCREW, 1F, 1F); } }; @@ -1529,9 +1530,9 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); - if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 0.9F); - if(timer == 29) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); + if(timer == 19) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 0.9F); + if(timer == 29) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.8F); if(timer == 12) { IMagazine mag = ctx.config.getReceivers(stack)[0].getMagazine(stack); @@ -1542,14 +1543,14 @@ public class Orchestras { } if(type == GunAnimation.INSPECT) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverCock", 1F, 0.75F); - if(timer == 19) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.8F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_COCK, 1F, 0.75F); + if(timer == 19) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.8F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 2) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 1F); + if(timer == 2) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 1F); } }; @@ -1561,9 +1562,9 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack); if(type == GunAnimation.RELOAD) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallRemove", 1F, 0.75F); - if(timer == 32) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.magSmallInsert", 1F, 0.75F); - if(timer == 42) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.75F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_REMOVE, 1F, 0.75F); + if(timer == 32) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_MAG_SMALL_INSERT, 1F, 0.75F); + if(timer == 42) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.75F); } if(type == GunAnimation.CYCLE) { @@ -1576,8 +1577,8 @@ public class Orchestras { } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 1) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 9) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pistolCock", 1F, 0.75F); + if(timer == 1) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 9) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_PISTOL_COCK, 1F, 0.75F); } }; @@ -1589,14 +1590,14 @@ public class Orchestras { boolean aiming = ItemGunBaseNT.getIsAiming(stack) && !XWeaponModManager.hasUpgrade(stack, 0, XWeaponModManager.ID_SCOPE); if(type == GunAnimation.EQUIP) { - if(timer == 10) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1F); - if(timer == 18) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 1F); + if(timer == 10) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1F); + if(timer == 18) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 1F); } if(type == GunAnimation.CYCLE) { if(timer == 0) PacketDispatcher.wrapper.sendToAllAround(new MuzzleFlashPacket(entity), new TargetPoint(entity.worldObj.provider.dimensionId, entity.posX, entity.posY, entity.posZ, 100)); - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); if(timer == 12) { SpentCasing casing = ctx.config.getReceivers(stack)[0].getMagazine(stack).getCasing(stack, ctx.inventory); if(casing != null) CasingCreator.composeEffect(entity.worldObj, entity, @@ -1607,27 +1608,27 @@ public class Orchestras { } if(type == GunAnimation.CYCLE_DRY) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); - if(timer == 7) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); + if(timer == 7) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 1F, 1F); - if(timer == 20) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.rifleCock", 1F, 1F); - if(timer == 36) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 1F, 1F); + if(timer == 20) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_RIFLE_COCK, 1F, 1F); + if(timer == 36) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 1F, 1F); } if(type == GunAnimation.JAMMED) { - if(timer == 5) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 12) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); - if(timer == 16) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 23) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 5) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 12) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); + if(timer == 16) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 23) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } if(type == GunAnimation.INSPECT) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltOpen", 0.5F, 1F); - if(timer == 17) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 0.5F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_OPEN, 0.5F, 1F); + if(timer == 17) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 0.5F, 1F); } }; @@ -1638,7 +1639,7 @@ public class Orchestras { int timer = ItemGunBaseNT.getAnimTimer(stack, ctx.configIndex); if(type == GunAnimation.RELOAD) { - if(timer == 0) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pressureValve", 1F, 1F); + if(timer == 0) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_VALVE, 1F, 1F); } }; @@ -1650,12 +1651,12 @@ public class Orchestras { if(type == GunAnimation.CYCLE_DRY) { Entity e = entity.worldObj.getEntityByID(ItemGunChargeThrower.getLastHook(stack)); - if(timer == 0 && e == null) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.dryFireClick", 1F, 0.75F); + if(timer == 0 && e == null) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_DRY_FIRE, 1F, 0.75F); } if(type == GunAnimation.RELOAD) { - if(timer == 30) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertRocket", 1F, 1F); - if(timer == 40) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.boltClose", 1F, 1F); + if(timer == 30) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_ROCKET_INSERT, 1F, 1F); + if(timer == 40) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_BOLT_CLOSE, 1F, 1F); } }; @@ -1673,7 +1674,7 @@ public class Orchestras { //start sound if(runningAudio == null || !runningAudio.isPlaying()) { boolean electric = XWeaponModManager.hasUpgrade(stack, ctx.configIndex, XWeaponModManager.ID_ENGINE_ELECTRIC); - AudioWrapper audio = MainRegistry.proxy.getLoopedSound(electric ? "hbm:block.largeTurbineRunning" : "hbm:block.engine", (float) entity.posX, (float) entity.posY, (float) entity.posZ, (float) speed, 15F, (float) speed, 25); + AudioWrapper audio = MainRegistry.proxy.getLoopedSound(electric ? NTMSounds.TURBINE_LARGE_LOOP : NTMSounds.ELECTRIC_ENGINE_LOOP, (float) entity.posX, (float) entity.posY, (float) entity.posZ, (float) speed, 15F, (float) speed, 25); ItemGunBaseNT.loopedSounds.put(entity, audio); audio.startSound(); audio.attachTo(entity); @@ -1698,11 +1699,11 @@ public class Orchestras { if(entity.worldObj.isRemote) return; if(type == GunAnimation.RELOAD) { - if(timer == 15) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.openLatch", 1F, 1F); - if(timer == 35) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.impact", 0.5F, 1F); - if(timer == 60) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.revolverClose", 1F, 0.75F); - if(timer == 70) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.insertCanister", 1F, 1F); - if(timer == 85) entity.worldObj.playSoundAtEntity(entity, "hbm:weapon.reload.pressureValve", 1F, 1F); + if(timer == 15) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_LATCH_OPEN, 1F, 1F); + if(timer == 35) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_IMPACT, 0.5F, 1F); + if(timer == 60) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_REVOLVER_CLOSE, 1F, 0.75F); + if(timer == 70) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_CANISTER_INSERT, 1F, 1F); + if(timer == 85) entity.worldObj.playSoundAtEntity(entity, NTMSounds.GUN_VALVE, 1F, 1F); } }; } diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java index 9c9388d27..2884ca36b 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java @@ -16,6 +16,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -53,7 +54,7 @@ public class XFactory10ga { ModItems.gun_double_barrel = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig() .dura(1000).draw(10).inspect(39).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(30F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound("hbm:weapon.fire.shotgun", 1.0F, 0.9F) + .dmg(30F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 0.9F) .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug, g10_explosive)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL)) @@ -63,7 +64,7 @@ public class XFactory10ga { ModItems.gun_double_barrel_sacred_dragon = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(6000).draw(10).inspect(39).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(45F).spreadAmmo(1.35F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound("hbm:weapon.fire.shotgun", 1.0F, 0.9F) + .dmg(45F).spreadAmmo(1.35F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 0.9F) .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug, g10_explosive)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL)) @@ -74,7 +75,7 @@ public class XFactory10ga { ModItems.gun_autoshotgun_heretic = new ItemGunBaseNT(WeaponQuality.DEBUG, new GunConfig() .draw(20).inspect(65).reloadSequential(true).inspectCancel(false).crosshair(Crosshair.L_CIRCLE).hideCrosshair(false).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(100F).delay(3).auto(true).dryfireAfterAuto(true).reload(110).jam(19).sound("hbm:weapon.fire.shotgunAuto", 1.0F, 1.0F) + .dmg(100F).delay(3).auto(true).dryfireAfterAuto(true).reload(110).jam(19).sound(NTMSounds.GUN_SHREDDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 250).addConfigs(g10, g10_shrapnel, g10_du, g10_slug, g10_explosive)) .offset(0.75, -0.125, -0.25) .canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(XFactory12ga.LAMBDA_RECOIL_SEXY)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java index dc391e747..c36d5772e 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java @@ -27,6 +27,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.toclient.AuxParticlePacketNT; @@ -97,7 +98,7 @@ public class XFactory12ga { pippo.posY = mop.hitVec.yCoord + 50; pippo.posZ = mop.hitVec.zCoord;; bullet.worldObj.spawnEntityInWorld(pippo); - bullet.worldObj.playSoundEffect(pippo.posX, pippo.posY + 50, pippo.posZ, "hbm:weapon.boat", 100F, 1F); + bullet.worldObj.playSoundEffect(pippo.posX, pippo.posY + 50, pippo.posZ, NTMSounds.GUN_SOLDIER_TF2_BOAT_EXE_WAV_MP3, 100F, 1F); bullet.setDead(); }; @@ -292,7 +293,7 @@ public class XFactory12ga { ModItems.gun_maresleg = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(600).draw(10).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(16F).delay(20).reload(22, 10, 13, 0).jam(24).sound("hbm:weapon.fire.shotgun", 1.0F, 1.0F) + .dmg(16F).delay(20).reload(22, 10, 13, 0).jam(24).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 6).addConfigs(all)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG)) @@ -303,7 +304,7 @@ public class XFactory12ga { ModItems.gun_maresleg_akimbo = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig().dura(600).draw(5).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(16F).spreadHipfire(0F).spreadAmmo(1.35F).delay(20).reload(22, 10, 13, 0).jam(24).sound("hbm:weapon.fire.shotgun", 1.0F, 1.0F) + .dmg(16F).spreadHipfire(0F).spreadAmmo(1.35F).delay(20).reload(22, 10, 13, 0).jam(24).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 6).addConfigs(all)) .offset(0.75, -0.0625, 0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG)) @@ -312,7 +313,7 @@ public class XFactory12ga { .anim(LAMBDA_MARESLEG_SHORT_ANIMS).orchestra(Orchestras.ORCHESTRA_MARESLEG_AKIMBO), new GunConfig().dura(600).draw(5).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(16F).spreadHipfire(0F).spreadAmmo(1.35F).delay(20).reload(22, 10, 13, 0).jam(24).sound("hbm:weapon.fire.shotgun", 1.0F, 1.0F) + .dmg(16F).spreadHipfire(0F).spreadAmmo(1.35F).delay(20).reload(22, 10, 13, 0).jam(24).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(1, 6).addConfigs(all)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG)) @@ -323,7 +324,7 @@ public class XFactory12ga { ModItems.gun_maresleg_broken = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(0).draw(5).inspect(39).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(48F).spreadAmmo(1.15F).delay(20).reload(22, 10, 13, 0).jam(24).sound("hbm:weapon.fire.shotgun", 1.0F, 1.0F) + .dmg(48F).spreadAmmo(1.15F).delay(20).reload(22, 10, 13, 0).jam(24).sound(NTMSounds.GUN_SHOTGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 6).addConfigs(g12_equestrian_tkr, g12_bp, g12_bp_magnum, g12_bp_slug, g12, g12_slug, g12_flechette, g12_magnum, g12_explosive, g12_phosphorus)) .offset(0.75, -0.0625, -0.1875) .canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(LAMBDA_RECOIL_MARESLEG)) @@ -334,7 +335,7 @@ public class XFactory12ga { ModItems.gun_liberator = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(200).draw(20).inspect(21).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(16F).delay(20).rounds(4).reload(25, 15, 7, 0).jam(45).sound("hbm:weapon.fire.shotgunAlt", 1.0F, 1.0F) + .dmg(16F).delay(20).rounds(4).reload(25, 15, 7, 0).jam(45).sound(NTMSounds.GUN_LIBERATOR_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 4).addConfigs(all)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_LIBERATOR)) @@ -345,7 +346,7 @@ public class XFactory12ga { ModItems.gun_spas12 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(600).draw(20).inspect(39).reloadSequential(true).reloadChangeType(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(32F).spreadHipfire(0F).delay(20).reload(5, 10, 10, 10, 0).jam(36).sound("hbm:weapon.shotgunShoot", 1.0F, 1.0F) + .dmg(32F).spreadHipfire(0F).delay(20).reload(5, 10, 10, 10, 0).jam(36).sound(NTMSounds.GUN_SPAS_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 8).addConfigs(all)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_MARESLEG)) @@ -356,7 +357,7 @@ public class XFactory12ga { ModItems.gun_autoshotgun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(2_000).draw(10).inspect(33).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(48F).delay(10).auto(true).autoAfterDry(true).dryfireAfterAuto(true).reload(44).jam(19).sound("hbm:weapon.fire.shotgunAuto", 1.0F, 1.0F) + .dmg(48F).delay(10).auto(true).autoAfterDry(true).dryfireAfterAuto(true).reload(44).jam(19).sound(NTMSounds.GUN_SHREDDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 20).addConfigs(all)) .offset(0.75, -0.125, -0.25) .setupStandardFire().recoil(LAMBDA_RECOIL_AUTOSHOTGUN)) @@ -366,7 +367,7 @@ public class XFactory12ga { ModItems.gun_autoshotgun_shredder = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(2_000).draw(10).inspect(33).reloadSequential(true).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(50F).delay(10).auto(true).autoAfterDry(true).dryfireAfterAuto(true).reload(44).jam(19).sound("hbm:weapon.fire.shotgunAuto", 1.0F, 1.0F) + .dmg(50F).delay(10).auto(true).autoAfterDry(true).dryfireAfterAuto(true).reload(44).jam(19).sound(NTMSounds.GUN_SHREDDER_FIRE, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(g12_shredder, g12_shredder_slug, g12_shredder_flechette, g12_shredder_magnum, g12_shredder_explosive, g12_shredder_phosphorus)) .offset(0.75, -0.125, -0.25) .setupStandardFire().recoil(LAMBDA_RECOIL_AUTOSHOTGUN)) @@ -377,7 +378,7 @@ public class XFactory12ga { ModItems.gun_autoshotgun_sexy = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(5_000).draw(20).inspect(65).reloadSequential(true).inspectCancel(false).crosshair(Crosshair.L_CIRCLE).hideCrosshair(false).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(64F).delay(4).auto(true).dryfireAfterAuto(true).reload(110).jam(19).sound("hbm:weapon.fire.shotgunAuto", 1.0F, 1.0F) + .dmg(64F).delay(4).auto(true).dryfireAfterAuto(true).reload(110).jam(19).sound(NTMSounds.GUN_SHREDDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 100).addConfigs(g12_equestrian_bj, g12_bp, g12_bp_magnum, g12_bp_slug, g12, g12_slug, g12_flechette, g12_magnum, g12_explosive, g12_phosphorus)) .offset(0.75, -0.125, -0.25) .setupStandardFire().recoil(LAMBDA_RECOIL_SEXY)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java index 224fcbbb5..034d9c7bc 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory22lr.java @@ -18,6 +18,7 @@ import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; @@ -49,7 +50,7 @@ public class XFactory22lr { ModItems.gun_am180 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(177 * 25).draw(15).inspect(38).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(2F).delay(1).dry(10).auto(true).spread(0.01F).reload(66).jam(30).sound("hbm:weapon.fire.greaseGun", 1.0F, 1.0F) + .dmg(2F).delay(1).dry(10).auto(true).spread(0.01F).reload(66).jam(30).sound(NTMSounds.GUN_GREASEGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 177).addConfigs(p22_sp, p22_fmj, p22_jhp, p22_ap)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_AM180)) @@ -61,7 +62,7 @@ public class XFactory22lr { ModItems.gun_star_f = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(15 * 25).draw(15).inspect(38).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound("hbm:weapon.fire.pistolLight", 1.0F, 1.0F) + .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound(NTMSounds.GUN_STARF_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 15).addConfigs(p22_sp, p22_fmj, p22_jhp, p22_ap)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_STAR_F)) @@ -73,7 +74,7 @@ public class XFactory22lr { ModItems.gun_star_f_akimbo = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig().dura(15 * 25).draw(15).inspect(38).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound("hbm:weapon.fire.pistolLight", 1.0F, 1.0F) + .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound(NTMSounds.GUN_STARF_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 15).addConfigs(p22_sp, p22_fmj, p22_jhp, p22_ap)) .offset(1, -0.0625 * 1.5, 0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_STAR_F)) @@ -82,7 +83,7 @@ public class XFactory22lr { .anim(LAMBDA_STAR_F_ANIMS).orchestra(Orchestras.ORCHESTRA_STAR_F_AKIMBO), new GunConfig().dura(15 * 25).draw(15).inspect(38).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound("hbm:weapon.fire.pistolLight", 1.0F, 1.0F) + .dmg(12.5F).delay(5).dry(17).spread(0.01F).reload(40).jam(32).sound(NTMSounds.GUN_STARF_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(1, 15).addConfigs(p22_sp, p22_fmj, p22_jhp, p22_ap)) .offset(1, -0.0625 * 1.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_STAR_F)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java index 65ea91771..3b878c351 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory357.java @@ -14,6 +14,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationKeyframe.IType; @@ -41,7 +42,7 @@ public class XFactory357 { ModItems.gun_light_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(7.5F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.pistol", 1.0F, 1.0F) + .dmg(7.5F).delay(11).reload(55).jam(45).sound(NTMSounds.GUN_PISTOL_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(m357_bp, m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_ATLAS)) @@ -51,7 +52,7 @@ public class XFactory357 { ModItems.gun_light_revolver_atlas = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(12.5F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.pistol", 1.0F, 1.0F) + .dmg(12.5F).delay(11).reload(55).jam(45).sound(NTMSounds.GUN_PISTOL_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(m357_bp, m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_ATLAS)) @@ -61,7 +62,7 @@ public class XFactory357 { ModItems.gun_light_revolver_dani = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig().dura(30_000).draw(20).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(15F).spreadHipfire(0F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.pistol", 1.0F, 1.1F) + .dmg(15F).spreadHipfire(0F).delay(11).reload(55).jam(45).sound(NTMSounds.GUN_PISTOL_FIRE, 1.0F, 1.1F) .mag(new MagazineFullReload(0, 6).addConfigs(m357_bp, m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express)) .offset(0.75, -0.0625, 0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_DANI)) @@ -70,7 +71,7 @@ public class XFactory357 { .anim(LAMBDA_DANI_ANIMS).orchestra(Orchestras.ORCHESTRA_DANI), new GunConfig().dura(30_000).draw(20).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(15F).spreadHipfire(0F).delay(11).reload(55).jam(45).sound("hbm:weapon.fire.pistol", 1.0F, 0.9F) + .dmg(15F).spreadHipfire(0F).delay(11).reload(55).jam(45).sound(NTMSounds.GUN_PISTOL_FIRE, 1.0F, 0.9F) .mag(new MagazineFullReload(1, 6).addConfigs(m357_bp, m357_sp, m357_fmj, m357_jhp, m357_ap, m357_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_DANI)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory35800.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory35800.java index 7e89c9cd5..4abb364bb 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory35800.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory35800.java @@ -16,6 +16,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -59,7 +60,7 @@ public class XFactory35800 { ModItems.gun_aberrator = new ItemGunBaseNT(WeaponQuality.SECRET, new GunConfig() .dura(2_000).draw(10).inspect(26).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(100F).delay(13).dry(21).reload(51).sound("hbm:weapon.fire.aberrator", 1.0F, 1.0F) + .dmg(100F).delay(13).dry(21).reload(51).sound(NTMSounds.GUN_ABERRATOR_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 5).addConfigs(p35800, p35800_bl)) .offset(0.75, -0.0625 * 1.5, -0.1875) .canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(LAMBDA_RECOIL_ABERRATOR)) @@ -70,7 +71,7 @@ public class XFactory35800 { ModItems.gun_aberrator_eott = new ItemGunBaseNT(WeaponQuality.SECRET, new GunConfig().dura(2_000).draw(10).inspect(26).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(100F).spreadHipfire(0F).delay(13).dry(21).reload(51).sound("hbm:weapon.fire.aberrator", 1.0F, 1.0F) + .dmg(100F).spreadHipfire(0F).delay(13).dry(21).reload(51).sound(NTMSounds.GUN_ABERRATOR_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 5).addConfigs(p35800, p35800_bl)) .offset(0.75, -0.0625 * 1.5, 0.1875) .canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(LAMBDA_RECOIL_ABERRATOR)) @@ -79,7 +80,7 @@ public class XFactory35800 { .anim(LAMBDA_ABERRATOR).orchestra(Orchestras.ORCHESTRA_ABERRATOR), new GunConfig().dura(2_000).draw(10).inspect(26).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(100F).spreadHipfire(0F).delay(13).dry(21).reload(51).sound("hbm:weapon.fire.aberrator", 1.0F, 1.0F) + .dmg(100F).spreadHipfire(0F).delay(13).dry(21).reload(51).sound(NTMSounds.GUN_ABERRATOR_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(1, 5).addConfigs(p35800, p35800_bl)) .offset(0.75, -0.0625 * 1.5, -0.1875) .canFire(Lego.LAMBDA_STANDARD_CAN_FIRE).fire(Lego.LAMBDA_NOWEAR_FIRE).recoil(LAMBDA_RECOIL_ABERRATOR)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java index 744c673b8..3f54e55b8 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory40mm.java @@ -27,6 +27,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; @@ -156,7 +157,7 @@ public class XFactory40mm { ModItems.gun_flaregun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(100).draw(7).inspect(39).crosshair(Crosshair.L_CIRCUMFLEX).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(15F).delay(20).reload(28).jam(33).sound("hbm:weapon.hkShoot", 1.0F, 1.0F) + .dmg(15F).delay(20).reload(28).jam(33).sound(NTMSounds.GUN_UNDERBARREL_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(g26_flare, g26_flare_supply, g26_flare_weapon)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_GL)) @@ -167,7 +168,7 @@ public class XFactory40mm { ModItems.gun_congolake = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(400).draw(7).inspect(39).reloadSequential(true).reloadChangeType(true).crosshair(Crosshair.L_CIRCUMFLEX).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(20F).delay(24).reload(16, 16, 16, 0).jam(0).sound("hbm:weapon.glShoot", 1.0F, 1.0F) + .dmg(20F).delay(24).reload(16, 16, 16, 0).jam(0).sound(NTMSounds.GUN_CONGO_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 4).addConfigs(g40_he, g40_heat, g40_demo, g40_inc, g40_phosphorus)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_GL)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java index 20fefa6eb..059a48e23 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory44.java @@ -23,6 +23,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.lib.RefStrings; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -53,7 +54,7 @@ public class XFactory44 { pippo.posY = mop.hitVec.yCoord + 50; pippo.posZ = mop.hitVec.zCoord;; bullet.worldObj.spawnEntityInWorld(pippo); - bullet.worldObj.playSoundEffect(pippo.posX, pippo.posY + 50, pippo.posZ, "hbm:alarm.trainHorn", 100F, 1F); + bullet.worldObj.playSoundEffect(pippo.posX, pippo.posY + 50, pippo.posZ, NTMSounds.GUN_GO_GO_GADGET_FUCK_EVERYTHING_IN_THIS_GENERAL_DIRECTION, 100F, 1F); bullet.setDead(); }; @@ -88,7 +89,7 @@ public class XFactory44 { ModItems.gun_henry = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(15).inspect(23).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(10F).delay(20).reload(25, 11, 14, 8).jam(45).sound("hbm:weapon.fire.rifle", 1.0F, 1.0F) + .dmg(10F).delay(20).reload(25, 11, 14, 8).jam(45).sound(NTMSounds.GUN_RIFLE_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 14).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_HENRY)) @@ -98,7 +99,7 @@ public class XFactory44 { ModItems.gun_henry_lincoln = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(300).draw(15).inspect(23).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(20F).spreadHipfire(0F).delay(20).reload(25, 11, 14, 8).jam(45).sound("hbm:weapon.fire.rifle", 1.0F, 1.25F) + .dmg(20F).spreadHipfire(0F).delay(20).reload(25, 11, 14, 8).jam(45).sound(NTMSounds.GUN_RIFLE_FIRE, 1.0F, 1.25F) .mag(new MagazineSingleReload(0, 14).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_HENRY)) @@ -109,7 +110,7 @@ public class XFactory44 { ModItems.gun_heavy_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(600).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(15F).delay(14).reload(46).jam(23).sound("hbm:weapon.44Shoot", 1.0F, 1.0F) + .dmg(15F).delay(14).reload(46).jam(23).sound(NTMSounds.GUN_HEAVY_REVOLVER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP)) @@ -120,7 +121,7 @@ public class XFactory44 { ModItems.gun_heavy_revolver_lilmac = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(31_000).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).scopeTexture(scope_lilmac).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(30F).delay(14).reload(46).jam(23).sound("hbm:weapon.44Shoot", 1.0F, 1.0F) + .dmg(30F).delay(14).reload(46).jam(23).sound(NTMSounds.GUN_HEAVY_REVOLVER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(m44_equestrian_pip, m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP)) @@ -130,7 +131,7 @@ public class XFactory44 { ModItems.gun_heavy_revolver_protege = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(31_000).draw(10).inspect(23).crosshair(Crosshair.L_CLASSIC).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(30F).delay(14).reload(46).jam(23).sound("hbm:weapon.44Shoot", 1.0F, 0.8F) + .dmg(30F).delay(14).reload(46).jam(23).sound(NTMSounds.GUN_HEAVY_REVOLVER_FIRE, 1.0F, 0.8F) .mag(new MagazineFullReload(0, 6).addConfigs(m44_equestrian_mn7, m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(0.75, -0.0625, -0.3125D) .setupStandardFire().recoil(LAMBDA_RECOIL_NOPIP)) @@ -141,7 +142,7 @@ public class XFactory44 { ModItems.gun_hangman = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(600).draw(10).inspect(31).inspectCancel(false).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(25F).delay(10).reload(46).jam(23).sound("hbm:weapon.44Shoot", 1.0F, 1.0F) + .dmg(25F).delay(10).reload(46).jam(23).sound(NTMSounds.GUN_HEAVY_REVOLVER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 8).addConfigs(m44_bp, m44_sp, m44_fmj, m44_jhp, m44_ap, m44_express)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_HANGMAN)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java index c08e637e3..5706b6e1a 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java @@ -19,6 +19,7 @@ import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.weapon.sedna.mags.MagazineBelt; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.lib.RefStrings; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -83,7 +84,7 @@ public class XFactory50 { ModItems.gun_amat = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(350).draw(20).inspect(50).crosshair(Crosshair.CIRCLE).scopeTexture(scope).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(30F).delay(25).dry(25).spreadHipfire(0.05F).reload(51).jam(43).sound("hbm:weapon.fire.amat", 1.0F, 1.0F) + .dmg(30F).delay(25).dry(25).spreadHipfire(0.05F).reload(51).jam(43).sound(NTMSounds.GUN_AMAT_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 7).addConfigs(bmg50_sp, bmg50_fmj, bmg50_jhp, bmg50_ap, bmg50_du, bmg50_sm, bmg50_he)) .offset(1, -0.0625 * 1.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_AMAT)) @@ -93,7 +94,7 @@ public class XFactory50 { ModItems.gun_amat_subtlety = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(1_000).draw(20).inspect(50).crosshair(Crosshair.CIRCLE).scopeTexture(scope).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(50F).delay(25).dry(25).spreadHipfire(0.05F).reload(51).jam(43).sound("hbm:weapon.fire.amat", 1.0F, 1.0F) + .dmg(50F).delay(25).dry(25).spreadHipfire(0.05F).reload(51).jam(43).sound(NTMSounds.GUN_AMAT_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 7).addConfigs(bmg50_equestrian, bmg50_sp, bmg50_fmj, bmg50_jhp, bmg50_ap, bmg50_du, bmg50_sm, bmg50_he)) .offset(1, -0.0625 * 1.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_AMAT)) @@ -103,7 +104,7 @@ public class XFactory50 { ModItems.gun_amat_penance = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(5_000).draw(20).inspect(50).crosshair(Crosshair.CIRCLE).scopeTexture(scope_thermal).thermalSights(true).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(45F).delay(25).dry(25).spreadHipfire(0F).reload(51).jam(43).sound("hbm:weapon.silencerShoot", 1.0F, 1.0F) + .dmg(45F).delay(25).dry(25).spreadHipfire(0F).reload(51).jam(43).sound(NTMSounds.GUN_AMAT_SILENCER, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 7).addConfigs(bmg50_sp, bmg50_fmj, bmg50_jhp, bmg50_ap, bmg50_du, bmg50_sm, bmg50_he, bmg50_black)) .offset(1, -0.0625 * 1.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_AMAT)) @@ -114,7 +115,7 @@ public class XFactory50 { ModItems.gun_m2 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(10).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(7.5F).delay(2).dry(10).auto(true).spread(0.005F).sound("hbm:turret.chekhov_fire", 1.0F, 1.0F) + .dmg(7.5F).delay(2).dry(10).auto(true).spread(0.005F).sound(NTMSounds.TURRET_50BMG, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(bmg50_sp, bmg50_fmj, bmg50_jhp, bmg50_ap, bmg50_du, bmg50_he)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_M2)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java index 93ff198b7..7bae1b62d 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory556mm.java @@ -22,6 +22,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; @@ -75,7 +76,7 @@ public class XFactory556mm { ModItems.gun_g3 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(10).inspect(33).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(5F).delay(2).auto(true).dry(15).reload(50).jam(47).sound("hbm:weapon.fire.assault", 1.0F, 1.0F) + .dmg(5F).delay(2).auto(true).dry(15).reload(50).jam(47).sound(NTMSounds.GUN_ASSAULT_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(r556_sp, r556_fmj, r556_jhp, r556_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_G3)) @@ -85,7 +86,7 @@ public class XFactory556mm { ModItems.gun_g3_zebra = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(6_000).draw(10).inspect(33).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE).scopeTexture(scope) .rec(new Receiver(0) - .dmg(7.5F).delay(2).auto(true).dry(15).spreadHipfire(0.01F).reload(50).jam(47).sound("hbm:weapon.fire.silenced", 1.0F, 1.0F) + .dmg(7.5F).delay(2).auto(true).dry(15).spreadHipfire(0.01F).reload(50).jam(47).sound(NTMSounds.GUN_RIFLE_SILENCER, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(r556_inc_sp, r556_inc_fmj, r556_inc_jhp, r556_inc_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_ZEBRA)) @@ -96,7 +97,7 @@ public class XFactory556mm { ModItems.gun_stg77 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(10).inspect(125).crosshair(Crosshair.CIRCLE).scopeTexture(scope).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(10F).delay(2).dry(15).auto(true).reload(46).jam(0).sound("hbm:weapon.fire.assault", 1.0F, 1.0F) + .dmg(10F).delay(2).dry(15).auto(true).reload(46).jam(0).sound(NTMSounds.GUN_ASSAULT_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(r556_sp, r556_fmj, r556_jhp, r556_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_STG)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java index e4782f41c..10f15fd83 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory75Bolt.java @@ -15,6 +15,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -58,7 +59,7 @@ public class XFactory75Bolt { ModItems.gun_bolter = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig() .dura(3_000).draw(20).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(15F).delay(2).auto(true).spread(0.005F).reload(40).jam(55).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) + .dmg(15F).delay(2).auto(true).spread(0.005F).reload(40).jam(55).sound(NTMSounds.GUN_POWDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(b75, b75_inc, b75_exp)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_BOLT)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java index 65e58feeb..88333c20f 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java @@ -18,6 +18,7 @@ import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineBelt; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -69,7 +70,7 @@ public class XFactory762mm { ModItems.gun_carbine = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(10).inspect(31).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(15F).delay(5).dry(15).spread(0.0F).reload(30, 0, 15, 0).jam(60).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) + .dmg(15F).delay(5).dry(15).spread(0.0F).reload(30, 0, 15, 0).jam(60).sound(NTMSounds.GUN_POWDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 14).addConfigs(r762_sp, r762_fmj, r762_jhp, r762_ap, r762_du, r762_he)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_CARBINE)) @@ -80,7 +81,7 @@ public class XFactory762mm { ModItems.gun_minigun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound("hbm:weapon.calShoot", 1.0F, 1.0F) + .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound(NTMSounds.GUN_MINIGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(r762_sp, r762_fmj, r762_jhp, r762_ap, r762_du, r762_he)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_MINIGUN)) @@ -90,7 +91,7 @@ public class XFactory762mm { ModItems.gun_minigun_lacunae = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE) .rec(new Receiver(0) - .dmg(12F).delay(1).auto(true).dry(15).reload(15).spread(0.01F).sound("hbm:weapon.fire.laserGatling", 1.0F, 1.0F) + .dmg(12F).delay(1).auto(true).dry(15).reload(15).spread(0.01F).sound(NTMSounds.GUN_LASER_GATLING_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 200).addConfigs(energy_lacunae, energy_lacunae_overcharge, energy_lacunae_ir)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_LACUNAE)) @@ -101,7 +102,7 @@ public class XFactory762mm { new GunConfig() .dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound("hbm:weapon.calShoot", 1.0F, 1.0F) + .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound(NTMSounds.GUN_MINIGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(r762_sp, r762_fmj, r762_jhp, r762_ap, r762_du, r762_he)) .offset(1, -0.0625 * 2.5, 0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_MINIGUN)) @@ -111,7 +112,7 @@ public class XFactory762mm { new GunConfig() .dura(50_000).draw(20).inspect(20).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound("hbm:weapon.calShoot", 1.0F, 1.0F) + .dmg(6F).delay(1).auto(true).dry(15).spread(0.01F).sound(NTMSounds.GUN_MINIGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(r762_sp, r762_fmj, r762_jhp, r762_ap, r762_du, r762_he)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_MINIGUN)) @@ -123,7 +124,7 @@ public class XFactory762mm { ModItems.gun_mas36 = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(5_000).draw(20).inspect(31).reloadSequential(true).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(30F).delay(25).dry(25).spread(0.0F).reload(43).jam(43).sound("hbm:weapon.fire.rifleHeavy", 1.0F, 1.0F) + .dmg(30F).delay(25).dry(25).spread(0.0F).reload(43).jam(43).sound(NTMSounds.GUN_HEAVY_RIFLE_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 7).addConfigs(r762_sp, r762_fmj, r762_jhp, r762_ap, r762_du, r762_he)) .offset(1, -0.0625 * 1.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_CARBINE)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java index cbc10cf4a..88aeb80f6 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java @@ -19,6 +19,7 @@ import com.hbm.items.weapon.sedna.mags.IMagazine; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.particle.SpentCasing; import com.hbm.particle.SpentCasing.CasingType; @@ -53,7 +54,7 @@ public class XFactory9mm { ModItems.gun_greasegun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(20).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(3F).delay(4).dry(40).auto(true).spread(0.015F).reload(60).jam(55).sound("hbm:weapon.fire.greaseGun", 1.0F, 1.0F) + .dmg(3F).delay(4).dry(40).auto(true).spread(0.015F).reload(60).jam(55).sound(NTMSounds.GUN_GREASEGUN_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_GREASEGUN)) @@ -65,7 +66,7 @@ public class XFactory9mm { ModItems.gun_lag = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(1_700).draw(7).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(25F).delay(4).dry(10).spread(0.005F).reload(53).jam(44).sound("hbm:weapon.fire.pistol", 1.0F, 1.0F) + .dmg(25F).delay(4).dry(10).spread(0.005F).reload(53).jam(44).sound(NTMSounds.GUN_PISTOL_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 17).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().fire(LAMBDA_FIRE_LAG).recoil(LAMBDA_RECOIL_LAG)) @@ -76,7 +77,7 @@ public class XFactory9mm { ModItems.gun_uzi = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(3F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound("hbm:weapon.fire.uzi", 1.0F, 1.0F) + .dmg(3F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound(NTMSounds.GUN_UZI_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_UZI)) @@ -87,7 +88,7 @@ public class XFactory9mm { ModItems.gun_uzi_akimbo = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig().dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(3F).spreadHipfire(0F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound("hbm:weapon.fire.uzi", 1.0F, 1.0F) + .dmg(3F).spreadHipfire(0F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound(NTMSounds.GUN_UZI_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) .offset(1, -0.0625 * 2.5, 0.375D) .setupStandardFire().recoil(LAMBDA_RECOIL_UZI)) @@ -96,7 +97,7 @@ public class XFactory9mm { .anim(LAMBDA_UZI_ANIMS).orchestra(Orchestras.ORCHESTRA_UZI_AKIMBO), new GunConfig().dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) - .dmg(3F).spreadHipfire(0F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound("hbm:weapon.fire.uzi", 1.0F, 1.0F) + .dmg(3F).spreadHipfire(0F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound(NTMSounds.GUN_UZI_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(1, 30).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) .offset(1, -0.0625 * 2.5, -0.375D) .setupStandardFire().recoil(LAMBDA_RECOIL_UZI)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryAccelerator.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryAccelerator.java index 12fff6db0..f11c5525d 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryAccelerator.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryAccelerator.java @@ -20,6 +20,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineBelt; import com.hbm.items.weapon.sedna.mags.MagazineInfinite; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; @@ -121,7 +122,7 @@ public class XFactoryAccelerator { ModItems.gun_coilgun = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig() .dura(400).draw(5).inspect(39).crosshair(Crosshair.L_CIRCUMFLEX) .rec(new Receiver(0) - .dmg(35F).delay(5).reload(20).jam(33).sound("hbm:weapon.coilgunShoot", 1.0F, 1.0F) + .dmg(35F).delay(5).reload(20).jam(33).sound(NTMSounds.GUN_COIL_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(coil_tungsten, coil_ferrouranium)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_COILGUN)) @@ -132,7 +133,7 @@ public class XFactoryAccelerator { ModItems.gun_n_i_4_n_i = new ItemGunNI4NI(WeaponQuality.SPECIAL, new GunConfig() .dura(0).draw(5).inspect(39).crosshair(Crosshair.CIRCLE) .rec(new Receiver(0) - .dmg(35F).delay(10).sound("hbm:weapon.coilgunShoot", 1.0F, 1.0F) + .dmg(35F).delay(10).sound(NTMSounds.GUN_COIL_FIRE, 1.0F, 1.0F) .mag(new MagazineInfinite(ni4ni_arc)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().fire(Lego.LAMBDA_NOWEAR_FIRE)) @@ -144,7 +145,7 @@ public class XFactoryAccelerator { public static BiConsumer LAMBDA_TAU_PRIMARY_RELEASE = (stack, ctx) -> { if(ctx.getPlayer() == null || ItemGunBaseNT.getLastAnim(stack, ctx.configIndex) != GunAnimation.CYCLE) return; - ctx.getPlayer().worldObj.playSoundEffect(ctx.getPlayer().posX, ctx.getPlayer().posY, ctx.getPlayer().posZ, "hbm:weapon.fire.tauRelease", 1F, 1F); + ctx.getPlayer().worldObj.playSoundEffect(ctx.getPlayer().posX, ctx.getPlayer().posY, ctx.getPlayer().posZ, NTMSounds.GUN_TAU_STOPFIRE, 1F, 1F); }; public static BiConsumer LAMBDA_TAU_SECONDARY_PRESS = (stack, ctx) -> { @@ -200,7 +201,7 @@ public class XFactoryAccelerator { coin.setThrower(player); player.worldObj.spawnEntityInWorld(coin); - player.worldObj.playSoundAtEntity(player, "random.orb", 1.0F, 1F + player.getRNG().nextFloat() * 0.25F); + player.worldObj.playSoundAtEntity(player, NTMSounds.VANILLA_ORB, 1.0F, 1F + player.getRNG().nextFloat() * 0.25F); ItemGunNI4NI.setCoinCount(stack, ItemGunNI4NI.getCoinCount(stack) - 1); } diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java index 3144f111f..d7e82c4cd 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryBlackPowder.java @@ -13,6 +13,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; @@ -32,7 +33,7 @@ public class XFactoryBlackPowder { ModItems.gun_pepperbox = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(4).inspect(23).crosshair(Crosshair.CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) - .dmg(5F).delay(27).reload(67).jam(58).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) + .dmg(5F).delay(27).reload(67).jam(58).sound(NTMSounds.GUN_POWDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 6).addConfigs(stone, flint, iron, shot)) .offset(0.75, -0.0625, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_PEPPERBOX)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryCatapult.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryCatapult.java index 30c228af6..2cc1c6e90 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryCatapult.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryCatapult.java @@ -27,6 +27,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; @@ -100,7 +101,7 @@ public class XFactoryCatapult { incrementRad(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 1.5F); - bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, "hbm:weapon.mukeExplosion", 15.0F, 1.0F); + bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, NTMSounds.GUN_MINI_NUKE_EXPLOSION, 15.0F, 1.0F); NBTTagCompound data = new NBTTagCompound(); data.setString("type", "muke"); data.setBoolean("balefire", true); @@ -117,7 +118,7 @@ public class XFactoryCatapult { } public static void spawnMush(EntityBulletBaseMK4 bullet, MovingObjectPosition mop) { - bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, "hbm:weapon.mukeExplosion", 15.0F, 1.0F); + bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, NTMSounds.GUN_MINI_NUKE_EXPLOSION, 15.0F, 1.0F); NBTTagCompound data = new NBTTagCompound(); data.setString("type", "muke"); data.setBoolean("balefire", MainRegistry.polaroidID == 11 || bullet.worldObj.rand.nextInt(100) == 0); @@ -135,7 +136,7 @@ public class XFactoryCatapult { vnt.explode(); incrementRad(bullet.worldObj, mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, 0.25F); - bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, "hbm:weapon.mukeExplosion", 15.0F, 1.0F); + bullet.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord + 0.5, mop.hitVec.zCoord, NTMSounds.GUN_MINI_NUKE_EXPLOSION, 15.0F, 1.0F); NBTTagCompound data = new NBTTagCompound(); data.setString("type", "tinytot"); data.setBoolean("balefire", MainRegistry.polaroidID == 11 || bullet.worldObj.rand.nextInt(100) == 0); @@ -165,7 +166,7 @@ public class XFactoryCatapult { ModItems.gun_fatman = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(20).inspect(30).reloadChangeType(true).crosshair(Crosshair.L_CIRCUMFLEX).hideCrosshair(false) .rec(new Receiver(0) - .dmg(100F).spreadHipfire(0F).delay(10).reload(57).jam(40).sound("hbm:weapon.fire.fatman", 1.0F, 1.0F) + .dmg(100F).spreadHipfire(0F).delay(10).reload(57).jam(40).sound(NTMSounds.GUN_FATMAN_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(nuke_standard, nuke_demo, nuke_high, nuke_tots, nuke_hive, nuke_balefire)) .offset(1, -0.0625 * 1.5, -0.1875D).offsetScoped(1, -0.0625 * 1.5, -0.125D) .setupStandardFire().recoil(LAMBDA_RECOIL_FATMAN)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryDrill.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryDrill.java index 3c877da90..8a0e98f88 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryDrill.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryDrill.java @@ -17,6 +17,7 @@ import com.hbm.items.weapon.sedna.impl.ItemGunDrill; import com.hbm.items.weapon.sedna.mags.IMagazine; import com.hbm.items.weapon.sedna.mags.MagazineLiquidEngine; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; import com.hbm.render.anim.HbmAnimations; @@ -89,6 +90,8 @@ public class XFactoryDrill { for(int i = -aoe; i <= aoe; i++) for(int j = -aoe; j <= aoe; j++) for(int k = -aoe; k <= aoe; k++) { breakExtraBlock(player.worldObj, mop.blockX + i, mop.blockY + j, mop.blockZ + k, player, mop.blockX, mop.blockY, mop.blockZ); } + + didPlink = false; } } @@ -97,6 +100,8 @@ public class XFactoryDrill { mag.useUpAmmo(stack, ctx.inventory, ammoToUse); if(calcWear) ItemGunBaseNT.setWear(stack, index, Math.min(ItemGunBaseNT.getWear(stack, index), ctx.config.getDurability(stack))); } + + public static boolean didPlink = false; public static void breakExtraBlock(World world, int x, int y, int z, EntityPlayer playerEntity, int refX, int refY, int refZ) { if(world.isAirBlock(x, y, z)) return; @@ -107,8 +112,12 @@ public class XFactoryDrill { int meta = world.getBlockMetadata(x, y, z); if(!block.canHarvestBlock(player, meta) || (block.getBlockHardness(world, x, y, z) == -1.0F && block.getPlayerRelativeBlockHardness(player, world, x, y, z) == 0.0F) || block == ModBlocks.stone_keyhole) { - world.playSoundAtEntity(player, "random.break", 0.5F, 0.8F + world.rand.nextFloat() * 0.6F); + if(!didPlink) { + world.playSoundAtEntity(player, NTMSounds.VANILLA_PLINK, 0.5F, 0.8F + world.rand.nextFloat() * 0.6F); + didPlink = true; + } return; + } // we are serverside and tryHarvestBlock already invokes the 2001 packet for every player except the user, so we manually send it for the user as well diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java index ed94def7d..1e3f20054 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryEnergy.java @@ -25,6 +25,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineBelt; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; @@ -77,7 +78,7 @@ public class XFactoryEnergy { vnt.setPlayerProcessor(new PlayerProcessorStandard()); vnt.explode(); beam.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, "hbm:entity.ufoBlast", 5.0F, 0.9F + beam.worldObj.rand.nextFloat() * 0.2F); - beam.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, "fireworks.blast", 5.0F, 0.5F); + beam.worldObj.playSoundEffect(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord, NTMSounds.VANILLA_FIREWORKS_BANG, 5.0F, 0.5F); float yaw = beam.worldObj.rand.nextFloat() * 180F; for(int i = 0; i < 3; i++) { @@ -173,7 +174,7 @@ public class XFactoryEnergy { ModItems.gun_tesla_cannon = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(1_000).draw(10).inspect(33).crosshair(Crosshair.CIRCLE) .rec(new Receiver(0) - .dmg(35F).delay(20).spreadHipfire(1.5F).reload(44).jam(19).sound("hbm:weapon.fire.tesla", 1.0F, 1.0F) + .dmg(35F).delay(20).spreadHipfire(1.5F).reload(44).jam(19).sound(NTMSounds.GUN_TESLA_FIRE, 1.0F, 1.0F) .mag(new MagazineBelt().addConfigs(energy_tesla, energy_tesla_overcharge, energy_tesla_ir)) .offset(0.75, 0, -0.375).offsetScoped(0.75, 0, -0.25) .setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY)) @@ -184,7 +185,7 @@ public class XFactoryEnergy { ModItems.gun_laser_pistol = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE) .rec(new Receiver(0) - .dmg(25F).delay(5).spread(1F).spreadHipfire(1F).reload(45).jam(37).sound("hbm:weapon.fire.laserPistol", 1.0F, 1.0F) + .dmg(25F).delay(5).spread(1F).spreadHipfire(1F).reload(45).jam(37).sound(NTMSounds.GUN_LASER_PISTOL_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(energy_las, energy_las_overcharge, energy_las_ir)) .offset(0.75, -0.0625 * 1.5, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY)) @@ -194,7 +195,7 @@ public class XFactoryEnergy { ModItems.gun_laser_pistol_pew_pew = new ItemGunBaseNT(WeaponQuality.B_SIDE, new GunConfig() .dura(500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE) .rec(new Receiver(0) - .dmg(30F).rounds(5).delay(10).spread(0.25F).spreadHipfire(1F).reload(45).jam(37).sound("hbm:weapon.fire.laserPistol", 1.0F, 0.8F) + .dmg(30F).rounds(5).delay(10).spread(0.25F).spreadHipfire(1F).reload(45).jam(37).sound(NTMSounds.GUN_LASER_PISTOL_FIRE, 1.0F, 0.8F) .mag(new MagazineFullReload(0, 10).addConfigs(energy_las, energy_las_overcharge, energy_las_ir)) .offset(0.75, -0.0625 * 1.5, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY)) @@ -204,7 +205,7 @@ public class XFactoryEnergy { ModItems.gun_laser_pistol_morning_glory = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(1_500).draw(10).inspect(26).crosshair(Crosshair.CIRCLE) .rec(new Receiver(0) - .dmg(20F).delay(7).spread(0F).spreadHipfire(0.5F).reload(45).jam(37).sound("hbm:weapon.fire.laserPistol", 1.0F, 1.1F) + .dmg(20F).delay(7).spread(0F).spreadHipfire(0.5F).reload(45).jam(37).sound(NTMSounds.GUN_LASER_PISTOL_FIRE, 1.0F, 1.1F) .mag(new MagazineFullReload(0, 20).addConfigs(energy_emerald, energy_emerald_overcharge, energy_emerald_ir)) .offset(0.75, -0.0625 * 1.5, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY)) @@ -215,7 +216,7 @@ public class XFactoryEnergy { ModItems.gun_lasrifle = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(2_000).draw(10).inspect(26).crosshair(Crosshair.CIRCLE).scopeTexture(scope_luna) .rec(new Receiver(0) - .dmg(50F).delay(8).spreadHipfire(1F).reload(44).jam(36).sound("hbm:weapon.fire.laser", 1.0F, 1.0F) + .dmg(50F).delay(8).spreadHipfire(1F).reload(44).jam(36).sound(NTMSounds.GUN_LASER_RIFLE_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 24).addConfigs(energy_las, energy_las_overcharge, energy_las_ir)) .offset(0.75, -0.0625 * 1.5, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_ENERGY)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFlamer.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFlamer.java index b6f16de62..556b270fb 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFlamer.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFlamer.java @@ -20,6 +20,7 @@ import com.hbm.items.weapon.sedna.impl.ItemGunChemthrower; import com.hbm.items.weapon.sedna.mags.MagazineFluid; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.particle.helper.FlameCreator; import com.hbm.render.anim.AnimationEnums.GunAnimation; @@ -160,7 +161,7 @@ public class XFactoryFlamer { ModItems.gun_flamer_daybreaker = new ItemGunBaseNT(WeaponQuality.LEGENDARY, new GunConfig() .dura(20_000).draw(10).inspect(17).crosshair(Crosshair.L_CIRCLE) .rec(new Receiver(0) - .dmg(25F).spreadHipfire(0F).delay(10).auto(true).reload(90).jam(17).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) + .dmg(25F).spreadHipfire(0F).delay(10).auto(true).reload(90).jam(17).sound(NTMSounds.GUN_POWDER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 50).addConfigs(flame_daybreaker_diesel, flame_daybreaker_gas, flame_daybreaker_napalm, flame_daybreaker_balefire)) .offset(0.75, -0.0625, -0.25D) .setupStandardFire()) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFolly.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFolly.java index 738cdf335..b5e159af9 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFolly.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryFolly.java @@ -21,6 +21,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.ItemGunBaseNT.WeaponQuality; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; +import com.hbm.main.NTMSounds; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; @@ -107,7 +108,7 @@ public class XFactoryFolly { ModItems.gun_folly = new ItemGunBaseNT(WeaponQuality.SECRET, new GunConfig() .dura(0).draw(40).crosshair(Crosshair.NONE) .rec(new Receiver(0) - .dmg(1_000F).delay(26).dryfire(false).reload(160).jam(0).sound("hbm:weapon.fire.loudestNoiseOnEarth", 100.0F, 1.0F) + .dmg(1_000F).delay(26).dryfire(false).reload(160).jam(0).sound(NTMSounds.GUN_PLEASE_REMOVE_MY_EARDRUMS_THANKS, 100.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(folly_sm, folly_nuke)) .offset(0.75, -0.0625, -0.1875D).offsetScoped(0.75, -0.0625, -0.125D) .canFire(LAMBDA_CAN_FIRE).fire(LAMBDA_FIRE).recoil(LAMBDA_RECOIL_FOLLY)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java index 104cdf2df..bb68a497e 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java @@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +/** Power-armor conditional weapons (melee controller and ranged attack remote) */ public class XFactoryPA { public static void init() { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java index 014e97148..07d524d99 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryRocket.java @@ -26,6 +26,7 @@ import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.items.weapon.sedna.mags.MagazineSingleReload; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; @@ -185,7 +186,7 @@ public class XFactoryRocket { ModItems.gun_panzerschreck = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(7).inspect(40).crosshair(Crosshair.L_CIRCUMFLEX) .rec(new Receiver(0) - .dmg(25F).delay(5).reload(50).jam(40).sound("hbm:weapon.rpgShoot", 1.0F, 1.0F) + .dmg(25F).delay(5).reload(50).jam(40).sound(NTMSounds.GUN_ROCKET_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(rocket_rpzb)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET)) @@ -196,7 +197,7 @@ public class XFactoryRocket { ModItems.gun_stinger = new ItemGunStinger(WeaponQuality.A_SIDE, new GunConfig() .dura(300).draw(7).inspect(40).crosshair(Crosshair.L_BOX_OUTLINE) .rec(new Receiver(0) - .dmg(35F).delay(5).reload(50).jam(40).sound("hbm:weapon.rpgShoot", 1.0F, 1.0F) + .dmg(35F).delay(5).reload(50).jam(40).sound(NTMSounds.GUN_ROCKET_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(rocket_rpzb)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupLockonFire().recoil(LAMBDA_RECOIL_ROCKET)) @@ -207,7 +208,7 @@ public class XFactoryRocket { ModItems.gun_quadro = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(400).draw(7).inspect(40).crosshair(Crosshair.L_CIRCUMFLEX).hideCrosshair(false) .rec(new Receiver(0) - .dmg(40F).spreadHipfire(0F).delay(10).reload(55).jam(40).sound("hbm:weapon.rpgShoot", 1.0F, 1.0F) + .dmg(40F).spreadHipfire(0F).delay(10).reload(55).jam(40).sound(NTMSounds.GUN_ROCKET_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 4).addConfigs(rocket_qd)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET)) @@ -218,7 +219,7 @@ public class XFactoryRocket { ModItems.gun_missile_launcher = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() .dura(500).draw(20).inspect(40).crosshair(Crosshair.L_CIRCUMFLEX).hideCrosshair(false) .rec(new Receiver(0) - .dmg(50F).spreadHipfire(0F).delay(5).reload(48).jam(33).sound("hbm:weapon.rpgShoot", 1.0F, 1.0F) + .dmg(50F).spreadHipfire(0F).delay(5).reload(48).jam(33).sound(NTMSounds.GUN_ROCKET_FIRE, 1.0F, 1.0F) .mag(new MagazineSingleReload(0, 1).addConfigs(rocket_ml)) .offset(1, -0.0625 * 1.5, -0.1875D) .setupStandardFire().recoil(LAMBDA_RECOIL_ROCKET)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryTool.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryTool.java index 3cb2ee781..4e083ce67 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryTool.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryTool.java @@ -28,6 +28,7 @@ import com.hbm.items.weapon.sedna.impl.ItemGunChargeThrower; import com.hbm.items.weapon.sedna.mags.MagazineFullReload; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.particle.helper.ExplosionCreator; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; @@ -77,7 +78,7 @@ public class XFactoryTool { } TileEntity core = CompatExternal.getCoreFromPos(bullet.worldObj, ix, iy, iz); if(core instanceof IRepairable) ((IRepairable) core).tryExtinguish(bullet.worldObj, ix, iy, iz, EnumExtinguishType.WATER); - if(fizz) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, "random.fizz", 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); + if(fizz) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, NTMSounds.VANILLA_HISS, 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); bullet.setDead(); } }; @@ -133,7 +134,7 @@ public class XFactoryTool { else bullet.worldObj.setBlock(ix, iy, iz, ModBlocks.block_foam); } } - if(fizz) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, "random.fizz", 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); + if(fizz) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, NTMSounds.VANILLA_HISS, 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); } }; @@ -171,7 +172,7 @@ public class XFactoryTool { if(meta < 6) bullet.worldObj.setBlockMetadataWithNotify(ix, iy, iz, meta + 1, 3); else bullet.worldObj.setBlock(ix, iy, iz, ModBlocks.sand_mix, EnumSandType.BORON.ordinal(), 3); } - if(b.getMaterial() == Material.fire) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, "random.fizz", 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); + if(b.getMaterial() == Material.fire) bullet.worldObj.playSoundEffect(bullet.posX, bullet.posY, bullet.posZ, NTMSounds.VANILLA_HISS, 1.0F, 1.5F + bullet.worldObj.rand.nextFloat() * 0.5F); } } }; @@ -259,7 +260,7 @@ public class XFactoryTool { ModItems.gun_fireext = new ItemGunBaseNT(WeaponQuality.UTILITY, new GunConfig() .dura(5_000).draw(10).inspect(55).reloadChangeType(true).hideCrosshair(false).crosshair(Crosshair.L_CIRCLE) .rec(new Receiver(0) - .dmg(0F).delay(1).dry(0).auto(true).spread(0F).spreadHipfire(0F).reload(20).jam(0).sound("hbm:weapon.extinguisher", 1.0F, 1.0F) + .dmg(0F).delay(1).dry(0).auto(true).spread(0F).spreadHipfire(0F).reload(20).jam(0).sound(NTMSounds.GUN_EXTINGUISHER_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 300).addConfigs(fext_water, fext_foam, fext_sand)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire()) @@ -270,7 +271,7 @@ public class XFactoryTool { ModItems.gun_charge_thrower = new ItemGunChargeThrower(WeaponQuality.UTILITY, new GunConfig() .dura(3_000).draw(10).inspect(55).reloadChangeType(true).hideCrosshair(false).crosshair(Crosshair.L_CIRCUMFLEX) .rec(new Receiver(0) - .dmg(10F).delay(4).dry(10).auto(true).spread(0F).spreadHipfire(0F).reload(60).jam(0).sound("hbm:weapon.fire.grenade", 1.0F, 1.0F) + .dmg(10F).delay(4).dry(10).auto(true).spread(0F).spreadHipfire(0F).reload(60).jam(0).sound(NTMSounds.GUN_CHARGE_FIRE, 1.0F, 1.0F) .mag(new MagazineFullReload(0, 1).addConfigs(ct_hook, ct_mortar, ct_mortar_charge)) .offset(1, -0.0625 * 2.5, -0.25D) .setupStandardFire().recoil(LAMBDA_RECOIL_CT)) diff --git a/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunNI4NI.java b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunNI4NI.java index 9f70b2e1e..001e37c56 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunNI4NI.java +++ b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunNI4NI.java @@ -6,6 +6,7 @@ import com.hbm.items.ICustomizable; import com.hbm.items.weapon.sedna.GunConfig; import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.items.weapon.sedna.mods.XWeaponModManager; +import com.hbm.main.NTMSounds; import com.hbm.util.ChatBuilder; import cpw.mods.fml.relauncher.Side; @@ -42,7 +43,7 @@ public class ItemGunNI4NI extends ItemGunBaseNT implements ICustomizable { this.setCoinCount(stack, newCount); if(isHeld) { - world.playSoundAtEntity(entity, "hbm:item.techBoop", 1.0F, 1F + newCount / (float) maxCoin); + world.playSoundAtEntity(entity, NTMSounds.TECH_BOOP, 1.0F, 1F + newCount / (float) maxCoin); } } } diff --git a/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java index 20fe6ef71..baa205fa8 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java +++ b/src/main/java/com/hbm/items/weapon/sedna/impl/ItemGunStinger.java @@ -5,6 +5,7 @@ import java.util.List; import com.hbm.items.weapon.sedna.GunConfig; import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.items.weapon.sedna.hud.IHUDComponent; +import com.hbm.main.NTMSounds; import com.hbm.render.util.RenderScreenOverlay; import com.hbm.util.Vec3NT; @@ -58,7 +59,7 @@ public class ItemGunStinger extends ItemGunBaseNT { progressLockon(world, stack); if(this.getLockonProgress(stack) >= 60 && !this.getIsLockedOn(stack)) { - player.worldObj.playSoundAtEntity(player, "hbm:item.techBleep", 1F, 1F); + player.worldObj.playSoundAtEntity(player, NTMSounds.TECH_BLEEP, 1F, 1F); this.setIsLockedOn(stack, true); } } diff --git a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModCarbineBayonet.java b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModCarbineBayonet.java index e85a7e71b..413b58137 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModCarbineBayonet.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModCarbineBayonet.java @@ -9,6 +9,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.factory.Orchestras; import com.hbm.items.weapon.sedna.factory.XFactory44; import com.hbm.items.weapon.sedna.factory.XFactory762mm; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; @@ -53,7 +54,7 @@ public class WeaponModCarbineBayonet extends WeaponModBase { mop.entityHit.attackEntityFrom(DamageSource.causePlayerDamage(ctx.getPlayer()), damage); mop.entityHit.motionX *= 2; mop.entityHit.motionZ *= 2; - entity.worldObj.playSoundAtEntity(mop.entityHit, "hbm:weapon.fire.stab", 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); + entity.worldObj.playSoundAtEntity(mop.entityHit, NTMSounds.GUN_STAB_A_FUCKER, 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); } if(mop.typeOfHit == mop.typeOfHit.BLOCK) { Block b = entity.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); diff --git a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModMASBayonet.java b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModMASBayonet.java index 42e6b6910..005fa0588 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModMASBayonet.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModMASBayonet.java @@ -9,6 +9,7 @@ import com.hbm.items.weapon.sedna.ItemGunBaseNT.LambdaContext; import com.hbm.items.weapon.sedna.factory.Orchestras; import com.hbm.items.weapon.sedna.factory.XFactory44; import com.hbm.items.weapon.sedna.factory.XFactory762mm; +import com.hbm.main.NTMSounds; import com.hbm.render.anim.AnimationEnums.GunAnimation; import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimationSequence; @@ -53,7 +54,7 @@ public class WeaponModMASBayonet extends WeaponModBase { mop.entityHit.attackEntityFrom(DamageSource.causePlayerDamage(ctx.getPlayer()), damage); mop.entityHit.motionX *= 2; mop.entityHit.motionZ *= 2; - entity.worldObj.playSoundAtEntity(mop.entityHit, "hbm:weapon.fire.stab", 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); + entity.worldObj.playSoundAtEntity(mop.entityHit, NTMSounds.GUN_STAB_A_FUCKER, 1F, 0.9F + entity.getRNG().nextFloat() * 0.2F); } if(mop.typeOfHit == mop.typeOfHit.BLOCK) { Block b = entity.worldObj.getBlock(mop.blockX, mop.blockY, mop.blockZ); diff --git a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModSilencer.java b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModSilencer.java index 52cdac0c3..4a01b1558 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModSilencer.java +++ b/src/main/java/com/hbm/items/weapon/sedna/mods/WeaponModSilencer.java @@ -2,6 +2,7 @@ package com.hbm.items.weapon.sedna.mods; import com.hbm.items.ModItems; import com.hbm.items.weapon.sedna.Receiver; +import com.hbm.main.NTMSounds; import net.minecraft.item.ItemStack; @@ -15,8 +16,8 @@ public class WeaponModSilencer extends WeaponModBase { public T eval(T base, ItemStack gun, String key, Object parent) { if(key == Receiver.S_FIRESOUND) { - if(gun.getItem() == ModItems.gun_amat) return (T) "hbm:weapon.silencerShoot"; - return (T) "hbm:weapon.fire.silenced"; + if(gun.getItem() == ModItems.gun_amat) return (T) NTMSounds.GUN_AMAT_SILENCER; + return (T) NTMSounds.GUN_RIFLE_SILENCER; } return base; diff --git a/src/main/java/com/hbm/main/NTMSounds.java b/src/main/java/com/hbm/main/NTMSounds.java new file mode 100644 index 000000000..06e866aa6 --- /dev/null +++ b/src/main/java/com/hbm/main/NTMSounds.java @@ -0,0 +1,112 @@ +package com.hbm.main; + +/** Because having to remember or look up sound names is getting on my nerves. Who has time for this shit. */ +public class NTMSounds { + + /// RELOADING /// + public static final String GUN_REVOLVER_COCK = "hbm:weapon.reload.revolverCock"; + public static final String GUN_REVOLVER_CLOSE = "hbm:weapon.reload.revolverClose"; + public static final String GUN_REVOLVER_SPIN = "hbm:weapon.reload.revolverSpin"; + public static final String GUN_PISTOL_COCK = "hbm:weapon.reload.pistolCock"; + public static final String GUN_MAG_SMALL_REMOVE = "hbm:weapon.reload.magSmallRemove"; + public static final String GUN_MAG_SMALL_INSERT = "hbm:weapon.reload.magSmallInsert"; + public static final String GUN_MAG_REMOVE = "hbm:weapon.reload.magRemove"; + public static final String GUN_MAG_INSERT = "hbm:weapon.reload.magInsert"; + public static final String GUN_CANISTER_INSERT = "hbm:weapon.reload.insertCanister"; + public static final String GUN_ROCKET_INSERT = "hbm:weapon.reload.insertRocket"; + public static final String GUN_BOLT_OPEN = "hbm:weapon.reload.boltOpen"; + public static final String GUN_BOLT_CLOSE = "hbm:weapon.reload.boltClose"; + public static final String GUN_RIFLE_COCK = "hbm:weapon.reload.rifleCock"; + public static final String GUN_LEVER_COCK = "hbm:weapon.reload.leverCock"; + public static final String GUN_SHOTGUN_LOAD = "hbm:weapon.reload.shotgunReload"; + public static final String GUN_SHOTGUN_OPEN = "hbm:weapon.reload.shotgunCockOpen"; + public static final String GUN_SHOTGUN_CLOSE = "hbm:weapon.reload.shotgunCockClose"; + public static final String GUN_SHOTGUN_COCK = "hbm:weapon.reload.shotgunCock"; + public static final String GUN_GRENADE_RELOAD = "hbm:weapon.glReload"; + public static final String GUN_GRENADE_OPEN = "hbm:weapon.glOpen"; + public static final String GUN_GRENADE_CLOSE = "hbm:weapon.glClose"; + public static final String GUN_SCREW = "hbm:weapon.reload.screw"; + public static final String GUN_COIL_RELOAD = "hbm:weapon.coilgunReload"; + public static final String GUN_IMPACT = "hbm:weapon.reload.impact"; // when hitting the weapon or dropping a magazine + public static final String GUN_LATCH_OPEN = "hbm:weapon.reload.openLatch"; + public static final String GUN_VALVE = "hbm:weapon.reload.pressureValve"; + public static final String GUN_FATMAN_RELOAD = "hbm:weapon.reload.fatmanFull"; + + /// FOLEY /// + public static final String GUN_WHACK = "hbm:weapon.foley.gunWhack"; + + /// FIRING /// + public static final String GUN_LOCKON = "hbm:weapon.fire.lockon"; + public static final String GUN_SMACK = "hbm:weapon.fire.smack"; // hitting people with the butt of the gun + public static final String GUN_STAB_A_FUCKER = "hbm:weapon.fire.stab"; // stabbing people with a bayonet + public static final String GUN_SHREDDER_CYCLE = "hbm:weapon.fire.shredderCycle"; + public static final String GUN_DRY_FIRE = "hbm:weapon.reload.dryFireClick"; + public static final String GUN_POWDER_FIRE = "hbm:weapon.fire.blackPowder"; + public static final String GUN_RIFLE_FIRE = "hbm:weapon.fire.rifle"; + public static final String GUN_RIFLE_SILENCER = "hbm:weapon.fire.silenced"; + public static final String GUN_HEAVY_RIFLE_FIRE = "hbm:weapon.fire.rifleHeavy"; + public static final String GUN_ASSAULT_FIRE = "hbm:weapon.fire.assault"; + public static final String GUN_HEAVY_REVOLVER_FIRE = "hbm:weapon.44Shoot"; + public static final String GUN_AMAT_FIRE = "hbm:weapon.fire.amat"; + public static final String GUN_AMAT_SILENCER = "hbm:weapon.silencerShoot"; + public static final String GUN_SHOTGUN_FIRE = "hbm:weapon.fire.shotgun"; + public static final String GUN_SPAS_FIRE = "hbm:weapon.shotgunShoot"; + public static final String GUN_LIBERATOR_FIRE = "hbm:weapon.fire.shotgunAlt"; + public static final String GUN_SHREDDER_FIRE = "hbm:weapon.fire.shotgunAuto"; + public static final String GUN_GREASEGUN_FIRE = "hbm:weapon.fire.greaseGun"; + public static final String GUN_STARF_FIRE = "hbm:weapon.fire.pistolLight"; + public static final String GUN_PISTOL_FIRE = "hbm:weapon.fire.pistol"; + public static final String GUN_UZI_FIRE = "hbm:weapon.fire.uzi"; + public static final String GUN_ABERRATOR_FIRE = "hbm:weapon.fire.aberrator"; + public static final String GUN_UNDERBARREL_FIRE = "hbm:weapon.hkShoot"; + public static final String GUN_CONGO_FIRE = "hbm:weapon.glShoot"; + public static final String GUN_CHARGE_FIRE = "hbm:weapon.fire.grenade"; + public static final String GUN_FLAMER_LOOP = "hbm:weapon.fire.flameLoop"; + public static final String GUN_FATMAN_FIRE = "hbm:weapon.fire.fatman"; + public static final String GUN_MINIGUN_FIRE = "hbm:weapon.calShoot"; + public static final String GUN_LASER_GATLING_FIRE = "hbm:weapon.fire.laserGatling"; + public static final String GUN_LASER_PISTOL_FIRE = "hbm:weapon.fire.laserPistol"; + public static final String GUN_LASER_RIFLE_FIRE = "hbm:weapon.fire.laser"; + public static final String GUN_COIL_FIRE = "hbm:weapon.coilgunShoot"; + public static final String GUN_TAU_FIRE = "hbm:weapon.fire.tau"; + public static final String GUN_TAU_STOPFIRE = "hbm:weapon.fire.tauRelease"; // spark sound when tau cannon fire stops + public static final String GUN_TAU_LOOP = "hbm:weapon.fire.tauLoop"; + public static final String GUN_TESLA_FIRE = "hbm:weapon.fire.tesla"; + public static final String GUN_TESLA_BLAST = "hbm:entity.ufoBlast"; // electric crackle sound explosion + public static final String GUN_ROCKET_FIRE = "hbm:weapon.rpgShoot"; + public static final String GUN_EXTINGUISHER_FIRE = "hbm:weapon.extinguisher"; + public static final String GUN_PLEASE_REMOVE_MY_EARDRUMS_THANKS = "hbm:weapon.fire.loudestNoiseOnEarth"; // folly fires + public static final String GUN_VYLET_PONY_CUTIEMARKS_AND_THE_THINGS_THAT_BIND_US_INTRO_JINGLE = "hbm:weapon.fire.vstar"; // you know how we do it + + /// WEAPON SPECIAL EFFECTS /// + public static final String GUN_GO_GO_GADGET_FUCK_EVERYTHING_IN_THIS_GENERAL_DIRECTION = "hbm:alarm.trainHorn"; + public static final String GUN_SOLDIER_TF2_BOAT_EXE_WAV_MP3 = "hbm:weapon.boat"; + public static final String GUN_MINI_NUKE_EXPLOSION = "hbm:weapon.mukeExplosion"; + + /// TURRETS /// + public static final String TURRET_50BMG = "hbm:turret.chekhov_fire"; + public static final String TURRET_CIWS_RELOAD = "hbm:turret.howard_reload"; + + /// PEEP NOISES /// + public static final String PLAYER_GULP = "hbm:player.gulp"; + public static final String PLAYER_GROAN = "hbm:player.groan"; + + /// BLOCKS /// + public static final String BLOCK_PLUSHY = "hbm:block.squeakyToy"; // squee + public static final String BLOCK_HUNDUNS_MAGNIFICENT_HOWL = "hbm:block.hunduns_magnificent_howl"; // tragic yuri + public static final String BLOCK_FALLOUT_3_POPUP = "hbm:block.bobble"; + + /// MACHINE SOUND LOOPS /// + public static final String ELECTRIC_ENGINE_LOOP = "hbm:block.engine"; + public static final String TURBINE_LARGE_LOOP = "hbm:block.largeTurbineRunning"; + + /// MISC /// + public static final String TECH_BOOP = "hbm:item.techBoop"; + public static final String TECH_BLEEP = "hbm:item.techBleep"; + + /// VANILLA CRAP I CANNOT BE ASSED TO REMEMBER /// + public static final String VANILLA_ORB = "random.orb"; // xp orb ping + public static final String VANILLA_PLINK = "random.break"; // item breaks + public static final String VANILLA_FIREWORKS_BANG = "fireworks.blast"; + public static final String VANILLA_HISS = "random.fizz"; // fire extinguishes +} diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderFolly.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderFolly.java index 8a06c72b8..93391e1c8 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderFolly.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderFolly.java @@ -9,6 +9,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.items.weapon.sedna.mags.IMagazine; import com.hbm.main.MainRegistry; +import com.hbm.main.NTMSounds; import com.hbm.main.ResourceManager; import com.hbm.render.anim.HbmAnimations; import com.hbm.util.EntityDamageUtil; @@ -104,7 +105,7 @@ public class ItemRenderFolly extends ItemRenderWeaponBase { String splash = getBootSplash(); if(!jingle && !splash.isEmpty()) { - MainRegistry.proxy.playSoundClient(player.posX, player.posY, player.posZ, "hbm:weapon.fire.vstar", 0.5F, 1F); + MainRegistry.proxy.playSoundClient(player.posX, player.posY, player.posZ, NTMSounds.GUN_VYLET_PONY_CUTIEMARKS_AND_THE_THINGS_THAT_BIND_US_INTRO_JINGLE, 0.5F, 1F); jingle = true; }