diff --git a/src/main/java/com/hbm/entity/projectile/EntityMeteor.java b/src/main/java/com/hbm/entity/projectile/EntityMeteor.java index f5e27b695..05ccb7349 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityMeteor.java +++ b/src/main/java/com/hbm/entity/projectile/EntityMeteor.java @@ -12,11 +12,16 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import com.hbm.sound.AudioWrapper; public class EntityMeteor extends Entity { public boolean safe = false; + // Audio + private boolean soundStarted = false; + private AudioWrapper audioFly; + public EntityMeteor(World p_i1582_1_) { super(p_i1582_1_); this.ignoreFrustumCheck = true; @@ -57,6 +62,12 @@ public class EntityMeteor extends Entity { @Override public void onUpdate() { + if(!soundStarted) { + this.audioFly = MainRegistry.proxy.getLoopedSound("hbm:entity.meteoriteFallingLoop", (int)this.posX, 5000, (int)this.posZ, 1F, 150F, 1F, 2); + this.audioFly.startSound(); + + soundStarted = true; + } if(!worldObj.isRemote && !WorldConfig.enableMeteorStrikes) { this.setDead(); @@ -72,9 +83,12 @@ public class EntityMeteor extends Entity { motionY = -2.5; this.moveEntity(motionX, motionY, motionZ); + this.audioFly.updatePosition((int)this.posX, (int)this.posY, (int)this.posZ); + this.audioFly.keepAlive(); if(!this.worldObj.isRemote && this.posY < 260) { if(destroyWeakBlocks(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 6) && this.onGround) { + this.audioFly.stopSound(); //worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 5 + rand.nextFloat(), !safe); if(WorldConfig.enableMeteorTails) { ExplosionLarge.spawnParticles(worldObj, posX, posY + 5, posZ, 75); diff --git a/src/main/java/com/hbm/world/feature/Meteorite.java b/src/main/java/com/hbm/world/feature/Meteorite.java index 15c824cca..611f990ae 100644 --- a/src/main/java/com/hbm/world/feature/Meteorite.java +++ b/src/main/java/com/hbm/world/feature/Meteorite.java @@ -135,14 +135,14 @@ public class Meteorite { switch(rand.nextInt(3)) { case 0: generateLarge(world, rand, x, y, z); - world.createExplosion(null, x + 0.5, y + 1.5, z + 0.5, 9F, !safe); + world.createExplosion(null, x + 0.5, y + 0.5, z + 0.5, 5F, !safe); break; case 1: - world.createExplosion(null, x + 0.5, y + 1.5, z + 0.5, 6F, !safe); + world.createExplosion(null, x + 0.5, y + 0.5, z + 0.5, 4F, !safe); generateMedium(world, rand, x, y, z); break; case 2: - world.createExplosion(null, x + 0.5, y + 1.5, z + 0.5, 5F, !safe); + world.createExplosion(null, x + 0.5, y + 0.5, z + 0.5, 2F, !safe); generateSmall(world, rand, x, y, z); break; } diff --git a/src/main/resources/assets/hbm/sounds.json b/src/main/resources/assets/hbm/sounds.json index 631077be3..632596b4d 100644 --- a/src/main/resources/assets/hbm/sounds.json +++ b/src/main/resources/assets/hbm/sounds.json @@ -73,7 +73,7 @@ "block.assemblerStart": {"category": "block", "sounds": [{"name": "block/assemblerStart", "stream": false}]}, "block.assemblerStop": {"category": "block", "sounds": [{"name": "block/assemblerStop", "stream": false}]}, "block.assemblerCut": {"category": "block", "sounds": [{"name": "block/assemblerCut", "stream": false}]}, - + "door.TransitionSealOpen": {"category": "block", "sounds": [{"name": "block/door/transition_seal_open", "stream": true}]}, "door.wghStart": {"category": "block", "sounds": [{"name": "block/door/wgh_start", "stream": true}]}, "door.wghStop": {"category": "block", "sounds": [{"name": "block/door/wgh_stop", "stream": true}]}, @@ -225,13 +225,13 @@ "weapon.explosionSmallFar": {"category": "player", "sounds": ["weapon/explosionSmallFar1", "weapon/explosionSmallFar2"]}, "weapon.explosionTiny": {"category": "player", "sounds": ["weapon/explosionTiny1", "weapon/explosionTiny2"]}, "weapon.hkShoot": {"category": "player", "sounds": [{"name": "weapon/hkShoot", "stream": false}]}, - + "weapon.dFlash": {"category": "player", "sounds": [{"name": "weapon/dFlash", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, "weapon.switchmode2": {"category": "player", "sounds": [{"name": "weapon/switchmode2", "stream": false}]}, - + "weapon.fire.blackPowder": {"category": "player", "sounds": ["weapon/fire/blackPowder"]}, "weapon.fire.flameLoop": {"category": "player", "sounds": ["weapon/fire/flameLoop"]}, "weapon.fire.lockon": {"category": "player", "sounds": ["weapon/fire/lockon"]}, @@ -262,7 +262,7 @@ "weapon.fire.stab": {"category": "player", "sounds": ["weapon/fire/stab1", "weapon/fire/stab2"]}, "weapon.fire.grenade": {"category": "player", "sounds": ["weapon/fire/grenade"]}, "weapon.fire.amat": {"category": "player", "sounds": ["weapon/fire/amat"]}, - + "weapon.reload.boltClose": {"category": "player", "sounds": ["weapon/reload/boltClose"]}, "weapon.reload.boltOpen": {"category": "player", "sounds": ["weapon/reload/boltOpen"]}, "weapon.reload.closeClick": {"category": "player", "sounds": ["weapon/reload/closeClick"]}, @@ -293,7 +293,7 @@ "weapon.reload.screw": {"category": "player", "sounds": ["weapon/reload/screw"]}, "weapon.foley.gunWhack": {"category": "player", "sounds": ["weapon/foley/gunWhack", "weapon/foley/gunWhack2"]}, - + "turret.chekhov_fire": {"category": "block", "sounds": [{"name": "turret/chekhov_fire", "stream": false}]}, "turret.jeremy_fire": {"category": "block", "sounds": ["turret/jeremy_fire1", "turret/jeremy_fire2", "turret/jeremy_fire3", "turret/jeremy_fire4", "turret/jeremy_fire5"]}, "turret.jeremy_reload": {"category": "block", "sounds": [{"name": "turret/jeremy_reload", "stream": false}]}, @@ -328,21 +328,23 @@ "entity.siegeIdle": {"category": "hostile", "sounds": ["entity/siegeIdle1"]}, "entity.siegeHurt": {"category": "hostile", "sounds": ["entity/siegeHurt1", "entity/siegeHurt2"]}, "entity.siegeDeath": {"category": "hostile", "sounds": ["entity/siegeDeath1", "entity/siegeDeath2", "entity/siegeDeath3"]}, - - "step.metal": {"category": "player", "sounds": [{"name": "footsteps/metal", "stream": false}]}, + "entity.meteoriteFallingLoop": {"category": "block", "sounds": ["entity/meteoriteFallingLoop"]}, + + + "step.metal": {"category": "player", "sounds": [{"name": "footsteps/metal", "stream": false}]}, "step.iron_jump": {"category": "player", "sounds": [{"name": "footsteps/iron_jump", "stream": false}]}, "step.iron_land": {"category": "player", "sounds": [{"name": "footsteps/iron_land", "stream": false}]}, "step.iron": {"category": "player", "sounds": ["footsteps/iron1", "footsteps/iron2", "footsteps/iron3", "footsteps/iron4"]}, "step.metalBlock": {"category": "block", "sounds": ["footsteps/metalStep1", "footsteps/metalStep2", "footsteps/metalStep3", "footsteps/metalStep4"]}, "step.powered": {"category": "player", "sounds": ["footsteps/powered1", "footsteps/powered2", "footsteps/powered3"]}, - + "player.vomit": {"category": "player", "sounds": [{"name": "player/vomit", "stream": false}]}, "player.cough": {"category": "player", "sounds": ["player/cough1", "player/cough2", "player/cough3", "player/cough4"]}, "player.gulp": {"category": "player", "sounds": ["player/gulp1", "player/gulp2", "player/gulp3", "player/gulp4"]}, "player.groan": {"category": "player", "sounds": ["player/groan1", "player/groan2", "player/groan3"]}, - + "potatos.random": {"category": "player", "sounds": ["potatos/randResponse0", "potatos/randResponse1", "potatos/randResponse2", "potatos/randResponse3", "potatos/randResponse4", "potatos/randResponse5", "potatos/randResponse6", "potatos/randResponse7"]}, - + "alarm.amsSiren": {"category": "record", "sounds": [{"name": "alarm/amsSiren", "stream": false}]}, "alarm.apcLoop": {"category": "record", "sounds": [{"name": "alarm/apcLoop", "stream": false}]}, "alarm.apcPass": {"category": "record", "sounds": [{"name": "alarm/apcPass", "stream": false}]}, diff --git a/src/main/resources/assets/hbm/sounds/entity/meteoriteFallingLoop.ogg b/src/main/resources/assets/hbm/sounds/entity/meteoriteFallingLoop.ogg new file mode 100644 index 000000000..bca9ece0c Binary files /dev/null and b/src/main/resources/assets/hbm/sounds/entity/meteoriteFallingLoop.ogg differ diff --git a/vlc-log.txt b/vlc-log.txt new file mode 100644 index 000000000..502d6167c --- /dev/null +++ b/vlc-log.txt @@ -0,0 +1,27 @@ +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module started -- +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module started -- +-- logger module started -- +-- logger module stopped -- +-- logger module started -- +main: Running vlc with the default interface. Use 'cvlc' to use vlc without interface. +-- logger module stopped --