Added check for modded sounds with no sound ??

LeoBeliik · Jul 3, 2024 · 13dc028 · 13dc028
1 parent adf7e1e
commit 13dc028
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 382 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1 @@
-Dragon growl can now be muffled
-
-Anchors now properly shows its radius (thanks rmnvgr)
+Fixed crash with some soundless modded sounds
diff --git a/build.gradle b/build.gradle
@@ -60,8 +60,6 @@ subprojects {
                 "version": modversion,
                 "group": project.group, //Else we target the task's group.
                 "minecraft_version": minecraft_version,
-                //"forge_version": forge_version,
-                //"forge_version_range": forge_version,
                 "minecraft_version_range": minecraft_version,
                 "fabric_version": fabric_version,
                 "fabric_loader_version": fabric_loader_version,

diff --git a/common/src/main/java/com/leobeliik/extremesoundmuffler/mixins/SoundMixin.java b/common/src/main/java/com/leobeliik/extremesoundmuffler/mixins/SoundMixin.java
@@ -44,7 +44,7 @@ private void esm_captureTickableSoundVolume(SoundInstance sound, CallbackInfo ci
     private float esm_setVolume(float volume) {
         SoundInstance tempSound = esmSound;
         //don't care about forbidden sounds or from the psb
-        if (tempSound != null && !esm_isForbidden(tempSound) && !PlaySoundButton.isFromPSB()) {
+        if (tempSound != null && tempSound.getSound() != null && !esm_isForbidden(tempSound) && !PlaySoundButton.isFromPSB()) {
             ResourceLocation soundLocation = tempSound.getLocation();
 
             //remove sound to prevent repeated sounds and maintains the desired order

diff --git a/forge/build.gradle b/forge/build.gradle
diff --git a/forge/src/main/java/com/leobeliik/extremesoundmuffler/ForgeConfig.java b/forge/src/main/java/com/leobeliik/extremesoundmuffler/ForgeConfig.java
diff --git a/forge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerForge.java b/forge/src/main/java/com/leobeliik/extremesoundmuffler/SoundMufflerForge.java
diff --git a/forge/src/main/resources/META-INF/MANIFEST.MF b/forge/src/main/resources/META-INF/MANIFEST.MF
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
diff --git a/forge/src/main/resources/extremesoundmuffler.mixins.json b/forge/src/main/resources/extremesoundmuffler.mixins.json