From 952bc7ed0e94cdf2ea5a7c42e7d734ad0df90b56 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 10 Oct 2014 18:41:12 +0200 Subject: [PATCH] Crossbow Reload Sound --- resources/assets/tinker/sounds.json | 6 ++++++ .../assets/tinker/sounds/crossbowReload.ogg | Bin 0 -> 6597 bytes .../tconstruct/weaponry/weapons/Crossbow.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 resources/assets/tinker/sounds/crossbowReload.ogg diff --git a/resources/assets/tinker/sounds.json b/resources/assets/tinker/sounds.json index f2270a19..af7090a4 100644 --- a/resources/assets/tinker/sounds.json +++ b/resources/assets/tinker/sounds.json @@ -34,5 +34,11 @@ "stoneHit2", "stoneHit3" ] + }, + "crossbowReload": { + "category": "neutral", + "sounds": [ + "crossbowReload" + ] } } \ No newline at end of file diff --git a/resources/assets/tinker/sounds/crossbowReload.ogg b/resources/assets/tinker/sounds/crossbowReload.ogg new file mode 100644 index 0000000000000000000000000000000000000000..32f37e65a554ec6e9a9784fed14528a4bfd2ef19 GIT binary patch literal 6597 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 O!7^N2bd34=;r{~&fl`M6 literal 0 HcmV?d00001 diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 2508642f..3a137f76 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -291,7 +291,7 @@ public class Crossbow extends ProjectileWeapon { } public void playReloadSound(World world, EntityPlayer player, ItemStack weapon, ItemStack ammo) { - world.playSoundAtEntity(player, Reference.resource("woodHit"), 1.0f, 1.0f); + world.playSoundAtEntity(player, Reference.resource("crossbowReload"), 1.0f, 1.0f); } @Override