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

…board fixes #2309
CaffeineMC · Nov 4, 2024 · 0ad3f83 · 0ad3f83
1 parent a3a5b84
commit 0ad3f83
Show file tree

Hide file tree

Showing 2 changed files with 6 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
@@ -69,8 +69,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
             if (this.option.isEnabled() && button == 0 && this.isMouseOver(mouseX, mouseY)) {
                 cycleControl(Screen.hasShiftDown());
-                this.playClickSound();
-
                 return true;
             }
 
@@ -89,7 +87,9 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             return false;
         }
 
-        public void cycleControl(boolean reverse) {
+        private void cycleControl(boolean reverse) {
+            this.playClickSound();
+
             var currentValue = this.option.getValidatedValue();
             int startIndex = 0;
             for (; startIndex < this.baseValues.length; startIndex++) {

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
@@ -80,8 +80,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
             if (this.option.isEnabled() && button == 0 && this.isMouseOver(mouseX, mouseY)) {
                 toggleControl();
-                this.playClickSound();
-
                 return true;
             }
 
@@ -94,15 +92,15 @@ 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.modifyValue(!this.option.getValidatedValue());
         }
     }