diff --git a/client/src/main/java/client/audio/SoundManager.java b/client/src/main/java/client/audio/SoundManager.java index 776c1741..f50065ff 100755 --- a/client/src/main/java/client/audio/SoundManager.java +++ b/client/src/main/java/client/audio/SoundManager.java @@ -19,7 +19,6 @@ import common.collect.Maps; import common.entity.npc.EntityNPC; import common.init.SoundEvent; import common.log.Log; -import common.rng.Random; import common.sound.MovingSound; import common.sound.Sound; import common.util.ExtMath; @@ -76,8 +75,7 @@ public class SoundManager { } } - private static final Random RANDOM = new Random(); - private static final Map BUFFERS = Maps.newEnumMap(SoundEvent.class); + private static final Map BUFFERS = Maps.newEnumMap(SoundEvent.class); private final Map playingSounds = HashBiMap.create(); private final Map invPlayingSounds = ((BiMap)this.playingSounds).inverse(); @@ -100,13 +98,10 @@ public class SoundManager { public static void loadSounds() { for(SoundEvent entry : SoundEvent.values()) { - short[][] buffers = new short[entry.getSounds().length][]; - for(int z = 0; z < entry.getSounds().length; z++) { - String sound = entry.getSounds()[z]; - Log.SOUND.trace("Lade Sound %s", sound); - buffers[z] = readOgg("sounds/" + sound + ".ogg"); - } - BUFFERS.put(entry, buffers); + String sound = entry.getSound(); + Log.SOUND.trace("Lade Sound %s", sound); + short[] buffer = readOgg("sounds/" + sound + ".ogg"); + BUFFERS.put(entry, buffer); } } @@ -135,7 +130,7 @@ public class SoundManager { } private static short[] getBuffer(SoundEvent event) { - return RANDOM.pick(BUFFERS.get(event)); + return BUFFERS.get(event); } public void unload() diff --git a/client/src/main/java/client/network/ClientPlayer.java b/client/src/main/java/client/network/ClientPlayer.java index 15f5ba09..936fb923 100755 --- a/client/src/main/java/client/network/ClientPlayer.java +++ b/client/src/main/java/client/network/ClientPlayer.java @@ -1421,10 +1421,6 @@ public class ClientPlayer implements IClientPlayer this.playSoundAtPos(blockPosIn, SoundEvent.METAL, 2.0F); break; - case 1015: - this.playSoundAtPos(blockPosIn, SoundEvent.BAT_TAKEOFF, 0.05F); - break; - case 1016: this.playSoundAtPos(blockPosIn, SoundEvent.FIREBALL, 2.0F); break; @@ -1433,10 +1429,6 @@ public class ClientPlayer implements IClientPlayer this.playSoundAtPos(blockPosIn, SoundEvent.EXPLODE, 20.0f); break; - case 1020: - this.playSoundAtPos(blockPosIn, SoundEvent.ANVIL_BREAK, 1.0F); - break; - case 1021: this.playSoundAtPos(blockPosIn, SoundEvent.ANVIL_USE, 1.0F); break; @@ -1446,7 +1438,7 @@ public class ClientPlayer implements IClientPlayer break; case 1023: - this.playSoundAtPos(blockPosIn, SoundEvent.GLASS, 1.0F); + this.playSoundAtPos(blockPosIn, SoundEvent.GLASS_BREAK, 1.0F); break; case 1024: @@ -1493,7 +1485,7 @@ public class ClientPlayer implements IClientPlayer if (state != null && state.getBlock() != Blocks.air) { - this.gm.getSoundManager().playSound(new PositionedSound(state.getBlock().getSound().getBreakSound(), 1.0F, /* block.sound.getFrequency() * 0.8F, */ (float)blockPosIn.getX() + 0.5F, (float)blockPosIn.getY() + 0.5F, (float)blockPosIn.getZ() + 0.5F)); + this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.BLOCK_BREAK, 0.5F, /* block.sound.getFrequency() * 0.8F, */ (float)blockPosIn.getX() + 0.5F, (float)blockPosIn.getY() + 0.5F, (float)blockPosIn.getZ() + 0.5F)); } if(state != null) this.gm.effectRenderer.destroyBlock(blockPosIn, state); @@ -1514,7 +1506,7 @@ public class ClientPlayer implements IClientPlayer this.spawnParticle(ParticleType.POTION, d13, d14, d16, data); } - this.playSoundAtPos(blockPosIn, SoundEvent.GLASS, 1.0F); + this.playSoundAtPos(blockPosIn, SoundEvent.GLASS_BREAK, 1.0F); break; case 2005: diff --git a/client/src/main/java/client/util/PlayerController.java b/client/src/main/java/client/util/PlayerController.java index 95c778c7..24c205d6 100755 --- a/client/src/main/java/client/util/PlayerController.java +++ b/client/src/main/java/client/util/PlayerController.java @@ -8,6 +8,7 @@ import common.entity.npc.EntityNPC; import common.init.BlockRegistry; import common.init.Blocks; import common.init.EntityRegistry; +import common.init.SoundEvent; import common.item.ItemControl; import common.item.ItemStack; import common.packet.CPacketAction; @@ -147,8 +148,8 @@ public class PlayerController { else { this.damage += block.getHardness(this.gm.player, this.gm.player.worldObj, pos); - if(this.stepCounter % 4.0F == 0.0F && block.getSound().getStepSound() != null) { - this.gm.getSoundManager().playSound(new PositionedSound(block.getSound().getStepSound(), 0.25F, + if(this.stepCounter % 4.0F == 0.0F) { + this.gm.getSoundManager().playSound(new PositionedSound(SoundEvent.BLOCK_DAMAGE, 0.05F, (float)pos.getX() + 0.5F, (float)pos.getY() + 0.5F, (float)pos.getZ() + 0.5F)); } diff --git a/client/src/main/resources/sounds/anvil_break.ogg b/client/src/main/resources/sounds/anvil_break.ogg deleted file mode 100644 index e18b0c0f..00000000 Binary files a/client/src/main/resources/sounds/anvil_break.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_death.ogg b/client/src/main/resources/sounds/bat_death.ogg deleted file mode 100644 index 1767f74f..00000000 Binary files a/client/src/main/resources/sounds/bat_death.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_hurt1.ogg b/client/src/main/resources/sounds/bat_hurt1.ogg deleted file mode 100644 index b9a0f834..00000000 Binary files a/client/src/main/resources/sounds/bat_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_hurt2.ogg b/client/src/main/resources/sounds/bat_hurt2.ogg deleted file mode 100644 index 5b822d7a..00000000 Binary files a/client/src/main/resources/sounds/bat_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_hurt3.ogg b/client/src/main/resources/sounds/bat_hurt3.ogg deleted file mode 100644 index bcdf9b00..00000000 Binary files a/client/src/main/resources/sounds/bat_hurt3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_hurt4.ogg b/client/src/main/resources/sounds/bat_hurt4.ogg deleted file mode 100644 index 8c2d7f4c..00000000 Binary files a/client/src/main/resources/sounds/bat_hurt4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_idle1.ogg b/client/src/main/resources/sounds/bat_idle1.ogg deleted file mode 100644 index c0cbe5ae..00000000 Binary files a/client/src/main/resources/sounds/bat_idle1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_idle2.ogg b/client/src/main/resources/sounds/bat_idle2.ogg deleted file mode 100644 index ce4f072d..00000000 Binary files a/client/src/main/resources/sounds/bat_idle2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_idle3.ogg b/client/src/main/resources/sounds/bat_idle3.ogg deleted file mode 100644 index 69ca7973..00000000 Binary files a/client/src/main/resources/sounds/bat_idle3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_idle4.ogg b/client/src/main/resources/sounds/bat_idle4.ogg deleted file mode 100644 index 9b3aafa0..00000000 Binary files a/client/src/main/resources/sounds/bat_idle4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bat_takeoff.ogg b/client/src/main/resources/sounds/bat_takeoff.ogg deleted file mode 100644 index e1dd9564..00000000 Binary files a/client/src/main/resources/sounds/bat_takeoff.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/stone1.ogg b/client/src/main/resources/sounds/block_break.ogg similarity index 100% rename from client/src/main/resources/sounds/stone1.ogg rename to client/src/main/resources/sounds/block_break.ogg diff --git a/client/src/main/resources/sounds/wood1.ogg b/client/src/main/resources/sounds/block_damage.ogg similarity index 100% rename from client/src/main/resources/sounds/wood1.ogg rename to client/src/main/resources/sounds/block_damage.ogg diff --git a/client/src/main/resources/sounds/cloth4.ogg b/client/src/main/resources/sounds/block_place.ogg similarity index 100% rename from client/src/main/resources/sounds/cloth4.ogg rename to client/src/main/resources/sounds/block_place.ogg diff --git a/client/src/main/resources/sounds/bowhit1.ogg b/client/src/main/resources/sounds/bowhit.ogg similarity index 100% rename from client/src/main/resources/sounds/bowhit1.ogg rename to client/src/main/resources/sounds/bowhit.ogg diff --git a/client/src/main/resources/sounds/bowhit2.ogg b/client/src/main/resources/sounds/bowhit2.ogg deleted file mode 100644 index d08be496..00000000 Binary files a/client/src/main/resources/sounds/bowhit2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bowhit3.ogg b/client/src/main/resources/sounds/bowhit3.ogg deleted file mode 100644 index a97c72d6..00000000 Binary files a/client/src/main/resources/sounds/bowhit3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/bowhit4.ogg b/client/src/main/resources/sounds/bowhit4.ogg deleted file mode 100644 index d19c74e9..00000000 Binary files a/client/src/main/resources/sounds/bowhit4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_hitt1.ogg b/client/src/main/resources/sounds/cat_hitt1.ogg deleted file mode 100644 index 2f361e49..00000000 Binary files a/client/src/main/resources/sounds/cat_hitt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_hitt2.ogg b/client/src/main/resources/sounds/cat_hitt2.ogg deleted file mode 100644 index a969987f..00000000 Binary files a/client/src/main/resources/sounds/cat_hitt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_hitt3.ogg b/client/src/main/resources/sounds/cat_hitt3.ogg deleted file mode 100644 index d829d9af..00000000 Binary files a/client/src/main/resources/sounds/cat_hitt3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_meow1.ogg b/client/src/main/resources/sounds/cat_meow1.ogg deleted file mode 100644 index 4fdd4302..00000000 Binary files a/client/src/main/resources/sounds/cat_meow1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_meow2.ogg b/client/src/main/resources/sounds/cat_meow2.ogg deleted file mode 100644 index 686e0064..00000000 Binary files a/client/src/main/resources/sounds/cat_meow2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_meow3.ogg b/client/src/main/resources/sounds/cat_meow3.ogg deleted file mode 100644 index 2dfcd14b..00000000 Binary files a/client/src/main/resources/sounds/cat_meow3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_meow4.ogg b/client/src/main/resources/sounds/cat_meow4.ogg deleted file mode 100644 index a242c9ac..00000000 Binary files a/client/src/main/resources/sounds/cat_meow4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_purreow1.ogg b/client/src/main/resources/sounds/cat_purreow1.ogg deleted file mode 100644 index dfb58973..00000000 Binary files a/client/src/main/resources/sounds/cat_purreow1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cat_purreow2.ogg b/client/src/main/resources/sounds/cat_purreow2.ogg deleted file mode 100644 index daaba563..00000000 Binary files a/client/src/main/resources/sounds/cat_purreow2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/chicken_hurt1.ogg b/client/src/main/resources/sounds/chicken_hurt1.ogg deleted file mode 100644 index a347986a..00000000 Binary files a/client/src/main/resources/sounds/chicken_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/chicken_hurt2.ogg b/client/src/main/resources/sounds/chicken_hurt2.ogg deleted file mode 100644 index 2d018a00..00000000 Binary files a/client/src/main/resources/sounds/chicken_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/chicken_say1.ogg b/client/src/main/resources/sounds/chicken_say1.ogg deleted file mode 100644 index 649fcf9f..00000000 Binary files a/client/src/main/resources/sounds/chicken_say1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/chicken_say2.ogg b/client/src/main/resources/sounds/chicken_say2.ogg deleted file mode 100644 index fef786bb..00000000 Binary files a/client/src/main/resources/sounds/chicken_say2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/chicken_say3.ogg b/client/src/main/resources/sounds/chicken_say3.ogg deleted file mode 100644 index d058652a..00000000 Binary files a/client/src/main/resources/sounds/chicken_say3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cloth1.ogg b/client/src/main/resources/sounds/cloth1.ogg deleted file mode 100644 index 543794d6..00000000 Binary files a/client/src/main/resources/sounds/cloth1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cloth2.ogg b/client/src/main/resources/sounds/cloth2.ogg deleted file mode 100644 index dbe0ad66..00000000 Binary files a/client/src/main/resources/sounds/cloth2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cloth3.ogg b/client/src/main/resources/sounds/cloth3.ogg deleted file mode 100644 index 72b763b7..00000000 Binary files a/client/src/main/resources/sounds/cloth3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_hurt1.ogg b/client/src/main/resources/sounds/cow_hurt1.ogg deleted file mode 100644 index 41c0e7c8..00000000 Binary files a/client/src/main/resources/sounds/cow_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_hurt2.ogg b/client/src/main/resources/sounds/cow_hurt2.ogg deleted file mode 100644 index 50fea21b..00000000 Binary files a/client/src/main/resources/sounds/cow_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_hurt3.ogg b/client/src/main/resources/sounds/cow_hurt3.ogg deleted file mode 100644 index 8f46d2ce..00000000 Binary files a/client/src/main/resources/sounds/cow_hurt3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_say1.ogg b/client/src/main/resources/sounds/cow_say1.ogg deleted file mode 100644 index 017067db..00000000 Binary files a/client/src/main/resources/sounds/cow_say1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_say2.ogg b/client/src/main/resources/sounds/cow_say2.ogg deleted file mode 100644 index 4d7dda34..00000000 Binary files a/client/src/main/resources/sounds/cow_say2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_say3.ogg b/client/src/main/resources/sounds/cow_say3.ogg deleted file mode 100644 index a1dd2449..00000000 Binary files a/client/src/main/resources/sounds/cow_say3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cow_say4.ogg b/client/src/main/resources/sounds/cow_say4.ogg deleted file mode 100644 index 6cd878d9..00000000 Binary files a/client/src/main/resources/sounds/cow_say4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/cut.ogg b/client/src/main/resources/sounds/cut.ogg deleted file mode 100644 index 5643843a..00000000 Binary files a/client/src/main/resources/sounds/cut.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/door_open.ogg b/client/src/main/resources/sounds/door.ogg similarity index 100% rename from client/src/main/resources/sounds/door_open.ogg rename to client/src/main/resources/sounds/door.ogg diff --git a/client/src/main/resources/sounds/door_close.ogg b/client/src/main/resources/sounds/door_close.ogg deleted file mode 100644 index 5888d1a3..00000000 Binary files a/client/src/main/resources/sounds/door_close.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_growl1.ogg b/client/src/main/resources/sounds/dragon_growl.ogg similarity index 100% rename from client/src/main/resources/sounds/dragon_growl1.ogg rename to client/src/main/resources/sounds/dragon_growl.ogg diff --git a/client/src/main/resources/sounds/dragon_growl2.ogg b/client/src/main/resources/sounds/dragon_growl2.ogg deleted file mode 100644 index b84bb636..00000000 Binary files a/client/src/main/resources/sounds/dragon_growl2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_growl3.ogg b/client/src/main/resources/sounds/dragon_growl3.ogg deleted file mode 100644 index 027a0baf..00000000 Binary files a/client/src/main/resources/sounds/dragon_growl3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_growl4.ogg b/client/src/main/resources/sounds/dragon_growl4.ogg deleted file mode 100644 index 536d493b..00000000 Binary files a/client/src/main/resources/sounds/dragon_growl4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_wings5.ogg b/client/src/main/resources/sounds/dragon_wings.ogg similarity index 100% rename from client/src/main/resources/sounds/dragon_wings5.ogg rename to client/src/main/resources/sounds/dragon_wings.ogg diff --git a/client/src/main/resources/sounds/dragon_wings1.ogg b/client/src/main/resources/sounds/dragon_wings1.ogg deleted file mode 100644 index bfbeb6c8..00000000 Binary files a/client/src/main/resources/sounds/dragon_wings1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_wings2.ogg b/client/src/main/resources/sounds/dragon_wings2.ogg deleted file mode 100644 index 3ab732af..00000000 Binary files a/client/src/main/resources/sounds/dragon_wings2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_wings3.ogg b/client/src/main/resources/sounds/dragon_wings3.ogg deleted file mode 100644 index 3026a9c4..00000000 Binary files a/client/src/main/resources/sounds/dragon_wings3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_wings4.ogg b/client/src/main/resources/sounds/dragon_wings4.ogg deleted file mode 100644 index 302b15a5..00000000 Binary files a/client/src/main/resources/sounds/dragon_wings4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/dragon_wings6.ogg b/client/src/main/resources/sounds/dragon_wings6.ogg deleted file mode 100644 index 1af680b3..00000000 Binary files a/client/src/main/resources/sounds/dragon_wings6.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/eat1.ogg b/client/src/main/resources/sounds/eat.ogg similarity index 100% rename from client/src/main/resources/sounds/eat1.ogg rename to client/src/main/resources/sounds/eat.ogg diff --git a/client/src/main/resources/sounds/eat2.ogg b/client/src/main/resources/sounds/eat2.ogg deleted file mode 100644 index 7215480b..00000000 Binary files a/client/src/main/resources/sounds/eat2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/eat3.ogg b/client/src/main/resources/sounds/eat3.ogg deleted file mode 100644 index 35a31799..00000000 Binary files a/client/src/main/resources/sounds/eat3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/explode1.ogg b/client/src/main/resources/sounds/explode.ogg similarity index 100% rename from client/src/main/resources/sounds/explode1.ogg rename to client/src/main/resources/sounds/explode.ogg diff --git a/client/src/main/resources/sounds/explode2.ogg b/client/src/main/resources/sounds/explode2.ogg deleted file mode 100644 index 1a776b54..00000000 Binary files a/client/src/main/resources/sounds/explode2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/explode3.ogg b/client/src/main/resources/sounds/explode3.ogg deleted file mode 100644 index d653c759..00000000 Binary files a/client/src/main/resources/sounds/explode3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/explode4.ogg b/client/src/main/resources/sounds/explode4.ogg deleted file mode 100644 index f5e16496..00000000 Binary files a/client/src/main/resources/sounds/explode4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/old_explode.ogg b/client/src/main/resources/sounds/explode_alt.ogg similarity index 100% rename from client/src/main/resources/sounds/old_explode.ogg rename to client/src/main/resources/sounds/explode_alt.ogg diff --git a/client/src/main/resources/sounds/fallbig2.ogg b/client/src/main/resources/sounds/fallbig.ogg similarity index 100% rename from client/src/main/resources/sounds/fallbig2.ogg rename to client/src/main/resources/sounds/fallbig.ogg diff --git a/client/src/main/resources/sounds/fallbig1.ogg b/client/src/main/resources/sounds/fallbig1.ogg deleted file mode 100644 index cb63c8c8..00000000 Binary files a/client/src/main/resources/sounds/fallbig1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/fox_death.ogg b/client/src/main/resources/sounds/fox_death.ogg deleted file mode 100644 index 66193382..00000000 Binary files a/client/src/main/resources/sounds/fox_death.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/fox_hurt1.ogg b/client/src/main/resources/sounds/fox_hurt1.ogg deleted file mode 100644 index 52b13354..00000000 Binary files a/client/src/main/resources/sounds/fox_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/fox_hurt2.ogg b/client/src/main/resources/sounds/fox_hurt2.ogg deleted file mode 100644 index e54d9a6c..00000000 Binary files a/client/src/main/resources/sounds/fox_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/glass1.ogg b/client/src/main/resources/sounds/glass1.ogg deleted file mode 100644 index 3224a90a..00000000 Binary files a/client/src/main/resources/sounds/glass1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/glass2.ogg b/client/src/main/resources/sounds/glass2.ogg deleted file mode 100644 index ba694849..00000000 Binary files a/client/src/main/resources/sounds/glass2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/glass3.ogg b/client/src/main/resources/sounds/glass_break.ogg similarity index 100% rename from client/src/main/resources/sounds/glass3.ogg rename to client/src/main/resources/sounds/glass_break.ogg diff --git a/client/src/main/resources/sounds/grass1.ogg b/client/src/main/resources/sounds/grass1.ogg deleted file mode 100644 index f455ecb8..00000000 Binary files a/client/src/main/resources/sounds/grass1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/grass2.ogg b/client/src/main/resources/sounds/grass2.ogg deleted file mode 100644 index 6aa1e154..00000000 Binary files a/client/src/main/resources/sounds/grass2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/grass3.ogg b/client/src/main/resources/sounds/grass3.ogg deleted file mode 100644 index 5aad07f7..00000000 Binary files a/client/src/main/resources/sounds/grass3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/grass4.ogg b/client/src/main/resources/sounds/grass4.ogg deleted file mode 100644 index 80f360b4..00000000 Binary files a/client/src/main/resources/sounds/grass4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/gravel1.ogg b/client/src/main/resources/sounds/gravel1.ogg deleted file mode 100644 index 6481adcf..00000000 Binary files a/client/src/main/resources/sounds/gravel1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/gravel2.ogg b/client/src/main/resources/sounds/gravel2.ogg deleted file mode 100644 index 3e388809..00000000 Binary files a/client/src/main/resources/sounds/gravel2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/gravel3.ogg b/client/src/main/resources/sounds/gravel3.ogg deleted file mode 100644 index bcf5d827..00000000 Binary files a/client/src/main/resources/sounds/gravel3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/gravel4.ogg b/client/src/main/resources/sounds/gravel4.ogg deleted file mode 100644 index 75a72c70..00000000 Binary files a/client/src/main/resources/sounds/gravel4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/hit2.ogg b/client/src/main/resources/sounds/hit.ogg similarity index 100% rename from client/src/main/resources/sounds/hit2.ogg rename to client/src/main/resources/sounds/hit.ogg diff --git a/client/src/main/resources/sounds/hit1.ogg b/client/src/main/resources/sounds/hit1.ogg deleted file mode 100644 index 46d3fe60..00000000 Binary files a/client/src/main/resources/sounds/hit1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/hit3.ogg b/client/src/main/resources/sounds/hit3.ogg deleted file mode 100644 index 6b1e1c1e..00000000 Binary files a/client/src/main/resources/sounds/hit3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_angry.ogg b/client/src/main/resources/sounds/horse_angry.ogg deleted file mode 100644 index bc7618f3..00000000 Binary files a/client/src/main/resources/sounds/horse_angry.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_breathe1.ogg b/client/src/main/resources/sounds/horse_breathe1.ogg deleted file mode 100644 index 8454df57..00000000 Binary files a/client/src/main/resources/sounds/horse_breathe1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_breathe2.ogg b/client/src/main/resources/sounds/horse_breathe2.ogg deleted file mode 100644 index 8968abe2..00000000 Binary files a/client/src/main/resources/sounds/horse_breathe2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_breathe3.ogg b/client/src/main/resources/sounds/horse_breathe3.ogg deleted file mode 100644 index bd2f4357..00000000 Binary files a/client/src/main/resources/sounds/horse_breathe3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_death.ogg b/client/src/main/resources/sounds/horse_death.ogg deleted file mode 100644 index 76a3326f..00000000 Binary files a/client/src/main/resources/sounds/horse_death.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_gallop1.ogg b/client/src/main/resources/sounds/horse_gallop1.ogg deleted file mode 100644 index 3565549f..00000000 Binary files a/client/src/main/resources/sounds/horse_gallop1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_gallop2.ogg b/client/src/main/resources/sounds/horse_gallop2.ogg deleted file mode 100644 index f2574084..00000000 Binary files a/client/src/main/resources/sounds/horse_gallop2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_gallop3.ogg b/client/src/main/resources/sounds/horse_gallop3.ogg deleted file mode 100644 index 4c19bdb2..00000000 Binary files a/client/src/main/resources/sounds/horse_gallop3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_gallop4.ogg b/client/src/main/resources/sounds/horse_gallop4.ogg deleted file mode 100644 index 9b300ce3..00000000 Binary files a/client/src/main/resources/sounds/horse_gallop4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_hit1.ogg b/client/src/main/resources/sounds/horse_hit1.ogg deleted file mode 100644 index 4f54dfae..00000000 Binary files a/client/src/main/resources/sounds/horse_hit1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_hit2.ogg b/client/src/main/resources/sounds/horse_hit2.ogg deleted file mode 100644 index 9d628df6..00000000 Binary files a/client/src/main/resources/sounds/horse_hit2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_hit3.ogg b/client/src/main/resources/sounds/horse_hit3.ogg deleted file mode 100644 index c13a2414..00000000 Binary files a/client/src/main/resources/sounds/horse_hit3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_hit4.ogg b/client/src/main/resources/sounds/horse_hit4.ogg deleted file mode 100644 index 209d0e53..00000000 Binary files a/client/src/main/resources/sounds/horse_hit4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_idle1.ogg b/client/src/main/resources/sounds/horse_idle1.ogg deleted file mode 100644 index 1a94e43f..00000000 Binary files a/client/src/main/resources/sounds/horse_idle1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_idle2.ogg b/client/src/main/resources/sounds/horse_idle2.ogg deleted file mode 100644 index d7af74f9..00000000 Binary files a/client/src/main/resources/sounds/horse_idle2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_idle3.ogg b/client/src/main/resources/sounds/horse_idle3.ogg deleted file mode 100644 index fbf4228d..00000000 Binary files a/client/src/main/resources/sounds/horse_idle3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_jump.ogg b/client/src/main/resources/sounds/horse_jump.ogg deleted file mode 100644 index e1713e93..00000000 Binary files a/client/src/main/resources/sounds/horse_jump.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_land.ogg b/client/src/main/resources/sounds/horse_land.ogg deleted file mode 100644 index 186180f4..00000000 Binary files a/client/src/main/resources/sounds/horse_land.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft1.ogg b/client/src/main/resources/sounds/horse_soft1.ogg deleted file mode 100644 index bb567b1d..00000000 Binary files a/client/src/main/resources/sounds/horse_soft1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft2.ogg b/client/src/main/resources/sounds/horse_soft2.ogg deleted file mode 100644 index 7013efd1..00000000 Binary files a/client/src/main/resources/sounds/horse_soft2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft3.ogg b/client/src/main/resources/sounds/horse_soft3.ogg deleted file mode 100644 index cfe4011a..00000000 Binary files a/client/src/main/resources/sounds/horse_soft3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft4.ogg b/client/src/main/resources/sounds/horse_soft4.ogg deleted file mode 100644 index 888f4a80..00000000 Binary files a/client/src/main/resources/sounds/horse_soft4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft5.ogg b/client/src/main/resources/sounds/horse_soft5.ogg deleted file mode 100644 index d548b5a7..00000000 Binary files a/client/src/main/resources/sounds/horse_soft5.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_soft6.ogg b/client/src/main/resources/sounds/horse_soft6.ogg deleted file mode 100644 index 8a5c4aa6..00000000 Binary files a/client/src/main/resources/sounds/horse_soft6.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood1.ogg b/client/src/main/resources/sounds/horse_wood1.ogg deleted file mode 100644 index 78880409..00000000 Binary files a/client/src/main/resources/sounds/horse_wood1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood2.ogg b/client/src/main/resources/sounds/horse_wood2.ogg deleted file mode 100644 index 5ffa309e..00000000 Binary files a/client/src/main/resources/sounds/horse_wood2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood3.ogg b/client/src/main/resources/sounds/horse_wood3.ogg deleted file mode 100644 index 504bd8e7..00000000 Binary files a/client/src/main/resources/sounds/horse_wood3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood4.ogg b/client/src/main/resources/sounds/horse_wood4.ogg deleted file mode 100644 index 26689281..00000000 Binary files a/client/src/main/resources/sounds/horse_wood4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood5.ogg b/client/src/main/resources/sounds/horse_wood5.ogg deleted file mode 100644 index 596e1bd8..00000000 Binary files a/client/src/main/resources/sounds/horse_wood5.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/horse_wood6.ogg b/client/src/main/resources/sounds/horse_wood6.ogg deleted file mode 100644 index 3df5c94f..00000000 Binary files a/client/src/main/resources/sounds/horse_wood6.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/metal2.ogg b/client/src/main/resources/sounds/metal.ogg similarity index 100% rename from client/src/main/resources/sounds/metal2.ogg rename to client/src/main/resources/sounds/metal.ogg diff --git a/client/src/main/resources/sounds/metal1.ogg b/client/src/main/resources/sounds/metal1.ogg deleted file mode 100644 index e9bd562c..00000000 Binary files a/client/src/main/resources/sounds/metal1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/metal3.ogg b/client/src/main/resources/sounds/metal3.ogg deleted file mode 100644 index af84cdc8..00000000 Binary files a/client/src/main/resources/sounds/metal3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/metalhit1.ogg b/client/src/main/resources/sounds/metalhit.ogg similarity index 100% rename from client/src/main/resources/sounds/metalhit1.ogg rename to client/src/main/resources/sounds/metalhit.ogg diff --git a/client/src/main/resources/sounds/metalhit2.ogg b/client/src/main/resources/sounds/metalhit2.ogg deleted file mode 100644 index 057126f7..00000000 Binary files a/client/src/main/resources/sounds/metalhit2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/pig_death.ogg b/client/src/main/resources/sounds/pig_death.ogg deleted file mode 100644 index f47b99c2..00000000 Binary files a/client/src/main/resources/sounds/pig_death.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/pig_say1.ogg b/client/src/main/resources/sounds/pig_say1.ogg deleted file mode 100644 index 586e10d2..00000000 Binary files a/client/src/main/resources/sounds/pig_say1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/pig_say2.ogg b/client/src/main/resources/sounds/pig_say2.ogg deleted file mode 100644 index 32c636a1..00000000 Binary files a/client/src/main/resources/sounds/pig_say2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/pig_say3.ogg b/client/src/main/resources/sounds/pig_say3.ogg deleted file mode 100644 index 0f1701c2..00000000 Binary files a/client/src/main/resources/sounds/pig_say3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_bunnymurder.ogg b/client/src/main/resources/sounds/rabbit_bunnymurder.ogg deleted file mode 100644 index f39302be..00000000 Binary files a/client/src/main/resources/sounds/rabbit_bunnymurder.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hop1.ogg b/client/src/main/resources/sounds/rabbit_hop1.ogg deleted file mode 100644 index c109eec5..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hop1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hop2.ogg b/client/src/main/resources/sounds/rabbit_hop2.ogg deleted file mode 100644 index 2245c2a1..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hop2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hop3.ogg b/client/src/main/resources/sounds/rabbit_hop3.ogg deleted file mode 100644 index 9df7543b..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hop3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hop4.ogg b/client/src/main/resources/sounds/rabbit_hop4.ogg deleted file mode 100644 index 97256593..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hop4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hurt1.ogg b/client/src/main/resources/sounds/rabbit_hurt1.ogg deleted file mode 100644 index 0dd07e77..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hurt2.ogg b/client/src/main/resources/sounds/rabbit_hurt2.ogg deleted file mode 100644 index 5f9dc2dd..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hurt3.ogg b/client/src/main/resources/sounds/rabbit_hurt3.ogg deleted file mode 100644 index 9b21d914..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hurt3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_hurt4.ogg b/client/src/main/resources/sounds/rabbit_hurt4.ogg deleted file mode 100644 index 7534e91c..00000000 Binary files a/client/src/main/resources/sounds/rabbit_hurt4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_idle1.ogg b/client/src/main/resources/sounds/rabbit_idle1.ogg deleted file mode 100644 index 412fe62a..00000000 Binary files a/client/src/main/resources/sounds/rabbit_idle1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_idle2.ogg b/client/src/main/resources/sounds/rabbit_idle2.ogg deleted file mode 100644 index ec63d394..00000000 Binary files a/client/src/main/resources/sounds/rabbit_idle2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_idle3.ogg b/client/src/main/resources/sounds/rabbit_idle3.ogg deleted file mode 100644 index 6babe450..00000000 Binary files a/client/src/main/resources/sounds/rabbit_idle3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rabbit_idle4.ogg b/client/src/main/resources/sounds/rabbit_idle4.ogg deleted file mode 100644 index ec13e6b5..00000000 Binary files a/client/src/main/resources/sounds/rabbit_idle4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rain4.ogg b/client/src/main/resources/sounds/rain.ogg similarity index 100% rename from client/src/main/resources/sounds/rain4.ogg rename to client/src/main/resources/sounds/rain.ogg diff --git a/client/src/main/resources/sounds/rain1.ogg b/client/src/main/resources/sounds/rain1.ogg deleted file mode 100644 index 91dedae9..00000000 Binary files a/client/src/main/resources/sounds/rain1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rain2.ogg b/client/src/main/resources/sounds/rain2.ogg deleted file mode 100644 index c5b504af..00000000 Binary files a/client/src/main/resources/sounds/rain2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/rain3.ogg b/client/src/main/resources/sounds/rain3.ogg deleted file mode 100644 index 85f369a5..00000000 Binary files a/client/src/main/resources/sounds/rain3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sand1.ogg b/client/src/main/resources/sounds/sand1.ogg deleted file mode 100644 index dd15abde..00000000 Binary files a/client/src/main/resources/sounds/sand1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sand2.ogg b/client/src/main/resources/sounds/sand2.ogg deleted file mode 100644 index 040e257c..00000000 Binary files a/client/src/main/resources/sounds/sand2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sand3.ogg b/client/src/main/resources/sounds/sand3.ogg deleted file mode 100644 index ca748a0e..00000000 Binary files a/client/src/main/resources/sounds/sand3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sand4.ogg b/client/src/main/resources/sounds/sand4.ogg deleted file mode 100644 index 7eb862c3..00000000 Binary files a/client/src/main/resources/sounds/sand4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sheep_say1.ogg b/client/src/main/resources/sounds/sheep_say1.ogg deleted file mode 100644 index 209d4d51..00000000 Binary files a/client/src/main/resources/sounds/sheep_say1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sheep_say2.ogg b/client/src/main/resources/sounds/sheep_say2.ogg deleted file mode 100644 index ccc6f9d4..00000000 Binary files a/client/src/main/resources/sounds/sheep_say2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/sheep_say3.ogg b/client/src/main/resources/sounds/sheep_say3.ogg deleted file mode 100644 index 80daaeef..00000000 Binary files a/client/src/main/resources/sounds/sheep_say3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_attack1.ogg b/client/src/main/resources/sounds/slime_attack1.ogg deleted file mode 100644 index d02d32b3..00000000 Binary files a/client/src/main/resources/sounds/slime_attack1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_attack2.ogg b/client/src/main/resources/sounds/slime_attack2.ogg deleted file mode 100644 index b70ff508..00000000 Binary files a/client/src/main/resources/sounds/slime_attack2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_big4.ogg b/client/src/main/resources/sounds/slime_big.ogg similarity index 100% rename from client/src/main/resources/sounds/slime_big4.ogg rename to client/src/main/resources/sounds/slime_big.ogg diff --git a/client/src/main/resources/sounds/slime_big1.ogg b/client/src/main/resources/sounds/slime_big1.ogg deleted file mode 100644 index db963675..00000000 Binary files a/client/src/main/resources/sounds/slime_big1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_big2.ogg b/client/src/main/resources/sounds/slime_big2.ogg deleted file mode 100644 index 0e10611a..00000000 Binary files a/client/src/main/resources/sounds/slime_big2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_big3.ogg b/client/src/main/resources/sounds/slime_big3.ogg deleted file mode 100644 index ded5b711..00000000 Binary files a/client/src/main/resources/sounds/slime_big3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_small1.ogg b/client/src/main/resources/sounds/slime_small.ogg similarity index 100% rename from client/src/main/resources/sounds/slime_small1.ogg rename to client/src/main/resources/sounds/slime_small.ogg diff --git a/client/src/main/resources/sounds/slime_small2.ogg b/client/src/main/resources/sounds/slime_small2.ogg deleted file mode 100644 index 94439fda..00000000 Binary files a/client/src/main/resources/sounds/slime_small2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_small3.ogg b/client/src/main/resources/sounds/slime_small3.ogg deleted file mode 100644 index 0879955b..00000000 Binary files a/client/src/main/resources/sounds/slime_small3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_small4.ogg b/client/src/main/resources/sounds/slime_small4.ogg deleted file mode 100644 index e3e84a90..00000000 Binary files a/client/src/main/resources/sounds/slime_small4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/slime_small5.ogg b/client/src/main/resources/sounds/slime_small5.ogg deleted file mode 100644 index a8b38ed7..00000000 Binary files a/client/src/main/resources/sounds/slime_small5.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/snow1.ogg b/client/src/main/resources/sounds/snow1.ogg deleted file mode 100644 index 3c141d1a..00000000 Binary files a/client/src/main/resources/sounds/snow1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/snow2.ogg b/client/src/main/resources/sounds/snow2.ogg deleted file mode 100644 index c955f916..00000000 Binary files a/client/src/main/resources/sounds/snow2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/snow3.ogg b/client/src/main/resources/sounds/snow3.ogg deleted file mode 100644 index 2232ec0c..00000000 Binary files a/client/src/main/resources/sounds/snow3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/snow4.ogg b/client/src/main/resources/sounds/snow4.ogg deleted file mode 100644 index 63fbd661..00000000 Binary files a/client/src/main/resources/sounds/snow4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/stone2.ogg b/client/src/main/resources/sounds/stone2.ogg deleted file mode 100644 index e9b68677..00000000 Binary files a/client/src/main/resources/sounds/stone2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/stone3.ogg b/client/src/main/resources/sounds/stone3.ogg deleted file mode 100644 index a9ebdc48..00000000 Binary files a/client/src/main/resources/sounds/stone3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/stone4.ogg b/client/src/main/resources/sounds/stone4.ogg deleted file mode 100644 index 630b6a30..00000000 Binary files a/client/src/main/resources/sounds/stone4.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/thunder1.ogg b/client/src/main/resources/sounds/thunder.ogg similarity index 100% rename from client/src/main/resources/sounds/thunder1.ogg rename to client/src/main/resources/sounds/thunder.ogg diff --git a/client/src/main/resources/sounds/thunder2.ogg b/client/src/main/resources/sounds/thunder2.ogg deleted file mode 100644 index 4193f817..00000000 Binary files a/client/src/main/resources/sounds/thunder2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/thunder3.ogg b/client/src/main/resources/sounds/thunder3.ogg deleted file mode 100644 index af473936..00000000 Binary files a/client/src/main/resources/sounds/thunder3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_bark1.ogg b/client/src/main/resources/sounds/wolf_bark1.ogg deleted file mode 100644 index a48f4261..00000000 Binary files a/client/src/main/resources/sounds/wolf_bark1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_bark2.ogg b/client/src/main/resources/sounds/wolf_bark2.ogg deleted file mode 100644 index 5eea29b0..00000000 Binary files a/client/src/main/resources/sounds/wolf_bark2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_bark3.ogg b/client/src/main/resources/sounds/wolf_bark3.ogg deleted file mode 100644 index c97bea46..00000000 Binary files a/client/src/main/resources/sounds/wolf_bark3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_death.ogg b/client/src/main/resources/sounds/wolf_death.ogg deleted file mode 100644 index 5e7461e5..00000000 Binary files a/client/src/main/resources/sounds/wolf_death.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_growl1.ogg b/client/src/main/resources/sounds/wolf_growl1.ogg deleted file mode 100644 index 6af013e0..00000000 Binary files a/client/src/main/resources/sounds/wolf_growl1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_growl2.ogg b/client/src/main/resources/sounds/wolf_growl2.ogg deleted file mode 100644 index f47dbbcb..00000000 Binary files a/client/src/main/resources/sounds/wolf_growl2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_growl3.ogg b/client/src/main/resources/sounds/wolf_growl3.ogg deleted file mode 100644 index bd72a604..00000000 Binary files a/client/src/main/resources/sounds/wolf_growl3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_hurt1.ogg b/client/src/main/resources/sounds/wolf_hurt1.ogg deleted file mode 100644 index 5c16ef78..00000000 Binary files a/client/src/main/resources/sounds/wolf_hurt1.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_hurt2.ogg b/client/src/main/resources/sounds/wolf_hurt2.ogg deleted file mode 100644 index 12ffc4f9..00000000 Binary files a/client/src/main/resources/sounds/wolf_hurt2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_hurt3.ogg b/client/src/main/resources/sounds/wolf_hurt3.ogg deleted file mode 100644 index 41057099..00000000 Binary files a/client/src/main/resources/sounds/wolf_hurt3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_panting.ogg b/client/src/main/resources/sounds/wolf_panting.ogg deleted file mode 100644 index e2bbc8c5..00000000 Binary files a/client/src/main/resources/sounds/wolf_panting.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wolf_whine.ogg b/client/src/main/resources/sounds/wolf_whine.ogg deleted file mode 100644 index 32a5aea0..00000000 Binary files a/client/src/main/resources/sounds/wolf_whine.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wood2.ogg b/client/src/main/resources/sounds/wood2.ogg deleted file mode 100644 index ef6f8c4a..00000000 Binary files a/client/src/main/resources/sounds/wood2.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wood3.ogg b/client/src/main/resources/sounds/wood3.ogg deleted file mode 100644 index 18c02361..00000000 Binary files a/client/src/main/resources/sounds/wood3.ogg and /dev/null differ diff --git a/client/src/main/resources/sounds/wood4.ogg b/client/src/main/resources/sounds/wood4.ogg deleted file mode 100644 index c493c9eb..00000000 Binary files a/client/src/main/resources/sounds/wood4.ogg and /dev/null differ diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index 75b0f91b..b13f2f30 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -29,6 +29,7 @@ import common.entity.npc.Attribute; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; +import common.init.SoundEvent; import common.inventory.IInventory; import common.item.CheatTab; import common.item.Item; @@ -992,7 +993,7 @@ public class Block { this.onPlace(world, pos, iblockstate1, player); } - world.sendSound(this.getSound().getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); + world.sendSound(SoundEvent.BLOCK_PLACE, (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 0.05F); stack.decrSize(); } diff --git a/common/src/main/java/common/block/SoundType.java b/common/src/main/java/common/block/SoundType.java index 4b1e9886..5b18b81e 100755 --- a/common/src/main/java/common/block/SoundType.java +++ b/common/src/main/java/common/block/SoundType.java @@ -1,47 +1,13 @@ package common.block; -import common.init.SoundEvent; - public enum SoundType { - STONE(SoundEvent.STONE), - WOOD(SoundEvent.WOOD), - GRAVEL(SoundEvent.GRAVEL), - SAND(SoundEvent.SAND), - GRASS(SoundEvent.GRASS), - SNOW(SoundEvent.SNOW), - CLOTH(SoundEvent.CLOTH), - SLIME(SoundEvent.SLIME_BIG, SoundEvent.SLIME_SMALL), - ANVIL(SoundEvent.STONE, SoundEvent.ANVIL_LAND, SoundEvent.STONE), - LADDER(SoundEvent.WOOD, null), - GLASS(SoundEvent.GLASS, SoundEvent.STONE, SoundEvent.STONE); - - private final SoundEvent breakSound; - private final SoundEvent placeSound; - private final SoundEvent stepSound; - - private SoundType(SoundEvent breakSound, SoundEvent placeSound, SoundEvent stepSound) { - this.breakSound = breakSound; - this.placeSound = placeSound; - this.stepSound = stepSound; - } - - private SoundType(SoundEvent breakPlaceSound, SoundEvent stepSound) { - this(breakPlaceSound, breakPlaceSound, stepSound); - } - - private SoundType(SoundEvent sound) { - this(sound, sound, sound); - } - - public SoundEvent getBreakSound() { - return this.breakSound; - } - - public SoundEvent getPlaceSound() { - return this.placeSound; - } - - public SoundEvent getStepSound() { - return this.stepSound; - } + STONE, + WOOD, + GRAVEL, + SAND, + GRASS, + SNOW, + CLOTH, + SLIME, + GLASS; } diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index cce2124e..f300f86d 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -10,6 +10,7 @@ import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.BlockRegistry; +import common.init.SoundEvent; import common.item.ItemStack; import common.model.Model; import common.model.ModelRotation; @@ -192,7 +193,7 @@ public class BlockSlab extends Block implements Directional { if(worldIn.canBlockBePlaced(this, pos, false, side, null, stack)) { State place = this.getState().withProperty(BlockSlab.FACING, playerIn.getHorizontalFacing()); if(worldIn.setState(pos, place, 3)) { - worldIn.sendSound(this.getSound().getPlaceSound(), (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), + worldIn.sendSound(SoundEvent.BLOCK_PLACE, (double)((float)pos.getX() + 0.5F), (double)((float)pos.getY() + 0.5F), (double)((float)pos.getZ() + 0.5F), 1.0F); stack.decrSize(); } diff --git a/common/src/main/java/common/block/natural/BlockSnow.java b/common/src/main/java/common/block/natural/BlockSnow.java index bb827d86..d42b70c0 100755 --- a/common/src/main/java/common/block/natural/BlockSnow.java +++ b/common/src/main/java/common/block/natural/BlockSnow.java @@ -5,6 +5,7 @@ import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; +import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; @@ -195,7 +196,7 @@ public class BlockSnow extends Block if (axisalignedbb != null && worldIn.checkNoEntityCollision(axisalignedbb) && worldIn.setState(blockpos, iblockstate1, 2)) { - worldIn.sendSound(this.getSound().getPlaceSound(), (double)((float)blockpos.getX() + 0.5F), (double)((float)blockpos.getY() + 0.5F), (double)((float)blockpos.getZ() + 0.5F), 1.0F); + worldIn.sendSound(SoundEvent.BLOCK_PLACE, (double)((float)blockpos.getX() + 0.5F), (double)((float)blockpos.getY() + 0.5F), (double)((float)blockpos.getZ() + 0.5F), 1.0F); stack.decrSize(); return true; } diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index 5a7a66d5..193785a1 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -88,9 +88,7 @@ public abstract class Entity public float height; public float prevWalkDistMod; public float walkDistMod; - public float stepDistMod; public float fallDistance; - private int nextStepDist; public double lastTickPosX; public double lastTickPosY; public double lastTickPosZ; @@ -141,7 +139,6 @@ public abstract class Entity this.bbox = ZERO_AABB; this.width = 0.6F; this.height = 1.8F; - this.nextStepDist = 1; this.rand = new Random(); this.fireResistance = 1; this.firstUpdate = true; @@ -745,26 +742,6 @@ public abstract class Entity } this.walkDistMod = (float)((double)this.walkDistMod + (double)ExtMath.sqrtd(d12 * d12 + d14 * d14) * 0.6D); - this.stepDistMod = (float)((double)this.stepDistMod + (double)ExtMath.sqrtd(d12 * d12 + d13 * d13 + d14 * d14) * 0.6D); - - if (this.stepDistMod > (float)this.nextStepDist && block1 != Blocks.air) - { - this.nextStepDist = (int)this.stepDistMod + 1; - - if (this.isInLiquid()) - { - float f = ExtMath.sqrtd(this.motionX * this.motionX * 0.20000000298023224D + this.motionY * this.motionY + this.motionZ * this.motionZ * 0.20000000298023224D) * 0.35F; - - if (f > 1.0F) - { - f = 1.0F; - } - -// this.playSound(this.getSwimSound(), f, 1.0F + (this.rand.floatv() - this.rand.floatv()) * 0.4F); - } - - this.playStepSound(blockpos, block1); - } } this.doBlockCollisions(); @@ -838,22 +815,6 @@ public abstract class Entity } } - protected void playStepSound(LocalPos pos, Block blockIn) - { - SoundType block$soundtype = blockIn.getSound(); - - if (this.worldObj.getState(pos.up()).getBlock() == Blocks.snow_layer) - { - block$soundtype = Blocks.snow_layer.getSound(); - if(block$soundtype.getStepSound() != null) - this.playSound(block$soundtype.getStepSound(), 0.15F); - } - else if (!blockIn.getMaterial().isLiquid() && block$soundtype.getStepSound() != null) - { - this.playSound(block$soundtype.getStepSound(), 0.15F); - } - } - public void playSound(SoundEvent name, float volume) { // if (!this.isSilent()) diff --git a/common/src/main/java/common/entity/animal/EntityBat.java b/common/src/main/java/common/entity/animal/EntityBat.java index 39aab5e8..ab1c4f03 100755 --- a/common/src/main/java/common/entity/animal/EntityBat.java +++ b/common/src/main/java/common/entity/animal/EntityBat.java @@ -60,30 +60,6 @@ public class EntityBat extends EntityLiving // return super.getSoundPitch() * 0.95F; // } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return this.getIsBatHanging() && this.rand.rarity(4) ? null : SoundEvent.BAT_IDLE; - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.BAT_HIT; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.BAT_DEATH; - } - /** * Returns true if this entity should push and be pushed by other entities when colliding. */ @@ -154,7 +130,6 @@ public class EntityBat extends EntityLiving if (!this.worldObj.getState(blockpos1).getBlock().isNormalCube()) { this.setIsBatHanging(false); - this.worldObj.playEffect(1015, blockpos, 0); } else { @@ -166,7 +141,6 @@ public class EntityBat extends EntityLiving if (this.worldObj.getClosestPlayerToEntity(this, 4.0D) != null) { this.setIsBatHanging(false); - this.worldObj.playEffect(1015, blockpos, 0); } } } diff --git a/common/src/main/java/common/entity/animal/EntityCat.java b/common/src/main/java/common/entity/animal/EntityCat.java index ee9830a1..7b8cdb1b 100755 --- a/common/src/main/java/common/entity/animal/EntityCat.java +++ b/common/src/main/java/common/entity/animal/EntityCat.java @@ -132,30 +132,6 @@ public class EntityCat extends EntityTameable this.setTameSkin(tagCompund.getInt("CatType")); } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return this.isTamed() ? (this.isInLove() ? SoundEvent.CAT_PURREOW : (this.rand.chance(4) ? SoundEvent.CAT_PURREOW : SoundEvent.CAT_MEOW)) : null; - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.CAT_HIT; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.CAT_HIT; - } - /** * Returns the volume for the sounds this mob makes. */ diff --git a/common/src/main/java/common/entity/animal/EntityChicken.java b/common/src/main/java/common/entity/animal/EntityChicken.java index 87ab1578..92c7081c 100755 --- a/common/src/main/java/common/entity/animal/EntityChicken.java +++ b/common/src/main/java/common/entity/animal/EntityChicken.java @@ -103,18 +103,6 @@ public class EntityChicken extends EntityAnimal { public void fall(float distance, float damage) { } - protected SoundEvent getLivingSound() { - return SoundEvent.CHICKEN_IDLE; - } - - protected SoundEvent getHurtSound() { - return SoundEvent.CHICKEN_HIT; - } - - protected SoundEvent getDeathSound() { - return SoundEvent.CHICKEN_HIT; - } - protected Item getDropItem() { return Items.feather; } diff --git a/common/src/main/java/common/entity/animal/EntityCow.java b/common/src/main/java/common/entity/animal/EntityCow.java index 55a561db..f158b599 100755 --- a/common/src/main/java/common/entity/animal/EntityCow.java +++ b/common/src/main/java/common/entity/animal/EntityCow.java @@ -42,30 +42,6 @@ public class EntityCow extends EntityAnimal this.setSpeedBase(0.20000000298023224f); } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return SoundEvent.COW_IDLE; - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.COW_HIT; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.COW_HIT; - } - // protected void playStepSound(BlockPos pos, Block blockIn) // { // this.playSound("mob.cow.step", 0.15F, 1.0F); diff --git a/common/src/main/java/common/entity/animal/EntityFox.java b/common/src/main/java/common/entity/animal/EntityFox.java index 568bf97d..e745deef 100644 --- a/common/src/main/java/common/entity/animal/EntityFox.java +++ b/common/src/main/java/common/entity/animal/EntityFox.java @@ -47,16 +47,6 @@ public class EntityFox extends EntityAnimal this.setMaxHealth(6); } - protected SoundEvent getHurtSound() - { - return SoundEvent.FOX_HURT; - } - - protected SoundEvent getDeathSound() - { - return SoundEvent.FOX_DEATH; - } - protected float getSoundVolume() { return 0.4F; diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index 25519296..63acf4c5 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -377,11 +377,6 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { public void fall(float distance, float damageMultiplier) { damageMultiplier = Math.max(0.0f, damageMultiplier - (1.65f - (float)this.worldObj.getGravity(this) * 1.65f)); - if (distance > 1.0F) - { - this.playSound(SoundEvent.HORSE_LAND, 0.4F); - } - int i = ExtMath.ceilf((distance * 0.5F - 3.0F) * damageMultiplier); if (i > 0) @@ -394,15 +389,6 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { this.passenger.attackEntityFrom(DamageSource.fall, i); } } - - Block block = this.worldObj.getState(new LocalPos(this.posX, this.posY - 0.2D - (double)this.prevYaw, this.posZ)).getBlock(); - - if (block != Blocks.air) // && !this.isSilent()) - { - SoundType block$soundtype = block.getSound(); - if(block$soundtype.getStepSound() != null) - this.worldObj.playSoundAtEntity(this, block$soundtype.getStepSound(), 0.5F); - } } } @@ -520,7 +506,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { { this.openHorseMouth(); // int i = this.getHorseType(); - return SoundEvent.HORSE_DEATH; + return super.getDeathSound(); } protected Item getDropItem() @@ -541,7 +527,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { } // int i = this.getHorseType(); - return SoundEvent.HORSE_HIT; + return super.getHurtSound(); } public boolean isHorseSaddled() @@ -562,7 +548,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { } // int i = this.getHorseType(); - return SoundEvent.HORSE_IDLE; + return super.getLivingSound(); } // protected void getAngrySoundName() @@ -573,48 +559,6 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { //// return "mob.horse.angry"; // } - protected void playStepSound(LocalPos pos, Block blockIn) - { - SoundType block$soundtype = blockIn.getSound(); - - if (this.worldObj.getState(pos.up()).getBlock() == Blocks.snow_layer) - { - block$soundtype = Blocks.snow_layer.getSound(); - } - - if (!blockIn.getMaterial().isLiquid()) - { - int i = this.getHorseType(); - - if (this.passenger != null && i != 1 && i != 2) - { - ++this.gallopTime; - - if (this.gallopTime > 5 && this.gallopTime % 3 == 0) - { - this.playSound(SoundEvent.HORSE_GALLOP, 0.15F); - - if (i == 0 && this.rand.chance(10)) - { - this.playSound(SoundEvent.HORSE_BREATHE, 0.6F); - } - } - else if (this.gallopTime <= 5) - { - this.playSound(SoundEvent.HORSE_WOOD, 0.15F); - } - } - else if (block$soundtype == SoundType.WOOD) - { - this.playSound(SoundEvent.HORSE_WOOD, 0.15F); - } - else - { - this.playSound(SoundEvent.HORSE_SOFT, 0.15F); - } - } - } - protected void applyEntityAttributes() { super.applyEntityAttributes(); @@ -1204,13 +1148,6 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { { this.openHorseMouth(); this.makeHorseRear(); -// String s = -// this.getAngrySoundName(); - -// if (s != null) -// { - this.playSound(SoundEvent.HORSE_ANGRY, this.getSoundVolume()); -// } } @Serverside @@ -1280,7 +1217,6 @@ 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); } this.jumpPower = 0.0F; diff --git a/common/src/main/java/common/entity/animal/EntityMouse.java b/common/src/main/java/common/entity/animal/EntityMouse.java index 7930d45b..c5a785ce 100755 --- a/common/src/main/java/common/entity/animal/EntityMouse.java +++ b/common/src/main/java/common/entity/animal/EntityMouse.java @@ -51,17 +51,6 @@ public class EntityMouse extends EntityAnimal { // return "mob.mouse.idle"; // } - protected SoundEvent getHurtSound() { - return SoundEvent.RABBIT_HIT; - } - - protected SoundEvent getDeathSound() { - return SoundEvent.RABBIT_HIT; - } - - protected void playStepSound(LocalPos pos, Block block) { - } - protected float getSoundVolume() { return 0.3F; } diff --git a/common/src/main/java/common/entity/animal/EntityPig.java b/common/src/main/java/common/entity/animal/EntityPig.java index 7bf9ec20..3c2a32f0 100755 --- a/common/src/main/java/common/entity/animal/EntityPig.java +++ b/common/src/main/java/common/entity/animal/EntityPig.java @@ -76,30 +76,6 @@ public class EntityPig extends EntityAnimal this.setSaddled(tagCompund.getBool("Saddle")); } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return SoundEvent.PIG_IDLE; - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.PIG_IDLE; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.PIG_DEATH; - } - // protected void playStepSound(BlockPos pos, Block blockIn) // { // this.playSound("mob.pig.step", 0.15F, 1.0F); diff --git a/common/src/main/java/common/entity/animal/EntityRabbit.java b/common/src/main/java/common/entity/animal/EntityRabbit.java index f36e76fd..ce496e83 100755 --- a/common/src/main/java/common/entity/animal/EntityRabbit.java +++ b/common/src/main/java/common/entity/animal/EntityRabbit.java @@ -106,7 +106,6 @@ public class EntityRabbit extends EntityAnimal { } else { this.setMovementSpeed(1.5D * (double)moveTypeIn.getSpeed()); - this.playSound(SoundEvent.RABBIT_JUMP, this.getSoundVolume()); } this.jumped = jump; } @@ -214,18 +213,6 @@ public class EntityRabbit extends EntityAnimal { // return "mob.rabbit.hop"; // } - protected SoundEvent getLivingSound() { - return SoundEvent.RABBIT_IDLE; - } - - protected SoundEvent getHurtSound() { - return SoundEvent.RABBIT_HIT; - } - - protected SoundEvent getDeathSound() { - return SoundEvent.RABBIT_DEATH; - } - public boolean attackEntityAsMob(Entity entityIn) { if(!this.worldObj.client && !Vars.damageMobs) return false; diff --git a/common/src/main/java/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java index 5f2c3976..b339f160 100755 --- a/common/src/main/java/common/entity/animal/EntitySheep.java +++ b/common/src/main/java/common/entity/animal/EntitySheep.java @@ -173,7 +173,7 @@ public class EntitySheep extends EntityAnimal } itemstack.damage(1, player); - this.playSound(SoundEvent.CUT, 1.0F); + this.playSound(SoundEvent.POP, 0.25F); } return super.interact(player); @@ -193,30 +193,6 @@ public class EntitySheep extends EntityAnimal this.setFleeceColor(Color.byName(tagCompund.getString("Color"))); } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return SoundEvent.SHEEP_IDLE; - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.SHEEP_IDLE; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.SHEEP_IDLE; - } - // protected void playStepSound(BlockPos pos, Block blockIn) // { // this.playSound("mob.sheep.step", 0.15F, 1.0F); diff --git a/common/src/main/java/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java index e4bc86d7..033f95b0 100755 --- a/common/src/main/java/common/entity/animal/EntityWolf.java +++ b/common/src/main/java/common/entity/animal/EntityWolf.java @@ -124,30 +124,6 @@ public class EntityWolf extends EntityTameable this.setCollarColor(Color.byName(tagCompund.getString("CollarColor"))); } - /** - * Returns the sound this mob makes while it's alive. - */ - protected SoundEvent getLivingSound() - { - return this.isAngry() ? SoundEvent.WOLF_GROWL : (this.rand.chance(3) ? (this.isTamed() && this.dataWatcher.getWatchableObjectInt(18) < 10 ? SoundEvent.WOLF_WHINE : SoundEvent.WOLF_PANTING) : SoundEvent.WOLF_BARK); - } - - /** - * Returns the sound this mob makes when it is hurt. - */ - protected SoundEvent getHurtSound() - { - return SoundEvent.WOLF_HURT; - } - - /** - * Returns the sound this mob makes on death. - */ - protected SoundEvent getDeathSound() - { - return SoundEvent.WOLF_DEATH; - } - /** * Returns the volume for the sounds this mob makes. */ diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java index 75517c7c..93f3f34f 100755 --- a/common/src/main/java/common/entity/npc/EntitySlime.java +++ b/common/src/main/java/common/entity/npc/EntitySlime.java @@ -322,7 +322,6 @@ 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.applyEnchantments(this, p_175451_1_); } } diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index 7e6d6d67..ff72da6f 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -1152,17 +1152,6 @@ public abstract class EntityLiving extends Entity this.playSound(i > 4 ? SoundEvent.FALL_BIG : SoundEvent.FALL_SMALL, 1.0F); this.attackEntityFrom(DamageSource.fall, i); } - int j = ExtMath.floord(this.posX); - int k = ExtMath.floord(this.posY - 0.20000000298023224D); - int l = ExtMath.floord(this.posZ); - Block block = this.worldObj.getState(new LocalPos(j, k, l)).getBlock(); - - if (block != Blocks.air) - { - SoundType block$soundtype = block.getSound(); - if(block$soundtype.getStepSound() != null) - this.playSound(block$soundtype.getStepSound(), 0.5F); - } } } diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index 1b068d3f..496cda13 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -333,7 +333,7 @@ public abstract class BlockRegistry { register(color.getName() + "_bed", (new BlockBed(color)).setSound(SoundType.WOOD).setHardness(0.2F).setDisplay(color.getSubject(0) + " Bett")); } - register("ladder", (new BlockLadder()).setHardness(0.4F).setSound(SoundType.LADDER).setDisplay("Leiter").setMiningTool(Equipment.AXE)); + register("ladder", (new BlockLadder()).setHardness(0.4F).setSound(SoundType.WOOD).setDisplay("Leiter").setMiningTool(Equipment.AXE)); register("bookshelf", (new BlockBookshelf()).setHardness(1.5F).setSound(SoundType.WOOD).setDisplay("Bücherregal")); register("cake", (new BlockCake()).setHardness(0.5F).setSound(SoundType.CLOTH).setDisplay("Kuchen").setTab(CheatTab.DECORATION)); register("dragon_egg", (new BlockDragonEgg()).setHardness(3.0F).setResistance(15.0F).setSound(SoundType.STONE) @@ -567,7 +567,7 @@ public abstract class BlockRegistry { register("lit_black_metal_furnace", new BlockFurnace(black_metal_furnace)); for(int z = 0; z < BlockAnvil.ANVILS.length; z++) { - register("anvil" + (z == 0 ? "" : "_damaged_" + z), (new BlockAnvil(z)).setHardness(5.0F).setSound(SoundType.ANVIL).setResistance(2000.0F).setDisplay((z == 0 ? "" : (z == 1 ? "Leicht beschädigter " : "Stark beschädigter ")) + "Amboss")); + register("anvil" + (z == 0 ? "" : "_damaged_" + z), (new BlockAnvil(z)).setHardness(5.0F).setSound(SoundType.STONE).setResistance(2000.0F).setDisplay((z == 0 ? "" : (z == 1 ? "Leicht beschädigter " : "Stark beschädigter ")) + "Amboss")); } register("enchanting_table", (new BlockEnchantmentTable()).setHardness(5.0F).setResistance(2000.0F).setDisplay("Zaubertisch")); register("brewing_stand", (new BlockBrewingStand()).setHardness(0.5F).setLight(0x1f1f18).setDisplay("Braustand").setTab(CheatTab.TECHNOLOGY)); diff --git a/common/src/main/java/common/init/SoundEvent.java b/common/src/main/java/common/init/SoundEvent.java index db43a2a2..4f630455 100755 --- a/common/src/main/java/common/init/SoundEvent.java +++ b/common/src/main/java/common/init/SoundEvent.java @@ -3,48 +3,43 @@ package common.init; public enum SoundEvent { PRESS("press"), - CLOTH("cloth1", "cloth2", "cloth3", "cloth4"), - GRASS("grass1", "grass2", "grass3", "grass4"), - GRAVEL("gravel1", "gravel2", "gravel3", "gravel4"), - SAND("sand1", "sand2", "sand3", "sand4"), - SNOW("snow1", "snow2", "snow3", "snow4"), - STONE("stone1", "stone2", "stone3", "stone4"), - WOOD("wood1", "wood2", "wood3", "wood4"), - GLASS("glass1", "glass2", "glass3"), + BLOCK_PLACE("block_place"), + BLOCK_BREAK("block_break"), + BLOCK_DAMAGE("block_damage"), + GLASS_BREAK("glass_break"), SPELL("spell"), TELEPORT("teleport"), TELEPORT_REV("teleport_back"), FIREBALL("fireball"), - METAL("metal1", "metal2", "metal3"), - METALHIT("metalhit1", "metalhit2"), - ANVIL_BREAK("anvil_break"), + METAL("metal"), + METALHIT("metalhit"), ANVIL_LAND("anvil_land"), ANVIL_USE("anvil_use"), THROW("bow"), - BOWHIT("bowhit1", "bowhit2", "bowhit3", "bowhit4"), + BOWHIT("bowhit"), BREAK("break"), CHESTCLOSED("chestclosed"), CHESTOPEN("chestopen"), CLICK("click"), - DOOR("door_close", "door_open"), + DOOR("door"), DRINK("drink"), - EAT("eat1", "eat2", "eat3"), - EXPLODE("explode1", "explode2", "explode3", "explode4"), - EXPLODE_ALT("old_explode"), + EAT("eat"), + EXPLODE("explode"), + EXPLODE_ALT("explode_alt"), FIZZ("fizz"), FUSE("fuse"), LEVELUP("levelup"), ORB("orb"), POP("pop"), SPLASH("splash"), - FALL_BIG("fallbig1", "fallbig2"), + FALL_BIG("fallbig"), FALL_SMALL("fallsmall"), - HIT("hit1", "hit2", "hit3"), + HIT("hit"), IGNITE("ignite"), FIRE("fire"), - RAIN("rain1", "rain2", "rain3", "rain4"), - THUNDER("thunder1", "thunder2", "thunder3"), + RAIN("rain"), + THUNDER("thunder"), PISTON_IN("piston_in"), PISTON_OUT("piston_out"), CART("minecart_base"), @@ -56,68 +51,20 @@ public enum SoundEvent { WATER("water"), NOTE("note"), PLOP("plop"), - CUT("cut"), - BAT_DEATH("bat_death"), - BAT_HIT("bat_hurt1", "bat_hurt2", "bat_hurt3", "bat_hurt4"), - BAT_IDLE("bat_idle1", "bat_idle2", "bat_idle3", "bat_idle4"), - BAT_TAKEOFF("bat_takeoff"), - - CAT_HIT("cat_hitt1", "cat_hitt2", "cat_hitt3"), - CAT_MEOW("cat_meow1", "cat_meow2", "cat_meow3", "cat_meow4"), - CAT_PURREOW("cat_purreow1", "cat_purreow2"), - - CHICKEN_HIT("chicken_hurt1", "chicken_hurt2"), - CHICKEN_IDLE("chicken_say1", "chicken_say2", "chicken_say3"), - - COW_HIT("cow_hurt1", "cow_hurt2", "cow_hurt3"), - COW_IDLE("cow_say1", "cow_say2", "cow_say3", "cow_say4"), + DRAGON_GROWL("dragon_growl"), + DRAGON_WINGS("dragon_wings"), - DRAGON_GROWL("dragon_growl1", "dragon_growl2", "dragon_growl3", "dragon_growl4"), - DRAGON_WINGS("dragon_wings1", "dragon_wings2", "dragon_wings3", "dragon_wings4", "dragon_wings5", "dragon_wings6"), + SLIME_BIG("slime_big"), + SLIME_SMALL("slime_small"); - HORSE_ANGRY("horse_angry"), - HORSE_BREATHE("horse_breathe1", "horse_breathe2", "horse_breathe3"), - HORSE_DEATH("horse_death"), - HORSE_GALLOP("horse_gallop1", "horse_gallop2", "horse_gallop3", "horse_gallop4"), - HORSE_HIT("horse_hit1", "horse_hit2", "horse_hit3", "horse_hit4"), - HORSE_IDLE("horse_idle1", "horse_idle2", "horse_idle3"), - HORSE_JUMP("horse_jump"), - HORSE_LAND("horse_land"), - HORSE_SOFT("horse_soft1", "horse_soft2", "horse_soft3", "horse_soft4", "horse_soft5", "horse_soft6"), - HORSE_WOOD("horse_wood1", "horse_wood2", "horse_wood3", "horse_wood4", "horse_wood5", "horse_wood6"), + private final String sound; - PIG_DEATH("pig_death"), - PIG_IDLE("pig_say1", "pig_say2", "pig_say3"), - - RABBIT_HIT("rabbit_hurt1", "rabbit_hurt2", "rabbit_hurt3", "rabbit_hurt4"), - RABBIT_IDLE("rabbit_idle1", "rabbit_idle2", "rabbit_idle3", "rabbit_idle4"), - RABBIT_DEATH("rabbit_bunnymurder"), - RABBIT_JUMP("rabbit_hop1", "rabbit_hop2", "rabbit_hop3", "rabbit_hop4"), - - SHEEP_IDLE("sheep_say1", "sheep_say2", "sheep_say3"), - - WOLF_BARK("wolf_bark1", "wolf_bark2", "wolf_bark3"), - WOLF_DEATH("wolf_death"), - WOLF_GROWL("wolf_growl1", "wolf_growl2", "wolf_growl3"), - WOLF_HURT("wolf_hurt1", "wolf_hurt2", "wolf_hurt3"), - WOLF_PANTING("wolf_panting"), - WOLF_WHINE("wolf_whine"), - - FOX_DEATH("fox_death"), - FOX_HURT("fox_hurt1", "fox_hurt2"), - - SLIME_ATTACK("slime_attack1", "slime_attack2"), - SLIME_BIG("slime_big1", "slime_big2", "slime_big3", "slime_big4"), - SLIME_SMALL("slime_small1", "slime_small2", "slime_small3", "slime_small4", "slime_small5"); - - private final String[] sounds; - - private SoundEvent(String ... sounds) { - this.sounds = sounds; + private SoundEvent(String sound) { + this.sound = sound; } - public String[] getSounds() { - return this.sounds; + public String getSound() { + return this.sound; } } diff --git a/common/src/main/java/common/inventory/ContainerRepair.java b/common/src/main/java/common/inventory/ContainerRepair.java index 6b766b8c..ee5d18f9 100755 --- a/common/src/main/java/common/inventory/ContainerRepair.java +++ b/common/src/main/java/common/inventory/ContainerRepair.java @@ -174,7 +174,7 @@ public class ContainerRepair extends Container if (l >= BlockAnvil.ANVILS.length) { worldIn.setBlockToAir(blockPosIn); - worldIn.playEffect(1020, blockPosIn, 0); + worldIn.playEffect(1021, blockPosIn, 0); } else { diff --git a/common/src/main/java/common/item/tool/ItemHoe.java b/common/src/main/java/common/item/tool/ItemHoe.java index d2e34200..8cff62b8 100755 --- a/common/src/main/java/common/item/tool/ItemHoe.java +++ b/common/src/main/java/common/item/tool/ItemHoe.java @@ -3,6 +3,7 @@ package common.item.tool; import common.block.Block; import common.entity.npc.EntityNPC; import common.init.Blocks; +import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; @@ -60,8 +61,7 @@ public class ItemHoe extends Item protected boolean useHoe(ItemStack stack, EntityNPC player, World worldIn, LocalPos target, State newState) { - if(newState.getBlock().getSound().getStepSound() != null) - worldIn.sendSound(newState.getBlock().getSound().getStepSound(), (double)((float)target.getX() + 0.5F), (double)((float)target.getY() + 0.5F), (double)((float)target.getZ() + 0.5F), 1.0F); + worldIn.sendSound(SoundEvent.BLOCK_PLACE, (double)((float)target.getX() + 0.5F), (double)((float)target.getY() + 0.5F), (double)((float)target.getZ() + 0.5F), 1.0F); if (worldIn.client) {