fix sound

This commit is contained in:
eymendemez 2025-05-31 09:56:49 +03:00
parent a70b210871
commit de89220d16
2 changed files with 47 additions and 49 deletions

7
.idea/workspace.xml generated
View File

@ -5,13 +5,6 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6bf56493-3337-4b11-98fb-a5d499cdbe34" name="Changes" comment=""> <list default="true" id="6bf56493-3337-4b11-98fb-a5d499cdbe34" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/javascript/EaglercraftX_1.8_Offline_International.html" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/EaglercraftX_1.8_Offline_International.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/javascript/EaglercraftX_1.8_Offline_en_US.html" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/EaglercraftX_1.8_Offline_en_US.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/javascript/assets.epk" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/assets.epk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/javascript/classes.js" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/classes.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/javascript/classes.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/javascript/classes.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/minecraft/client/Minecraft.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/minecraft/client/Minecraft.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/net/minecraft/src/SoundManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/minecraft/src/SoundManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/net/minecraft/src/SoundManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/minecraft/src/SoundManager.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

View File

@ -11,6 +11,7 @@ import net.lax1dude.eaglercraft.internal.IAudioCacheLoader;
import net.lax1dude.eaglercraft.internal.IAudioHandle; import net.lax1dude.eaglercraft.internal.IAudioHandle;
import net.lax1dude.eaglercraft.internal.IAudioResource; import net.lax1dude.eaglercraft.internal.IAudioResource;
import net.lax1dude.eaglercraft.internal.PlatformAudio; import net.lax1dude.eaglercraft.internal.PlatformAudio;
import net.minecraft.client.Minecraft;
import net.peyton.eagler.minecraft.AudioUtils; import net.peyton.eagler.minecraft.AudioUtils;
public class SoundManager { public class SoundManager {
@ -91,6 +92,7 @@ public class SoundManager {
} }
public void playSound(String var1, float var2, float var3, float var4, float var5, float var6) { public void playSound(String var1, float var2, float var3, float var4, float var5, float var6) {
if (Minecraft.getMinecraft().options.a && Minecraft.getMinecraft().options.b) {
if (DEFAULT_SOUND_VOLUME != 0.0F) { if (DEFAULT_SOUND_VOLUME != 0.0F) {
if (var5 > 0.0F) { if (var5 > 0.0F) {
IAudioResource trk; IAudioResource trk;
@ -122,8 +124,10 @@ public class SoundManager {
} }
} }
} }
}
public void playSoundFX(String var1, float var2, float var3) { public void playSoundFX(String var1, float var2, float var3) {
if (Minecraft.getMinecraft().options.a && Minecraft.getMinecraft().options.b) {
if (DEFAULT_SOUND_VOLUME != 0.0F) { if (DEFAULT_SOUND_VOLUME != 0.0F) {
if (var2 > 1.0F) { if (var2 > 1.0F) {
var2 = 1.0F; var2 = 1.0F;
@ -156,6 +160,7 @@ public class SoundManager {
} }
} }
} }
}
public void playButtonClick() { public void playButtonClick() {
playSoundFX("random.click", 1.0f, 1.0f); playSoundFX("random.click", 1.0f, 1.0f);