Updated to 1.21.6

Author: BVengo

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 }
 

gradle.properties

@@ -11,11 +11,12 @@ archives_base_name = soundcontroller
 ## Fabric: https://fabricmc.net/develop
 ## ModMenu: https://maven.terraformersmc.com/com/terraformersmc/modmenu
 
-modmenu_version=14.0.0-rc.2
+modmenu_version=15.0.0-beta.3
 
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.10
+minecraft_version=1.21.6
+yarn_mappings=1.21.6+build.1
+loader_version=0.16.14
+loom_version=1.10-SNAPSHOT
 
 # Fabric API
-fabric_version=0.119.5+1.21.5
+fabric_version=0.127.1+1.21.6

src/main/java/com/bvengo/soundcontroller/gui/buttons/HoverableButtonWidget.java

@@ -3,9 +3,9 @@
 import com.bvengo.soundcontroller.SoundController;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.util.Identifier;
 
@@ -40,6 +40,6 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt
         Identifier texture = isPressed ? (hovered ? ON_HOVER_TEXTURE : ON_TEXTURE)
                 : (hovered ? OFF_HOVER_TEXTURE : OFF_TEXTURE);
 
-        context.drawGuiTexture(RenderLayer::getGuiTextured, texture, getX(), getY(), width, height);
+        context.drawGuiTexture(RenderPipelines.GUI_TEXTURED, texture, getX(), getY(), width, height);
     }
 }

src/main/java/com/bvengo/soundcontroller/gui/buttons/ToggleButtonWidget.java

@@ -1,13 +1,7 @@
 package com.bvengo.soundcontroller.gui.buttons;
 
-import com.bvengo.soundcontroller.SoundController;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.screen.ScreenTexts;
-import net.minecraft.util.Identifier;
 
 /**
  * Custom button widget that is used as a trigger rather than a toggle.

src/main/java/com/bvengo/soundcontroller/mixin/SoundSystemAccessor.java

@@ -10,6 +10,6 @@ public interface SoundSystemAccessor {
     @Invoker("updateSoundVolume")
     void invokeUpdateSoundVolume(SoundCategory category, float volume);
 
-    @Invoker("getSoundVolume")
+    @Invoker("method_72233")
     float invokeGetSoundVolume(SoundCategory category);
 }

src/main/java/com/bvengo/soundcontroller/mixin/SoundSystemMixin.java

@@ -14,7 +14,7 @@
 
 @Mixin(SoundSystem.class)
 public class SoundSystemMixin {
-    @WrapOperation(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/sound/SoundSystem;getAdjustedVolume(FLnet/minecraft/sound/SoundCategory;)F"))
+    @WrapOperation(method = "play(Lnet/minecraft/client/sound/SoundInstance;)Lnet/minecraft/client/sound/SoundSystem$PlayResult;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/sound/SoundSystem;getAdjustedVolume(FLnet/minecraft/sound/SoundCategory;)F"))
     private float modifyH(SoundSystem instance, float volume, SoundCategory category, Operation<Float> original, SoundInstance sound) {
         // h comes from getAdjustedVolume(float volume, Category category) - we can't inject there, because no ID is available
         return SoundController.CONFIG.getAdjustedVolume(sound, (SoundSystemAccessor) this);

src/main/java/com/bvengo/soundcontroller/mixin/SubtitlesHudMixin.java

@@ -1,7 +1,6 @@
 package com.bvengo.soundcontroller.mixin;
 
 import com.bvengo.soundcontroller.SoundController;
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.gui.hud.SubtitlesHud;

src/main/resources/fabric.mod.json

@@ -28,7 +28,7 @@
     ],
     "depends": {
         "fabricloader": ">=0.16.0",
-        "minecraft": ">=1.21.4",
+        "minecraft": ">=1.21.6",
         "java": ">=21",
         "fabric-api": "*"
     },