feat(utils): add new methods to SoundUtils

auioc · Apr 11, 2022 · 4cf18df · 4cf18df
1 parent 228139f
commit 4cf18df
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/SoundUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/SoundUtils.java
@@ -7,23 +7,37 @@
 import net.minecraftforge.registries.ForgeRegistries;
 
 public interface SoundUtils {
-    static SoundEvent getSoundEvent(String key) {
-        return ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(key));
+
+    static SoundEvent getSoundEvent(ResourceLocation id) {
+        return ForgeRegistries.SOUND_EVENTS.getValue(id);
+    }
+
+    static SoundEvent getSoundEvent(String id) {
+        return getSoundEvent(new ResourceLocation(id));
+    }
+
+    static void playerToPlayer(Player player, String id, SoundSource source, float volume, float pitch) {
+        player.playNotifySound(getSoundEvent(id), source, volume, pitch);
+    }
+
+    static void playerToPlayer(Player player, String id) {
+        playerToPlayer(player, id, SoundSource.MASTER, 1, 1);
     }
 
-    static void playSoundToPlayer(Player player, String key, SoundSource source, float volume, float pitch) {
-        if (!key.equals("")) {
-            player.playNotifySound(getSoundEvent(key), source, volume, pitch);
-        }
+    static void playerToPlayer(Player player, String id, float volume, float pitch) {
+        playerToPlayer(player, id, SoundSource.MASTER, volume, pitch);
     }
 
+    static void playerToPlayer(Player player, ResourceLocation id, SoundSource source, float volume, float pitch) {
+        player.playNotifySound(getSoundEvent(id), source, volume, pitch);
+    }
 
-    static void playSoundToPlayer(Player player, String key) {
-        playSoundToPlayer(player, key, SoundSource.MASTER, 1, 1);
+    static void playerToPlayer(Player player, ResourceLocation id) {
+        playerToPlayer(player, id, SoundSource.MASTER, 1, 1);
     }
 
-    static void playSoundToPlayer(Player player, String key, float volume, float pitch) {
-        playSoundToPlayer(player, key, SoundSource.MASTER, volume, pitch);
+    static void playerToPlayer(Player player, ResourceLocation id, float volume, float pitch) {
+        playerToPlayer(player, id, SoundSource.MASTER, volume, pitch);
     }
 
 }