Added check for modded sounds with no sound ??

Fixes #79
LeoBeliik · Jul 3, 2024 · a017726 · a017726
1 parent 12d38ef
commit a017726
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 332 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1 @@
-Backported features / bugfixes to 1.20.1:
-Dragon growl and thunder can now be muffled
-Minecart sound when player inside now respect anchors
-Anchors now properly shows its radius (thanks rmnvgr)
+Fixed crash with some soundless modded sounds
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/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -5,7 +5,7 @@ licenseURL= "https://github.com/LeoBeliik/ExtremeSoundMuffler/blob/master/LICENS
 issueTrackerURL="https://github.com/LeoBeliik/ExtremeSoundMuffler/issues"
 [[mods]] #mandatory
 modId = "extremesoundmuffler" #mandatory
-version = "3.47" #mandatory
+version = "3.48" #mandatory
 displayName="Extreme Sound Muffler"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/extreme-sound-muffler"
 logoFile= "esm_logo.png" #optional

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-modversion = 3.47
+modversion = 3.48
 group=com.leobeliik.extremesoundmuffler
 
 # Common

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