From 8c065dd61d5481548eac27c12c92f735c4fb3cfc Mon Sep 17 00:00:00 2001
From: haykam821 <24855774+haykam821@users.noreply.github.com>
Date: Sat, 3 Feb 2024 00:50:25 -0500
Subject: [PATCH] Fix cycling controls not playing a sound when activated using
 the keyboard

Fixes #2309
---
 .../sodium/client/gui/options/control/CyclingControl.java | 7 +++----
 .../sodium/client/gui/options/control/TickBoxControl.java | 8 ++------
 .../mods/sodium/client/gui/widgets/FlatButtonWidget.java  | 1 -
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/CyclingControl.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/CyclingControl.java
index 06825cde9b..c2416dc1cd 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/CyclingControl.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/CyclingControl.java
@@ -6,7 +6,6 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.input.KeyCodes;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.Validate;
 
@@ -101,8 +100,6 @@ public void render(DrawContext drawContext, 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;
             }
 
@@ -121,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/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/TickBoxControl.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/TickBoxControl.java
index 9dc1a1dbcb..be564c37a6 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/TickBoxControl.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/options/control/TickBoxControl.java
@@ -4,7 +4,6 @@
 import me.jellysquid.mods.sodium.client.util.Dim2i;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.input.KeyCodes;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.Rect2i;
 
 public class TickBoxControl implements Control<Boolean> {
@@ -69,8 +68,6 @@ public void render(DrawContext drawContext, 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;
             }
 
@@ -83,15 +80,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 
             if (KeyCodes.isToggle(keyCode)) {
                 toggleControl();
-                this.playClickSound();
-
                 return true;
             }
 
             return false;
         }
 
-        public void toggleControl() {
+        private void toggleControl() {
+            this.playClickSound();
             this.option.setValue(!this.option.getValue());
         }
     }
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget.java
index a09b330935..b3ce39d161 100644
--- a/src/main/java/me/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget.java
+++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget.java
@@ -7,7 +7,6 @@
 import net.minecraft.client.gui.navigation.GuiNavigation;
 import net.minecraft.client.gui.navigation.GuiNavigationPath;
 import net.minecraft.client.input.KeyCodes;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;