Simplify SoundEngine access

juliand665 · Dec 16, 2023 · 16db344 · 16db344
1 parent 9823168
commit 16db344
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 28 deletions.
diff --git a/src/main/java/dynamic_fps/impl/DynamicFPSMod.java b/src/main/java/dynamic_fps/impl/DynamicFPSMod.java
@@ -196,7 +196,7 @@ public static void handleStateChange(PowerState previous, PowerState current) {
 
 		for (var source : SoundSource.values()) {
 			if (before.volumeMultiplier(source) != config.volumeMultiplier(source)) {
-				minecraft.getSoundManager().dynamic_fps$updateVolume(source);
+				minecraft.getSoundManager().soundEngine.dynamic_fps$updateVolume(source);
 			}
 		}
 

diff --git a/src/main/java/dynamic_fps/impl/mixin/SoundEngineMixin.java b/src/main/java/dynamic_fps/impl/mixin/SoundEngineMixin.java
@@ -14,14 +14,14 @@
 import com.mojang.blaze3d.audio.Listener;
 
 import dynamic_fps.impl.DynamicFPSMod;
-import dynamic_fps.impl.util.duck.DuckSoundManager;
+import dynamic_fps.impl.util.duck.DuckSoundEngine;
 import net.minecraft.client.resources.sounds.SoundInstance;
 import net.minecraft.client.sounds.ChannelAccess;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.sounds.SoundSource;
 
 @Mixin(SoundEngine.class)
-public class SoundEngineMixin implements DuckSoundManager {
+public class SoundEngineMixin implements DuckSoundEngine {
 	@Shadow
 	private boolean loaded;
 

diff --git a/src/main/java/dynamic_fps/impl/mixin/SoundManagerMixin.java b/src/main/java/dynamic_fps/impl/mixin/SoundManagerMixin.java
diff --git a/..._fps/impl/util/duck/DuckSoundManager.java → ...c_fps/impl/util/duck/DuckSoundEngine.java b/..._fps/impl/util/duck/DuckSoundManager.java → ...c_fps/impl/util/duck/DuckSoundEngine.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.sounds.SoundSource;
 
-public interface DuckSoundManager {
+public interface DuckSoundEngine {
 	public default void dynamic_fps$updateVolume(SoundSource source) {
 		throw new RuntimeException("No implementation for dynamic_fps$updateVolume was found.");
 	}

diff --git a/src/main/resources/dynamic_fps.accesswidener b/src/main/resources/dynamic_fps.accesswidener
@@ -1,3 +1,4 @@
 accessWidener v2 named
 
 accessible field com/mojang/blaze3d/platform/Window window J
+accessible field net/minecraft/client/sounds/SoundManager soundEngine Lnet/minecraft/client/sounds/SoundEngine;
diff --git a/src/main/resources/dynamic_fps.mixins.json b/src/main/resources/dynamic_fps.mixins.json
@@ -11,7 +11,6 @@
 		"MinecraftMixin",
 		"ScreenMixin",
 		"SoundEngineMixin",
-		"SoundManagerMixin",
 		"StatsScreenMixin",
 		"ToastComponentMixin",
 		"WindowMixin",

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -46,8 +46,7 @@
 		"loom:injected_interfaces": {
 			"net/minecraft/class_437": ["dynamic_fps/impl/util/duck/DuckScreen"],
 			"net/minecraft/class_425": ["dynamic_fps/impl/util/duck/DuckSplashOverlay"],
-			"net/minecraft/class_1140": ["dynamic_fps/impl/util/duck/DuckSoundManager"],
-			"net/minecraft/class_1144": ["dynamic_fps/impl/util/duck/DuckSoundManager"]
+			"net/minecraft/class_1140": ["dynamic_fps/impl/util/duck/DuckSoundEngine"]
 		},
 		"dynamic_fps": {
 			"optimized_screens": {