From 42a04ff156ecbb64943a1f3b78baecde0f0bb8c4 Mon Sep 17 00:00:00 2001
From: CannibalVox <sdbaynham@gmail.com>
Date: Tue, 10 Mar 2015 02:55:15 -0500
Subject: [PATCH] Fix sounds for 1.7

---
 .../resources/assets/dimdoors/sounds.json     |  26 +++++++++---------
 .../dimdoors/{sound => sounds}/crack.ogg      | Bin
 .../dimdoors/{sound => sounds}/creepy.ogg     | Bin
 .../{sound => sounds}/doorLockRemoved.mp3     | Bin
 .../{sound => sounds}/doorLockRemoved.ogg     | Bin
 .../dimdoors/{sound => sounds}/doorLocked.mp3 | Bin
 .../dimdoors/{sound => sounds}/doorLocked.ogg | Bin
 .../dimdoors/{sound => sounds}/keyLock.mp3    | Bin
 .../dimdoors/{sound => sounds}/keyLock.ogg    | Bin
 .../dimdoors/{sound => sounds}/keyUnlock.mp3  | Bin
 .../dimdoors/{sound => sounds}/keyUnlock.ogg  | Bin
 .../dimdoors/{sound => sounds}/monk.ogg       | Bin
 .../dimdoors/{sound => sounds}/rift.ogg       | Bin
 .../dimdoors/{sound => sounds}/riftClose.ogg  | Bin
 .../dimdoors/{sound => sounds}/riftDoor.ogg   | Bin
 .../dimdoors/{sound => sounds}/riftEnd.ogg    | Bin
 .../dimdoors/{sound => sounds}/riftStart.ogg  | Bin
 .../dimdoors/{sound => sounds}/tearing.ogg    | Bin
 18 files changed, 13 insertions(+), 13 deletions(-)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/crack.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/creepy.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/doorLockRemoved.mp3 (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/doorLockRemoved.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/doorLocked.mp3 (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/doorLocked.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/keyLock.mp3 (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/keyLock.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/keyUnlock.mp3 (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/keyUnlock.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/monk.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/rift.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/riftClose.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/riftDoor.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/riftEnd.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/riftStart.ogg (100%)
 rename src/main/resources/assets/dimdoors/{sound => sounds}/tearing.ogg (100%)

diff --git a/src/main/resources/assets/dimdoors/sounds.json b/src/main/resources/assets/dimdoors/sounds.json
index d676cc33..0fc825e7 100644
--- a/src/main/resources/assets/dimdoors/sounds.json
+++ b/src/main/resources/assets/dimdoors/sounds.json
@@ -1,15 +1,15 @@
 {
-    "crack": {"category":"hostile", "sound":[{"name":"crack","stream":false}]},
-    "creepy": {"category":"ambient", "sound":[{"name":"creepy","stream":true}]},
-    "doorLocked": {"category":"player", "sound":[{"name":"doorLocked","stream":false}]},
-    "doorLockRemoved": {"category":"player", "sound":[{"name":"doorLockRemoved","stream":false}]},
-    "keyLock": {"category":"player", "sound":[{"name":"keyLock","stream":false}]},
-    "keyUnlock": {"category":"player", "sound":[{"name":"keyUnlock", "stream":false}]},
-    "monk": {"category":"hostile", "sound":[{"name":"monk", "stream":false}]},
-    "rift": {"category":"master", "sound":[{"name":"rift", "stream":false}]},
-    "riftClose": {"category":"player", "sound":[{"name":"riftClose", "stream":false}]},
-    "riftDoor": {"category":"player", "sound":[{"name":"riftDoor", "stream":false}]},
-    "riftEnd": {"category":"player", "sound":[{"name":"riftEnd", "stream":false}]},
-    "riftStart": {"category":"player", "sound":[{"name":"riftStart", "stream":false}]},
-    "tearing": {"category":"hostile", "sound":[{"name":"tearing", "stream":false}]}
+    "crack": {"category":"hostile", "sounds":[{"name":"crack","stream":false}]},
+    "creepy": {"category":"ambient", "sounds":[{"name":"creepy","stream":true}]},
+    "doorLocked": {"category":"player", "sounds":[{"name":"doorLocked","stream":false}]},
+    "doorLockRemoved": {"category":"player", "sounds":[{"name":"doorLockRemoved","stream":false}]},
+    "keyLock": {"category":"player", "sounds":[{"name":"keyLock","stream":false}]},
+    "keyUnlock": {"category":"player", "sounds":[{"name":"keyUnlock", "stream":false}]},
+    "monk": {"category":"hostile", "sounds":[{"name":"monk", "stream":false}]},
+    "rift": {"category":"master", "sounds":[{"name":"rift", "stream":false}]},
+    "riftClose": {"category":"player", "sounds":[{"name":"riftClose", "stream":false}]},
+    "riftDoor": {"category":"player", "sounds":[{"name":"riftDoor", "stream":false}]},
+    "riftEnd": {"category":"player", "sounds":[{"name":"riftEnd", "stream":false}]},
+    "riftStart": {"category":"player", "sounds":[{"name":"riftStart", "stream":false}]},
+    "tearing": {"category":"hostile", "sounds":[{"name":"tearing", "stream":false}]}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/dimdoors/sound/crack.ogg b/src/main/resources/assets/dimdoors/sounds/crack.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/crack.ogg
rename to src/main/resources/assets/dimdoors/sounds/crack.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/creepy.ogg b/src/main/resources/assets/dimdoors/sounds/creepy.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/creepy.ogg
rename to src/main/resources/assets/dimdoors/sounds/creepy.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/doorLockRemoved.mp3 b/src/main/resources/assets/dimdoors/sounds/doorLockRemoved.mp3
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/doorLockRemoved.mp3
rename to src/main/resources/assets/dimdoors/sounds/doorLockRemoved.mp3
diff --git a/src/main/resources/assets/dimdoors/sound/doorLockRemoved.ogg b/src/main/resources/assets/dimdoors/sounds/doorLockRemoved.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/doorLockRemoved.ogg
rename to src/main/resources/assets/dimdoors/sounds/doorLockRemoved.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/doorLocked.mp3 b/src/main/resources/assets/dimdoors/sounds/doorLocked.mp3
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/doorLocked.mp3
rename to src/main/resources/assets/dimdoors/sounds/doorLocked.mp3
diff --git a/src/main/resources/assets/dimdoors/sound/doorLocked.ogg b/src/main/resources/assets/dimdoors/sounds/doorLocked.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/doorLocked.ogg
rename to src/main/resources/assets/dimdoors/sounds/doorLocked.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/keyLock.mp3 b/src/main/resources/assets/dimdoors/sounds/keyLock.mp3
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/keyLock.mp3
rename to src/main/resources/assets/dimdoors/sounds/keyLock.mp3
diff --git a/src/main/resources/assets/dimdoors/sound/keyLock.ogg b/src/main/resources/assets/dimdoors/sounds/keyLock.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/keyLock.ogg
rename to src/main/resources/assets/dimdoors/sounds/keyLock.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/keyUnlock.mp3 b/src/main/resources/assets/dimdoors/sounds/keyUnlock.mp3
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/keyUnlock.mp3
rename to src/main/resources/assets/dimdoors/sounds/keyUnlock.mp3
diff --git a/src/main/resources/assets/dimdoors/sound/keyUnlock.ogg b/src/main/resources/assets/dimdoors/sounds/keyUnlock.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/keyUnlock.ogg
rename to src/main/resources/assets/dimdoors/sounds/keyUnlock.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/monk.ogg b/src/main/resources/assets/dimdoors/sounds/monk.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/monk.ogg
rename to src/main/resources/assets/dimdoors/sounds/monk.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/rift.ogg b/src/main/resources/assets/dimdoors/sounds/rift.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/rift.ogg
rename to src/main/resources/assets/dimdoors/sounds/rift.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/riftClose.ogg b/src/main/resources/assets/dimdoors/sounds/riftClose.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/riftClose.ogg
rename to src/main/resources/assets/dimdoors/sounds/riftClose.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/riftDoor.ogg b/src/main/resources/assets/dimdoors/sounds/riftDoor.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/riftDoor.ogg
rename to src/main/resources/assets/dimdoors/sounds/riftDoor.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/riftEnd.ogg b/src/main/resources/assets/dimdoors/sounds/riftEnd.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/riftEnd.ogg
rename to src/main/resources/assets/dimdoors/sounds/riftEnd.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/riftStart.ogg b/src/main/resources/assets/dimdoors/sounds/riftStart.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/riftStart.ogg
rename to src/main/resources/assets/dimdoors/sounds/riftStart.ogg
diff --git a/src/main/resources/assets/dimdoors/sound/tearing.ogg b/src/main/resources/assets/dimdoors/sounds/tearing.ogg
similarity index 100%
rename from src/main/resources/assets/dimdoors/sound/tearing.ogg
rename to src/main/resources/assets/dimdoors/sounds/tearing.ogg