eymendemez/a1.0.6_03
1
0
Fork 0
mirror of https://github.com/WtmcX/a1.0.6_03.git synced 2025-06-05 14:30:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix sound

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@ -5,13 +5,6 @@
</component>
<component name="ChangeListManager">
<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" />
</list>
<option name="SHOW_DIALOG" value="false" />

89
src/main/java/net/minecraft/src/SoundManager.java
View File

@ -11,6 +11,7 @@ import net.lax1dude.eaglercraft.internal.IAudioCacheLoader;
import net.lax1dude.eaglercraft.internal.IAudioHandle;
import net.lax1dude.eaglercraft.internal.IAudioResource;
import net.lax1dude.eaglercraft.internal.PlatformAudio;
import net.minecraft.client.Minecraft;
import net.peyton.eagler.minecraft.AudioUtils;
public class SoundManager {
@ -91,15 +92,54 @@ public class SoundManager {
}
public void playSound(String var1, float var2, float var3, float var4, float var5, float var6) {
if(DEFAULT_SOUND_VOLUME != 0.0F) {
if(var5 > 0.0F) {
if (Minecraft.getMinecraft().options.a && Minecraft.getMinecraft().options.b) {
if (DEFAULT_SOUND_VOLUME != 0.0F) {
if (var5 > 0.0F) {
IAudioResource trk;
if (var1 == null) return;
var1 = var1.replace(".", "/");
int randNum = AudioUtils.getRandomSound(var1);
if (randNum == 0) {
return;
}
String soundName = "/sound/" + var1 + (randNum != -1 ? randNum : "") + ".ogg";
if (!sounds.containsKey(soundName)) {
if (EagRuntime.getPlatformType() != EnumPlatformType.DESKTOP) {
trk = PlatformAudio.loadAudioDataNew(soundName, true, browserResourceLoader);
} else {
trk = PlatformAudio.loadAudioData(soundName, true);
}
if (trk != null) {
sounds.put(soundName, trk);
}
} else {
trk = sounds.get(soundName);
}
if (trk != null) {
PlatformAudio.beginPlayback(trk, var2, var3, var4, var5 * DEFAULT_SOUND_VOLUME, var6, false);
}
}
}
}
}
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 (var2 > 1.0F) {
var2 = 1.0F;
}
var2 *= 0.25F;
IAudioResource trk;
if(var1 == null) return;
if (var1 == null) return;
var1 = var1.replace(".", "/");
int randNum = AudioUtils.getRandomSound(var1);
if(randNum == 0) {
int randNum = AudioUtils.getRandomSound(var1 + ".ogg");
if (randNum == 0) {
return;
}
String soundName = "/sound/" + var1 + (randNum != -1 ? randNum : "") + ".ogg";
@ -115,44 +155,9 @@ public class SoundManager {
} else {
trk = sounds.get(soundName);
}
if(trk != null) {
PlatformAudio.beginPlayback(trk, var2, var3, var4, var5 * DEFAULT_SOUND_VOLUME, var6, false);
}
}
}
}
public void playSoundFX(String var1, float var2, float var3) {
if(DEFAULT_SOUND_VOLUME != 0.0F) {
if(var2 > 1.0F) {
var2 = 1.0F;
}
var2 *= 0.25F;
IAudioResource trk;
if(var1 == null) return;
var1 = var1.replace(".", "/");
int randNum = AudioUtils.getRandomSound(var1 + ".ogg");
if(randNum == 0) {
return;
}
String soundName = "/sound/" + var1 + (randNum != -1 ? randNum : "") + ".ogg";
if (!sounds.containsKey(soundName)) {
if (EagRuntime.getPlatformType() != EnumPlatformType.DESKTOP) {
trk = PlatformAudio.loadAudioDataNew(soundName, true, browserResourceLoader);
} else {
trk = PlatformAudio.loadAudioData(soundName, true);
}
if (trk != null) {
sounds.put(soundName, trk);
PlatformAudio.beginPlaybackStatic(trk, var2 * DEFAULT_SOUND_VOLUME, var3, false);
}
} else {
trk = sounds.get(soundName);
}
if(trk != null) {
PlatformAudio.beginPlaybackStatic(trk, var2 * DEFAULT_SOUND_VOLUME, var3, false);
}
}
}