sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

sound changes, press sounds, remove pitch

Browse source
This commit is contained in:
Sen 2025-03-18 12:03:56 +01:00
parent c5219ce100
commit c602585e6a
76 changed files with 231 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

20
java/src/game/entity/npc/EntityNPC.java
View file

@ -750,7 +750,7 @@ public abstract class EntityNPC extends EntityLiving
entityarrow.setFire(100);
}
this.playSound(SoundEvent.THROW, 1.0F, 1.0F / (this.getRNG().floatv() * 0.4F + 0.8F));
this.playSound(SoundEvent.THROW, 1.0F);
this.worldObj.spawnEntityInWorld(entityarrow);
}
else if(stack.getItem() instanceof ItemGunBase) {
@ -774,7 +774,7 @@ public abstract class EntityNPC extends EntityLiving
// entityarrow.setFire(100);
// }
this.playSound(SoundEvent.EXPLODE_ALT, 1.0f, 1.5f);
this.playSound(SoundEvent.EXPLODE_ALT, 1.0f);
this.worldObj.spawnEntityInWorld(bullet);
}
else if(stack.getItem() == Items.snowball) {
@ -785,7 +785,7 @@ public abstract class EntityNPC extends EntityLiving
double d3 = target.posZ - this.posZ;
float f = ExtMath.sqrtd(d1 * d1 + d3 * d3) * 0.2F;
entitysnowball.setThrowableHeading(d1, d2 + (double)f, d3, 1.6F, 12.0F);
this.playSound(SoundEvent.THROW, 1.0F, 1.0F / (this.getRNG().floatv() * 0.4F + 0.8F));
this.playSound(SoundEvent.THROW, 1.0F);
this.worldObj.spawnEntityInWorld(entitysnowball);
}
else if(stack.getItem() == Items.potion) {
@ -2152,14 +2152,14 @@ public abstract class EntityNPC extends EntityLiving
this.sprintingTicksLeft = sprinting ? 600 : 0;
}
public void playSound(SoundEvent name, float volume, float pitch)
public void playSound(SoundEvent name, float volume)
{
if(this.connection != null)
this.connection.playSound(name, volume, pitch);
this.connection.playSound(name, volume);
else if(this.sendQueue != null)
((WorldClient)this.worldObj).playSound(this.posX, this.posY, this.posZ, name, volume, pitch);
((WorldClient)this.worldObj).playSound(this.posX, this.posY, this.posZ, name, volume);
else if(this.gm == null)
super.playSound(name, volume, pitch);
super.playSound(name, volume);
}
public boolean isTicked()
@ -2903,7 +2903,7 @@ public abstract class EntityNPC extends EntityLiving
if (levels > 0 && this.experienceLevel % 5 == 0 && (float)this.lastXPSound < (float)this.ticksExisted - 100.0F)
{
float f = this.experienceLevel > 30 ? 1.0F : (float)this.experienceLevel / 30.0F;
this.worldObj.playSoundAtEntity(this, SoundEvent.LEVELUP, f * 0.75F, 1.0F);
this.worldObj.playSoundAtEntity(this, SoundEvent.LEVELUP, f * 0.75F);
this.lastXPSound = this.ticksExisted;
}
// super.addExperienceLevel(levels);
@ -3165,12 +3165,12 @@ public abstract class EntityNPC extends EntityLiving
{
if (itemStackIn.getItemUseAction() == ItemAction.DRINK)
{
this.playSound(SoundEvent.DRINK, 0.5F, this.worldObj.rand.floatv() * 0.1F + 0.9F);
this.playSound(SoundEvent.DRINK, 0.5F);
}
if (itemStackIn.getItemUseAction() == ItemAction.EAT)
{
this.playSound(SoundEvent.EAT, 0.5F + 0.5F * (float)this.rand.zrange(2), (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(SoundEvent.EAT, 0.5F + 0.5F * (float)this.rand.zrange(2));
}
}