Fix cycling controls not playing a sound when activated using the key…

…board Fixes CaffeineMC#2309
MeeniMc · Oct 22, 2024 · 1700fb4 · 1700fb4
1 parent 37dc5f6
commit 1700fb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/...n/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/CyclingControl.java b/...n/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/CyclingControl.java
@@ -100,8 +100,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
             if (this.option.isAvailable() && button == 0 && this.dim.containsCursor(mouseX, mouseY)) {
                 cycleControl(Screen.hasShiftDown());
-                this.playClickSound();
-
                 return true;
             }
 
@@ -120,7 +118,9 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             return false;
         }
 
-        public void cycleControl(boolean reverse) {
+        private void cycleControl(boolean reverse) {
+            this.playClickSound();
+
             if (reverse) {
                 this.currentIndex = (this.currentIndex + this.allowedValues.length - 1) % this.allowedValues.length;
             } else {

diff --git a/...n/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/TickBoxControl.java b/...n/src/main/java/net/caffeinemc/mods/sodium/client/gui/options/control/TickBoxControl.java
@@ -68,8 +68,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
             if (this.option.isAvailable() && button == 0 && this.dim.containsCursor(mouseX, mouseY)) {
                 toggleControl();
-                this.playClickSound();
-
                 return true;
             }
 
@@ -82,15 +80,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
             if (CommonInputs.selected(keyCode)) {
                 toggleControl();
-                this.playClickSound();
-
                 return true;
             }
 
             return false;
         }
 
-        public void toggleControl() {
+        private void toggleControl() {
+            this.playClickSound();
             this.option.setValue(!this.option.getValue());
         }
     }