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

12
java/src/game/entity/Entity.java
View file

@ -796,7 +796,7 @@ public abstract class Entity
if (flag2 && this.fire > 0)
{
this.playSound(SoundEvent.FIZZ, 0.7F, 1.6F + (this.rand.floatv() - this.rand.floatv()) * 0.4F);
this.playSound(SoundEvent.FIZZ, 0.7F);
this.fire = -this.fireResistance;
}
@ -850,19 +850,19 @@ public abstract class Entity
{
block$soundtype = Blocks.snow_layer.sound;
if(block$soundtype.getStepSound() != null)
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F);
}
else if (!blockIn.getMaterial().isLiquid() && block$soundtype.getStepSound() != null)
{
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.15F);
}
}
public void playSound(SoundEvent name, float volume, float pitch)
public void playSound(SoundEvent name, float volume)
{
// if (!this.isSilent())
// {
this.worldObj.playSoundAtEntity(this, name, volume, pitch);
this.worldObj.playSoundAtEntity(this, name, volume);
// }
}
@ -1004,7 +1004,7 @@ public abstract class Entity
f = 1.0F;
}
this.playSound(SoundEvent.SPLASH, f, 1.0F + (this.rand.floatv() - this.rand.floatv()) * 0.4F);
this.playSound(SoundEvent.SPLASH, f);
float f1 = (float)ExtMath.floord(this.getEntityBoundingBox().minY);
for (int i = 0; (float)i < 1.0F + this.width * 20.0F; ++i)

14
java/src/game/entity/animal/EntityBat.java
View file

