From 84fdf9d5c835fdf0ea1f222cfb4611af5f0041b5 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 1 May 2024 13:31:45 +0600 Subject: [PATCH] (fix) quickplay mod --- .../net/silentclient/client/emotes/EmotesMod.java | 3 --- .../client/gui/lite/clickgui/ModSettings.java | 2 ++ .../client/gui/modmenu/ModSettings.java | 2 ++ .../client/gui/quickplay/QuickplayModeGui.java | 5 ++++- .../client/mods/hypixel/QuickPlayMod.java | 15 +++++++++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/silentclient/client/emotes/EmotesMod.java b/src/main/java/net/silentclient/client/emotes/EmotesMod.java index ec4fc52..788ab58 100644 --- a/src/main/java/net/silentclient/client/emotes/EmotesMod.java +++ b/src/main/java/net/silentclient/client/emotes/EmotesMod.java @@ -61,7 +61,6 @@ public class EmotesMod extends Mod { EmotesMod.sending = true; (new Thread("EMOTES BIND:" + bind.emoteId) { public void run() { - Client.logger.info("bind found"); EmoteSocket.get().startEmote(bind.emoteId); try { Thread.sleep(2000L); @@ -71,8 +70,6 @@ public class EmotesMod extends Mod { EmotesMod.sending = false; } }).start(); - } else { - Client.logger.info("bind not found"); } } } diff --git a/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java b/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java index 7916c9d..3533066 100644 --- a/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java +++ b/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java @@ -452,11 +452,13 @@ public class ModSettings extends SilentScreen { } this.silentInputs.get(inputIndex).onKeyTyped(typedChar, keyCode); setting.setValString(this.silentInputs.get(inputIndex).getValue()); + mod.onChangeSettingValue(setting); inputIndex++; } if (setting.isKeybind() && !setting.getName().startsWith("Quickplay Mode")) { this.silentInputs.get(inputIndex).onKeyTyped(typedChar, keyCode); setting.setKeybind(this.silentInputs.get(inputIndex).getKey()); + mod.onChangeSettingValue(setting); inputIndex++; } } diff --git a/src/main/java/net/silentclient/client/gui/modmenu/ModSettings.java b/src/main/java/net/silentclient/client/gui/modmenu/ModSettings.java index 990506f..27a1845 100644 --- a/src/main/java/net/silentclient/client/gui/modmenu/ModSettings.java +++ b/src/main/java/net/silentclient/client/gui/modmenu/ModSettings.java @@ -370,12 +370,14 @@ public class ModSettings extends SilentScreen { } this.silentInputs.get(inputIndex).onKeyTyped(typedChar, keyCode); setting.setValString(this.silentInputs.get(inputIndex).getValue()); + mod.onChangeSettingValue(setting); inputIndex++; } if (setting.isKeybind() && !setting.getName().startsWith("Quickplay Mode")) { this.silentInputs.get(inputIndex).onKeyTyped(typedChar, keyCode); setting.setKeybind(this.silentInputs.get(inputIndex).getKey()); + mod.onChangeSettingValue(setting); inputIndex++; } } diff --git a/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java b/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java index 938fd12..e403f85 100644 --- a/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java +++ b/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java @@ -14,6 +14,7 @@ import net.silentclient.client.gui.lite.clickgui.utils.MouseUtils; import net.silentclient.client.gui.theme.Theme; import net.silentclient.client.gui.theme.input.DefaultInputTheme; import net.silentclient.client.gui.util.RenderUtil; +import net.silentclient.client.mods.Setting; import net.silentclient.client.mods.hypixel.QuickPlayMod; import net.silentclient.client.mods.util.Server; import net.silentclient.client.utils.MenuBlurUtils; @@ -180,7 +181,9 @@ public class QuickplayModeGui extends SilentScreen { for(QuickPlayMod.QuickplayCommandType quickplayMode : quickplayMode.modes) { if(silentInputs.get(inputIndex).isFocused()) { this.silentInputs.get(inputIndex).onKeyTyped(typedChar, keyCode); - Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode&%s&%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).setKeybind(this.silentInputs.get(inputIndex).getKey()); + Setting setting = Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode&%s&%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)); + setting.setKeybind(this.silentInputs.get(inputIndex).getKey()); + Client.getInstance().getModInstances().getModByClass(QuickPlayMod.class).onChangeSettingValue(setting); if(keyCode == Keyboard.KEY_ESCAPE) { neededKeyCheck = false; break; diff --git a/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java b/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java index d32bc26..fe62f56 100644 --- a/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java +++ b/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java @@ -35,6 +35,7 @@ public class QuickPlayMod extends Mod { this.addKeybindSetting("Open Menu", this, Keyboard.KEY_MINUS); initHypixelModes(); initRuHypixelModes(); + updateHashMap(); } private void initHypixelModes() { @@ -148,6 +149,20 @@ public class QuickPlayMod extends Mod { } } + @Override + public void onEnable() { + super.onEnable(); + updateHashMap(); + } + + @Override + public void onDisable() { + super.onDisable(); + updateHashMap(); + } + + + public class QuickplayModeType { public String name; public String icon;