From 70324dba9e0afac3a9873e2a19f461cd8b5c5ab2 Mon Sep 17 00:00:00 2001
From: EoD <EoD@xmw.de>
Date: Mon, 15 Sep 2014 04:16:09 +0200
Subject: [PATCH] sorted squash (BallOMoss) sound

I intentionally did not touch EntitySmashingRock.java as both the sound
does not seem to fit, nor is the code finished.
---
 .../minecraft/chisel/entity/EntityBallOMoss.java    |   3 ++-
 src/main/resources/assets/chisel/sounds.json        |   6 +++---
 .../assets/chisel/sounds/{ => random}/squash.ogg    | Bin
 .../assets/chisel/sounds/{ => random}/squash2.ogg   | Bin
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/resources/assets/chisel/sounds/{ => random}/squash.ogg (100%)
 rename src/main/resources/assets/chisel/sounds/{ => random}/squash2.ogg (100%)

diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java
index a1c03eae..0cee1f9a 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java
@@ -1,5 +1,6 @@
 package info.jbcs.minecraft.chisel.entity;
 
+import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.ChiselBlocks;
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
 import info.jbcs.minecraft.utilities.General;
@@ -61,7 +62,7 @@ public class EntityBallOMoss extends EntityThrowable
 
         if(worldObj.isRemote)
         {
-            worldObj.playSound(x, y, z, "chisel:squash", 1.0f, 1.0f, false);
+            worldObj.playSound(x, y, z, Chisel.MOD_ID+":random.squash", 1.0f, 1.0f, false);
 
             for(int i = 0; i < 32; i++)
                 GeneralChiselClient.spawnBallOMossFX(worldObj, posX, posY, posZ);
diff --git a/src/main/resources/assets/chisel/sounds.json b/src/main/resources/assets/chisel/sounds.json
index 22f5c599..817c648c 100644
--- a/src/main/resources/assets/chisel/sounds.json
+++ b/src/main/resources/assets/chisel/sounds.json
@@ -5,11 +5,11 @@
          "chisel/fallback"
       ]
    },
-   "squash":{
+   "random.squash":{
       "category":"neutral",
       "sounds":[
-         "squash",
-         "squash2"
+         "random/squash",
+         "random/squash2"
       ]
    },
    "chisel-wood":{
diff --git a/src/main/resources/assets/chisel/sounds/squash.ogg b/src/main/resources/assets/chisel/sounds/random/squash.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/squash.ogg
rename to src/main/resources/assets/chisel/sounds/random/squash.ogg
diff --git a/src/main/resources/assets/chisel/sounds/squash2.ogg b/src/main/resources/assets/chisel/sounds/random/squash2.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/squash2.ogg
rename to src/main/resources/assets/chisel/sounds/random/squash2.ogg