@ -51,13 +51,13 @@ public class EntityBat extends EntityLiving
return 0.1F;
}
/**
* Gets the pitch of living sounds in living entities.
*/
protected float getSoundPitch()
{
return super.getSoundPitch() * 0.95F;
}
// /**
// * Gets the pitch of living sounds in living entities.
// */
// protected float getSoundPitch()
// {
// return super.getSoundPitch() * 0.95F;
// }
/**
* Returns the sound this mob makes while it's alive.

2
java/src/game/entity/animal/EntityChicken.java
View file

@ -88,7 +88,7 @@ public class EntityChicken extends EntityAnimal
if (!this.worldObj.client && Config.eggTimer > 0 && !this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0)
{
this.playSound(SoundEvent.PLOP, 1.0F, (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(SoundEvent.PLOP, 1.0F);
this.dropItem(Items.egg, 1);
this.timeUntilNextEgg = this.rand.excl(Config.eggTimer, Config.eggTimer * 2);
}

2
java/src/game/entity/animal/EntityDragon.java
View file

@ -105,7 +105,7 @@ public class EntityDragon extends EntityLiving implements IEntityMultiPart
if (f1 <= -0.3F && f >= -0.3F) // && !this.isSilent())
{
((WorldClient)this.worldObj).playSound(this.posX, this.posY, this.posZ, SoundEvent.DRAGON_WINGS, 5.0F, 0.8F + this.rand.floatv() * 0.3F);
((WorldClient)this.worldObj).playSound(this.posX, this.posY, this.posZ, SoundEvent.DRAGON_WINGS, 5.0F);
}
}

20
java/src/game/entity/animal/EntityHorse.java
View file

@ -418,7 +418,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
damageMultiplier = Math.max(0.0f, damageMultiplier - (1.65f - (float)this.worldObj.gravity * 1.65f));
if (distance > 1.0F)
{
this.playSound(SoundEvent.HORSE_LAND, 0.4F, 1.0F);
this.playSound(SoundEvent.HORSE_LAND, 0.4F);
}
int i = ExtMath.ceilf((distance * 0.5F - 3.0F) * damageMultiplier);
@ -440,7 +440,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
{
SoundType block$soundtype = block.sound;
if(block$soundtype.getStepSound() != null)
this.worldObj.playSoundAtEntity(this, block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.5F, block$soundtype.getFrequency() * 0.75F);
this.worldObj.playSoundAtEntity(this, block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.5F);
}
}
}
@ -637,25 +637,25 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
if (this.gallopTime > 5 && this.gallopTime % 3 == 0)
{
this.playSound(SoundEvent.HORSE_GALLOP, block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(SoundEvent.HORSE_GALLOP, block$soundtype.getVolume() * 0.15F);
if (i == 0 && this.rand.chance(10))
{
this.playSound(SoundEvent.HORSE_BREATHE, block$soundtype.getVolume() * 0.6F, block$soundtype.getFrequency());
this.playSound(SoundEvent.HORSE_BREATHE, block$soundtype.getVolume() * 0.6F);
}
}
else if (this.gallopTime <= 5)
{
this.playSound(SoundEvent.HORSE_WOOD, block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(SoundEvent.HORSE_WOOD, block$soundtype.getVolume() * 0.15F);
}
}
else if (block$soundtype == SoundType.WOOD)
{
this.playSound(SoundEvent.HORSE_WOOD, block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(SoundEvent.HORSE_WOOD, block$soundtype.getVolume() * 0.15F);
}
else
{
this.playSound(SoundEvent.HORSE_SOFT, block$soundtype.getVolume() * 0.15F, block$soundtype.getFrequency());
this.playSound(SoundEvent.HORSE_SOFT, block$soundtype.getVolume() * 0.15F);
}
}
}
@ -946,7 +946,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
if (!flag && this.canCarryChest() && !this.isChested() && itemstack.getItem() == ItemRegistry.getItemFromBlock(Blocks.chest))
{
this.setChested(true);
this.playSound(SoundEvent.PLOP, 1.0F, (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(SoundEvent.PLOP, 1.0F);
flag = true;
this.initHorseChest();
}
@ -1273,7 +1273,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
// if (s != null)
// {
this.playSound(SoundEvent.HORSE_ANGRY, this.getSoundVolume(), this.getSoundPitch());
this.playSound(SoundEvent.HORSE_ANGRY, this.getSoundVolume());
// }
}
@ -1343,7 +1343,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
float f1 = ExtMath.cos(this.rotYaw * (float)Math.PI / 180.0F);
this.motionX += (double)(-0.4F * f * this.jumpPower);
this.motionZ += (double)(0.4F * f1 * this.jumpPower);
this.playSound(SoundEvent.HORSE_JUMP, 0.4F, 1.0F);
this.playSound(SoundEvent.HORSE_JUMP, 0.4F);
}
this.jumpPower = 0.0F;

2
java/src/game/entity/animal/EntityMooshroom.java
View file

@ -68,7 +68,7 @@ public class EntityMooshroom extends EntityCow
}
itemstack.damageItem(1, player);
this.playSound(SoundEvent.CUT, 1.0F, 1.0F);
this.playSound(SoundEvent.CUT, 1.0F);
}
return true;

6
java/src/game/entity/animal/EntityMouse.java
View file

@ -68,9 +68,9 @@ public class EntityMouse extends EntityAnimal {
return 0.3F;
}
protected float getSoundPitch() {
return (this.rand.floatv() - this.rand.floatv()) * 0.2F + (this.isChild() ? 1.8F : 1.6F);
}
// protected float getSoundPitch() {
// return (this.rand.floatv() - this.rand.floatv()) * 0.2F + (this.isChild() ? 1.8F : 1.6F);
// }
protected void dropFewItems(boolean hit, int looting) {
int amt = this.rand.zrange(2);

2
java/src/game/entity/animal/EntityRabbit.java
View file

@ -106,7 +106,7 @@ public class EntityRabbit extends EntityAnimal {
}
else {
this.setMovementSpeed(1.5D * (double)moveTypeIn.getSpeed());
this.playSound(SoundEvent.RABBIT_JUMP, this.getSoundVolume(), ((this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F) * 0.8F);
this.playSound(SoundEvent.RABBIT_JUMP, this.getSoundVolume());
}
this.jumped = jump;
}

2
java/src/game/entity/animal/EntitySheep.java
View file

@ -202,7 +202,7 @@ public class EntitySheep extends EntityAnimal
}
itemstack.damageItem(1, player);
this.playSound(SoundEvent.CUT, 1.0F, 1.0F);
this.playSound(SoundEvent.CUT, 1.0F);
}
return super.interact(player);

2
java/src/game/entity/animal/EntityWolf.java
View file

@ -247,7 +247,7 @@ public class EntityWolf extends EntityTameable
{
if (this.timeWolfIsShaking == 0.0F)
{
this.playSound(SoundEvent.WOLF_SHAKE, this.getSoundVolume(), (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(SoundEvent.WOLF_SHAKE, this.getSoundVolume());
}
this.prevTimeWolfIsShaking = this.timeWolfIsShaking;

4
java/src/game/entity/effect/EntityLightning.java
View file

@ -47,8 +47,8 @@ public class EntityLightning extends EntityWeatherEffect
if (this.lightningState == 2)
{
this.worldObj.playSound(SoundEvent.THUNDER, this.posX, this.posY, this.posZ, 10000.0F, 0.8F + this.rand.floatv() * 0.2F);
this.worldObj.playSound(SoundEvent.EXPLODE, this.posX, this.posY, this.posZ, 2.0F, 0.5F + this.rand.floatv() * 0.2F);
this.worldObj.playSound(SoundEvent.THUNDER, this.posX, this.posY, this.posZ, 10000.0F);
this.worldObj.playSound(SoundEvent.EXPLODE, this.posX, this.posY, this.posZ, 2.0F);
}
--this.lightningState;

2
java/src/game/entity/item/EntityFireworks.java
View file

@ -128,7 +128,7 @@ public class EntityFireworks extends Entity
if (this.fireworkAge == 0) // && !this.isSilent())
{
this.worldObj.playSoundAtEntity(this, SoundEvent.LAUNCH, 3.0F, 1.0F);
this.worldObj.playSoundAtEntity(this, SoundEvent.LAUNCH, 3.0F);
}
++this.fireworkAge;

4
java/src/game/entity/item/EntityItem.java
View file

@ -129,7 +129,7 @@ public class EntityItem extends Entity
this.motionY = 0.20000000298023224D;
this.motionX = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F);
this.motionZ = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F);
this.playSound(SoundEvent.FIZZ, 0.4F, 2.0F + this.rand.floatv() * 0.4F);
this.playSound(SoundEvent.FIZZ, 0.4F);
}
if (!this.worldObj.client)
@ -445,7 +445,7 @@ public class EntityItem extends Entity
// if (!this.isSilent())
// {
this.worldObj.playSoundAtEntity(entityIn, SoundEvent.POP, 0.2F, ((this.rand.floatv() - this.rand.floatv()) * 0.7F + 1.0F) * 2.0F);
this.worldObj.playSoundAtEntity(entityIn, SoundEvent.POP, 0.2F);
// }
entityIn.onItemPickup(this, i);

2
java/src/game/entity/item/EntityTntCart.java
View file

@ -169,7 +169,7 @@ public class EntityTntCart extends EntityCart
// if (!this.isSilent())
// {
this.worldObj.playSoundAtEntity(this, SoundEvent.FUSE, 1.0F, 1.0F);
this.worldObj.playSoundAtEntity(this, SoundEvent.FUSE, 1.0F);
// }
}
}

4
java/src/game/entity/item/EntityXp.java
View file

@ -110,7 +110,7 @@ public class EntityXp extends Entity implements IObjectData
this.motionY = 0.20000000298023224D;
this.motionX = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F);
this.motionZ = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F);
this.playSound(SoundEvent.FIZZ, 0.4F, 2.0F + this.rand.floatv() * 0.4F);
this.playSound(SoundEvent.FIZZ, 0.4F);
}
this.pushOutOfBlocks(this.posX, (this.getEntityBoundingBox().minY + this.getEntityBoundingBox().maxY) / 2.0D, this.posZ);
@ -320,7 +320,7 @@ public class EntityXp extends Entity implements IObjectData
if (this.delayBeforeCanPickup == 0 && entityIn.xpCooldown == 0)
{
entityIn.xpCooldown = Config.xpDelay;
this.worldObj.playSoundAtEntity(entityIn, SoundEvent.ORB, 0.1F, 0.5F * ((this.rand.floatv() - this.rand.floatv()) * 0.7F + 1.8F));
this.worldObj.playSoundAtEntity(entityIn, SoundEvent.ORB, 0.1F);
entityIn.onItemPickup(this, this.xpValue);
entityIn.addExperience(this.xpValue);
this.setDead();

2
java/src/game/entity/npc/EntityDarkMage.java
View file

@ -78,7 +78,7 @@ public class EntityDarkMage extends EntityHoveringNPC {
if(this.worldObj.client && this.isAttacking()) {
if(this.rand.chance(24)) { // && !this.isSilent()) {
((WorldClient)this.worldObj).playSound(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, SoundEvent.FIRE,
1.0F + this.rand.floatv(), this.rand.floatv() * 0.7F + 0.3F);
1.0F + this.rand.floatv());
}
for(int i = 0; i < 2; ++i) {
this.worldObj.spawnParticle(ParticleType.SMOKE_LARGE, this.posX + (this.rand.doublev() - 0.5D) * (double)this.width,

4
java/src/game/entity/npc/EntityHaunter.java
View file

@ -108,7 +108,7 @@ public class EntityHaunter extends EntityNPC {
if (i > 0 && this.timeSinceIgnited == 0)
{
this.playSound(SoundEvent.FUSE, 1.0F, 0.5F);
this.playSound(SoundEvent.FUSE, 1.0F);
}
this.timeSinceIgnited += i;
@ -241,7 +241,7 @@ public class EntityHaunter extends EntityNPC {
if (itemstack != null && itemstack.getItem() == Items.flint_and_steel)
{
this.worldObj.playSound(SoundEvent.IGNITE, this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, 1.0F, this.rand.floatv() * 0.4F + 0.8F);
this.worldObj.playSound(SoundEvent.IGNITE, this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, 1.0F);
player.swingItem();
if (!this.worldObj.client)

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));
}
}

6
java/src/game/entity/npc/EntitySlime.java
View file

@ -180,7 +180,7 @@ public class EntitySlime extends EntityNPC
// if (!this.isChild())
// {
this.playSound(this.jumpHeight < 0.5 ? SoundEvent.SLIME_SMALL : SoundEvent.SLIME_BIG, this.getSoundVolume(), ((this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F) / 0.8F);
this.playSound(this.jumpHeight < 0.5 ? SoundEvent.SLIME_SMALL : SoundEvent.SLIME_BIG, this.getSoundVolume());
// }
this.jumpHeight = 0.0;
@ -308,7 +308,7 @@ public class EntitySlime extends EntityNPC
&& this.getDistanceSqToEntity(p_175451_1_) < 0.6D * i * 0.6D * i
&& this.canAttack(p_175451_1_) && p_175451_1_.attackEntityFrom(DamageSource.causeMobDamage(this), this.rand.range(1, 3)))
{
this.playSound(SoundEvent.SLIME_ATTACK, 1.0F, (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(SoundEvent.SLIME_ATTACK, 1.0F);
this.applyEnchantments(this, p_175451_1_);
}
}
@ -662,7 +662,7 @@ public class EntitySlime extends EntityNPC
// if (!this.slime.isChild())
// {
this.slime.playSound(this.slime.jumpHeight < 0.5 ? SoundEvent.SLIME_SMALL : SoundEvent.SLIME_BIG, this.slime.getSoundVolume(), ((this.slime.getRNG().floatv() - this.slime.getRNG().floatv()) * 0.2F + 1.0F) * 0.8F);
this.slime.playSound(this.slime.jumpHeight < 0.5 ? SoundEvent.SLIME_SMALL : SoundEvent.SLIME_BIG, this.slime.getSoundVolume());
// }
}
else

6
java/src/game/entity/projectile/EntityArrow.java
View file

@ -358,7 +358,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData
// }
}
this.playSound(SoundEvent.BOWHIT, 1.0F, 1.2F / (this.rand.floatv() * 0.2F + 0.9F));
this.playSound(SoundEvent.BOWHIT, 1.0F);
// if (!(movingobjectposition.entityHit instanceof EntityAITakePlace))
// {
@ -391,7 +391,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData
this.posX -= this.motionX / (double)f5 * 0.05000000074505806D;
this.posY -= this.motionY / (double)f5 * 0.05000000074505806D;
this.posZ -= this.motionZ / (double)f5 * 0.05000000074505806D;
this.playSound(SoundEvent.BOWHIT, 1.0F, 1.2F / (this.rand.floatv() * 0.2F + 0.9F));
this.playSound(SoundEvent.BOWHIT, 1.0F);
this.inGround = true;
this.arrowShake = 7;
this.setIsCritical(false);
@ -539,7 +539,7 @@ public class EntityArrow extends Entity implements IProjectile, IObjectData
if (flag)
{
this.playSound(SoundEvent.POP, 0.2F, ((this.rand.floatv() - this.rand.floatv()) * 0.7F + 1.0F) * 2.0F);
this.playSound(SoundEvent.POP, 0.2F);
entityIn.onItemPickup(this, 1);
this.setDead();
}

4
java/src/game/entity/projectile/EntityBullet.java
View file

@ -268,7 +268,7 @@ public class EntityBullet extends Entity implements IProjectile, IObjectData
// }
}
this.playSound(SoundEvent.METALHIT, 0.2F, this.rand.floatv() * 0.2F + 1.5F);
this.playSound(SoundEvent.METALHIT, 0.2F);
// this.setDead();
}
@ -285,7 +285,7 @@ public class EntityBullet extends Entity implements IProjectile, IObjectData
}
else
{
this.playSound(SoundEvent.METALHIT, 0.5F, this.rand.floatv() * 0.2F + 1.5F);
this.playSound(SoundEvent.METALHIT, 0.5F);
this.setDead();
}

2
java/src/game/entity/projectile/EntityDie.java
View file

@ -137,7 +137,7 @@ public class EntityDie extends EntityThrowable implements IObjectData
this.setDead();
else if(player.inventory.addItemStackToInventory(this.getStack())) {
this.setDead();
player.worldObj.playSoundAtEntity(player, SoundEvent.POP, 0.2F, ((player.getRNG().floatv() - player.getRNG().floatv()) * 0.7F + 1.0F) * 2.0F);
player.worldObj.playSoundAtEntity(player, SoundEvent.POP, 0.2F);
player.inventoryContainer.detectAndSendChanges();
}
}

2
java/src/game/entity/projectile/EntityHook.java
View file

@ -415,7 +415,7 @@ public class EntityHook extends Entity implements IObjectData
if (this.ticksCatchableDelay <= 0)
{
this.motionY -= 0.20000000298023224D;
this.playSound(SoundEvent.SPLASH, 0.25F, 1.0F + (this.rand.floatv() - this.rand.floatv()) * 0.4F);
this.playSound(SoundEvent.SPLASH, 0.25F);
float f8 = (float)ExtMath.floord(this.getEntityBoundingBox().minY);
worldserver.spawnParticle(ParticleType.WATER_BUBBLE, this.posX, (double)(f8 + 1.0F), this.posZ, (int)(1.0F + this.width * 20.0F), (double)this.width, 0.0D, (double)this.width, 0.20000000298023224D);
worldserver.spawnParticle(ParticleType.WATER_WAKE, this.posX, (double)(f8 + 1.0F), this.posZ, (int)(1.0F + this.width * 20.0F), (double)this.width, 0.0D, (double)this.width, 0.20000000298023224D);

8
java/src/game/entity/types/EntityAnimal.java
View file

@ -295,10 +295,10 @@ public abstract class EntityAnimal extends EntityLiving
return !this.isChild();
}
protected float getSoundPitch()
{
return this.isChild() ? (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.5F : super.getSoundPitch();
}
// protected float getSoundPitch()
// {
// return this.isChild() ? (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.5F : super.getSoundPitch();
// }
public int getTrackingRange() {
return 80;

30
java/src/game/entity/types/EntityLiving.java
View file

@ -1036,7 +1036,7 @@ public abstract class EntityLiving extends Entity
if (flag && s != null)
{
this.playSound(s, this.getSoundVolume(), this.getSoundPitch());
this.playSound(s, this.getSoundVolume());
}
this.onDeath(source);
@ -1047,7 +1047,7 @@ public abstract class EntityLiving extends Entity
if (flag && s1 != null)
{
this.playSound(s1, this.getSoundVolume(), this.getSoundPitch());
this.playSound(s1, this.getSoundVolume());
}
}
@ -1061,7 +1061,7 @@ public abstract class EntityLiving extends Entity
*/
public void renderBrokenItemStack(ItemStack stack)
{
this.playSound(SoundEvent.BREAK, 0.8F, 0.8F + this.worldObj.rand.floatv() * 0.4F);
this.playSound(SoundEvent.BREAK, 0.8F);
for (int i = 0; i < 5; ++i)
{
@ -1224,7 +1224,7 @@ public abstract class EntityLiving extends Entity
if (i > 0)
{
if(Config.damageFall) {
this.playSound(i > 4 ? SoundEvent.FALL_BIG : SoundEvent.FALL_SMALL, 1.0F, 1.0F);
this.playSound(i > 4 ? SoundEvent.FALL_BIG : SoundEvent.FALL_SMALL, 1.0F);
this.attackEntityFrom(DamageSource.fall, i);
}
int j = ExtMath.floord(this.posX);
@ -1236,7 +1236,7 @@ public abstract class EntityLiving extends Entity
{
SoundType block$soundtype = block.sound;
if(block$soundtype.getStepSound() != null)
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.5F, block$soundtype.getFrequency() * 0.75F);
this.playSound(block$soundtype.getStepSound(), block$soundtype.getVolume() * 0.5F);
}
}
}
@ -1437,7 +1437,7 @@ public abstract class EntityLiving extends Entity
if (s != null)
{
this.playSound(s, this.getSoundVolume(), (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(s, this.getSoundVolume());
}
this.attackEntityFrom(DamageSource.generic, 0);
@ -1448,7 +1448,7 @@ public abstract class EntityLiving extends Entity
if (s1 != null)
{
this.playSound(s1, this.getSoundVolume(), (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F);
this.playSound(s1, this.getSoundVolume());
}
this.setHealth(0);
@ -1563,13 +1563,13 @@ public abstract class EntityLiving extends Entity
return 1.0F;
}
/**
* Gets the pitch of living sounds in living entities.
*/
protected float getSoundPitch()
{
return (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F;
}
// /**
// * Gets the pitch of living sounds in living entities.
// */
// protected float getSoundPitch()
// {
// return (this.rand.floatv() - this.rand.floatv()) * 0.2F + 1.0F;
// }
/**
* Dead and sleeping entities cannot move
@ -2667,7 +2667,7 @@ public abstract class EntityLiving extends Entity
SoundEvent s = this.getLivingSound();
if(s != null) {
this.playSound(s, this.getSoundVolume(), this.getSoundPitch());
this.playSound(s, this.getSoundVolume());
}
}