[compat] MidnightControls 1.12.1+26.1

Author: lonefelidae16

gradle.properties

@@ -18,7 +18,7 @@ maven_group=dev.stashy
 archives_base_name=extrasounds
 arrp_version=0.8.1
 soundcategories_version=1.2.4+1.19
-mn_ctrls_version=1.10.1-fabric
+mn_ctrls_version=1.12.1+26.1-fabric
 groom_version=1.0.0-SNAPSHOT
 gradle_git_rev_version=4.0.0
 # Metadata

logics/src/main/java/dev/stashy/extrasounds/logics/compat/mixin/midnightcontrols/InputHandlersMixin.java

@@ -18,23 +18,28 @@ public abstract class InputHandlersMixin {
     @Unique
     private static final VersionedHotbarSoundHandler SOUND_HANDLER = ExtraSounds.MANAGER.getHotbarSoundHandler();
 
-    @Inject(method = "lambda$handleHotbar$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;setSelectedSlot(I)V", shift = At.Shift.AFTER), require = 0)
+    @Inject(method = "lambda$handleHotbar$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Inventory;setSelectedSlot(I)V", shift = At.Shift.AFTER), require = 0)
     private static void extrasounds$hotbarScroll_integrateMidnightControls(CallbackInfoReturnable<PressAction> cir) {
         SOUND_HANDLER.onChange();
     }
 
+    @Inject(method = "lambda$handleHotbar$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;setSelectedSlot(I)V", shift = At.Shift.AFTER), require = 0)
+    private static void extrasounds$hotbarScroll_integrateMidnightControls1101(CallbackInfoReturnable<PressAction> cir) {
+        SOUND_HANDLER.onChange();
+    }
+
     @Inject(method = "lambda$handleHotbar$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;scrollInHotbar(D)V", shift = At.Shift.AFTER), require = 0)
-    private static void extrasounds$hotbarScroll_integrateMidnightControls197(CallbackInfoReturnable<PressAction> cir) {
+    private static void extrasounds$hotbarScroll_integrateMidnightControls1097(CallbackInfoReturnable<PressAction> cir) {
         SOUND_HANDLER.onChange();
     }
 
     @Inject(method = "lambda$handleHotbar$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;scrollInHotbar(D)V", shift = At.Shift.AFTER), require = 0)
-    private static void extrasounds$hotbarScroll_integrateMidnightControls174(CallbackInfoReturnable<PressAction> cir) {
+    private static void extrasounds$hotbarScroll_integrateMidnightControls1074(CallbackInfoReturnable<PressAction> cir) {
         SOUND_HANDLER.onChange();
     }
 
     @Inject(method = "lambda$handleHotbar$0", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I", shift = At.Shift.AFTER), require = 0)
-    private static void extrasounds$hotbarScroll_integrateMidnightControls150(CallbackInfoReturnable<PressAction> cir) {
+    private static void extrasounds$hotbarScroll_integrateMidnightControls1050(CallbackInfoReturnable<PressAction> cir) {
         SOUND_HANDLER.onChange();
     }
 }

logics/src/main/java/dev/stashy/extrasounds/logics/compat/mixin/midnightcontrols/MouseMixin.java

@@ -22,9 +22,9 @@ public abstract class MouseMixin {
      * The lambda in 3rd arg of {@code InputUtil#setMouseCallbacks()}
      */
     @Unique
-    private static final String METHOD_SIGN_SETUP_CALLBACK_LAMBDA = "method_22684";
+    private static final String METHOD_SIGN_ON_BUTTON = "onButton";
 
-    @Inject(method = METHOD_SIGN_SETUP_CALLBACK_LAMBDA, at = @At("HEAD"))
+    @Inject(method = METHOD_SIGN_ON_BUTTON, at = @At("HEAD"))
     private void extrasounds$storeHotbarIndex_integrateMidnightControls(CallbackInfo ci) {
         final LocalPlayer player = Minecraft.getInstance().player;
         if (player == null) {
@@ -33,7 +33,7 @@ public abstract class MouseMixin {
         this.currentHotbarSlot = this.soundHandler.getPlayerInventorySlot(player);
     }
 
-    @Inject(method = METHOD_SIGN_SETUP_CALLBACK_LAMBDA, at = @At("RETURN"))
+    @Inject(method = METHOD_SIGN_ON_BUTTON, at = @At("RETURN"))
     private void extrasounds$touchHotbar_integrateMidnightControls(CallbackInfo ci) {
         final LocalPlayer player = Minecraft.getInstance().player;
         if (player == null) {