From e22d7b480e2473804bfefa8790dca86a5b7ef8c4 Mon Sep 17 00:00:00 2001
From: EoD <EoD@xmw.de>
Date: Mon, 15 Sep 2014 04:37:18 +0200
Subject: [PATCH] sorted chisel sounds for wood variations

---
 .../jbcs/minecraft/chisel/ChiselBlocks.java   |   2 +-
 src/main/resources/assets/chisel/sounds.json  |  24 +++++++++---------
 .../{chisel-wood11.ogg => chisel/wood11.ogg}  | Bin
 .../{chisel-wood2.ogg => chisel/wood2.ogg}    | Bin
 .../{chisel-wood3.ogg => chisel/wood3.ogg}    | Bin
 .../{chisel-wood4.ogg => chisel/wood4.ogg}    | Bin
 .../{chisel-wood5.ogg => chisel/wood5.ogg}    | Bin
 .../{chisel-wood8.ogg => chisel/wood8.ogg}    | Bin
 .../{chisel-wood9.ogg => chisel/wood9.ogg}    | Bin
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood11.ogg => chisel/wood11.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood2.ogg => chisel/wood2.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood3.ogg => chisel/wood3.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood4.ogg => chisel/wood4.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood5.ogg => chisel/wood5.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood8.ogg => chisel/wood8.ogg} (100%)
 rename src/main/resources/assets/chisel/sounds/{chisel-wood9.ogg => chisel/wood9.ogg} (100%)

diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
index ff622be8..bef9f3c3 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselBlocks.java
@@ -796,7 +796,7 @@ public class ChiselBlocks
                 Blocks.planks.setHarvestLevel("chisel", 0, i);
                 blockPlanks[i].setHarvestLevel("axe", 0);
 
-                Carving.chisel.setVariationSound("wood-" + n, "chisel:chisel-wood");
+                Carving.chisel.setVariationSound("wood-" + n, Chisel.MOD_ID+":chisel.wood");
             }
         }
 
diff --git a/src/main/resources/assets/chisel/sounds.json b/src/main/resources/assets/chisel/sounds.json
index 817c648c..4ed4358a 100644
--- a/src/main/resources/assets/chisel/sounds.json
+++ b/src/main/resources/assets/chisel/sounds.json
@@ -5,6 +5,18 @@
          "chisel/fallback"
       ]
    },
+   "chisel.wood":{
+      "category":"player",
+      "sounds":[
+         "chisel/wood2",
+         "chisel/wood3",
+         "chisel/wood4",
+         "chisel/wood5",
+         "chisel/wood8",
+         "chisel/wood9",
+         "chisel/wood11"
+      ]
+   },
    "random.squash":{
       "category":"neutral",
       "sounds":[
@@ -12,18 +24,6 @@
          "random/squash2"
       ]
    },
-   "chisel-wood":{
-      "category":"block",
-      "sounds":[
-         "chisel-wood2",
-         "chisel-wood3",
-         "chisel-wood4",
-         "chisel-wood5",
-         "chisel-wood8",
-         "chisel-wood9",
-         "chisel-wood11"
-      ]
-   },
    "dig.holystone":{
       "category":"block",
       "sounds":[
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood11.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood11.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood11.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood11.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood2.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood2.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood2.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood2.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood3.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood3.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood3.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood3.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood4.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood4.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood4.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood4.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood5.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood5.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood5.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood5.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood8.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood8.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood8.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood8.ogg
diff --git a/src/main/resources/assets/chisel/sounds/chisel-wood9.ogg b/src/main/resources/assets/chisel/sounds/chisel/wood9.ogg
similarity index 100%
rename from src/main/resources/assets/chisel/sounds/chisel-wood9.ogg
rename to src/main/resources/assets/chisel/sounds/chisel/wood9.ogg