From 4efd98505aa1845d84511a1d660c5d9ec5fbbf83 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 11 Oct 2023 01:08:47 +0600 Subject: [PATCH 1/3] fixes --- .../java/net/silentclient/client/admin/AdminRender.java | 6 +++--- .../silentclient/client/gui/quickplay/QuickplayModeGui.java | 4 ++-- .../net/silentclient/client/mods/hypixel/QuickPlayMod.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/silentclient/client/admin/AdminRender.java b/src/main/java/net/silentclient/client/admin/AdminRender.java index 490af2d..5a2d0d5 100644 --- a/src/main/java/net/silentclient/client/admin/AdminRender.java +++ b/src/main/java/net/silentclient/client/admin/AdminRender.java @@ -414,17 +414,17 @@ public class AdminRender extends GuiScreen { this.currentFrame = 0; break; case "wings": - ((AbstractClientPlayerExt) mc.thePlayer).silent$setWings(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length - 1, 150)); + ((AbstractClientPlayerExt) mc.thePlayer).silent$setWings(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length, 150)); this.frames = 1; this.currentFrame = 0; break; case "bandana": - ((AbstractClientPlayerExt) mc.thePlayer).silent$setBandana(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length - 1, 150)); + ((AbstractClientPlayerExt) mc.thePlayer).silent$setBandana(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length, 150)); this.frames = ((AbstractClientPlayerExt) mc.thePlayer).silent$getBandana().getFrames(); this.currentFrame = 0; break; case "shield": - ((AbstractClientPlayerExt) mc.thePlayer).silent$setShield(new ShieldData(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length - 1, 150), model)); + ((AbstractClientPlayerExt) mc.thePlayer).silent$setShield(new ShieldData(new TestAnimatedResourceLocation(adminRenderPath.listFiles().length, 150), model)); this.frames = ((AbstractClientPlayerExt) mc.thePlayer).silent$getShield().getTexture().getFrames(); this.currentFrame = 0; break; 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 759f827..f050559 100644 --- a/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java +++ b/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java @@ -44,7 +44,7 @@ public class QuickplayModeGui extends SilentScreen { this.silentInputs.clear(); this.buttonList.add(new IconButton(0, this.width - 14 - 3, 3, 14, 14, 8, 8, new ResourceLocation("silentclient/icons/exit.png"))); for(QuickPlayMod.QuickplayCommandType quickplayMode : quickplayMode.modes) { - this.silentInputs.add(new Input(quickplayMode.name, Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode:%s:%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).getKeybind())); + this.silentInputs.add(new Input(quickplayMode.name, Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode|%s|%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).getKeybind())); } } @@ -180,7 +180,7 @@ 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()); + Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode|%s|%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).setKeybind(this.silentInputs.get(inputIndex).getKey()); 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 5a5b8b6..6e88335 100644 --- a/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java +++ b/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java @@ -54,7 +54,7 @@ public class QuickPlayMod extends Mod { Client.logger.info(String.format("Initialising Hypixel Quickplay Mode (%s)", mode.name)); mode.modes.forEach((command) -> { Client.logger.info(String.format("Initialising Hypixel Quickplay Mode (%s) Command (%s)", mode.name, command.name)); - this.addKeybindSetting("Quickplay Mode:Hypixel:"+command.command, this, -1); + this.addKeybindSetting("Quickplay Mode|Hypixel|"+command.command, this, -1); }); } } catch (Exception err) { @@ -80,7 +80,7 @@ public class QuickPlayMod extends Mod { Client.logger.info(String.format("Initialising RuHypixel Quickplay Mode (%s)", mode.name)); mode.modes.forEach((command) -> { Client.logger.info(String.format("Initialising RuHypixel Quickplay Mode (%s) Command (%s)", mode.name, command.name)); - this.addKeybindSetting("Quickplay Mode:RuHypixel:"+command.command, this, -1); + this.addKeybindSetting("Quickplay Mode|RuHypixel|"+command.command, this, -1); }); } } catch (Exception err) { From 89a70cb7ca22ec17ed4386d0777e529c9e22a195 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 11 Oct 2023 01:09:45 +0600 Subject: [PATCH 2/3] Update QuickPlayMod.java --- .../java/net/silentclient/client/mods/hypixel/QuickPlayMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6e88335..272b80a 100644 --- a/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java +++ b/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java @@ -120,7 +120,7 @@ public class QuickPlayMod extends Mod { if(sending) { return; } - String[] args = setting.getName().split(":"); + String[] args = setting.getName().split("|"); if(((args[1].equals("Hypixel") && Server.isHypixel()) || (args[1].equals("RuHypixel") && Server.isRuHypixel())) && setting.isKeyDown()) { runCommand(args[2]); } From cc64739dae50365589f76aac7ef5974cc104719f Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 11 Oct 2023 01:31:53 +0600 Subject: [PATCH 3/3] fix? --- .../silentclient/client/gui/quickplay/QuickplayModeGui.java | 4 ++-- .../net/silentclient/client/mods/hypixel/QuickPlayMod.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 f050559..938fd12 100644 --- a/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java +++ b/src/main/java/net/silentclient/client/gui/quickplay/QuickplayModeGui.java @@ -44,7 +44,7 @@ public class QuickplayModeGui extends SilentScreen { this.silentInputs.clear(); this.buttonList.add(new IconButton(0, this.width - 14 - 3, 3, 14, 14, 8, 8, new ResourceLocation("silentclient/icons/exit.png"))); for(QuickPlayMod.QuickplayCommandType quickplayMode : quickplayMode.modes) { - this.silentInputs.add(new Input(quickplayMode.name, Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode|%s|%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).getKeybind())); + this.silentInputs.add(new Input(quickplayMode.name, Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode&%s&%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).getKeybind())); } } @@ -180,7 +180,7 @@ 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()); + Client.getInstance().getSettingsManager().getSettingByClass(QuickPlayMod.class, String.format("Quickplay Mode&%s&%s", Server.isRuHypixel() ? "RuHypixel" : "Hypixel", quickplayMode.command)).setKeybind(this.silentInputs.get(inputIndex).getKey()); 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 272b80a..4a6cb4c 100644 --- a/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java +++ b/src/main/java/net/silentclient/client/mods/hypixel/QuickPlayMod.java @@ -54,7 +54,7 @@ public class QuickPlayMod extends Mod { Client.logger.info(String.format("Initialising Hypixel Quickplay Mode (%s)", mode.name)); mode.modes.forEach((command) -> { Client.logger.info(String.format("Initialising Hypixel Quickplay Mode (%s) Command (%s)", mode.name, command.name)); - this.addKeybindSetting("Quickplay Mode|Hypixel|"+command.command, this, -1); + this.addKeybindSetting("Quickplay Mode&Hypixel&"+command.command, this, -1); }); } } catch (Exception err) { @@ -80,7 +80,7 @@ public class QuickPlayMod extends Mod { Client.logger.info(String.format("Initialising RuHypixel Quickplay Mode (%s)", mode.name)); mode.modes.forEach((command) -> { Client.logger.info(String.format("Initialising RuHypixel Quickplay Mode (%s) Command (%s)", mode.name, command.name)); - this.addKeybindSetting("Quickplay Mode|RuHypixel|"+command.command, this, -1); + this.addKeybindSetting("Quickplay Mode&RuHypixel&"+command.command, this, -1); }); } } catch (Exception err) { @@ -120,7 +120,7 @@ public class QuickPlayMod extends Mod { if(sending) { return; } - String[] args = setting.getName().split("|"); + String[] args = setting.getName().split("&"); if(((args[1].equals("Hypixel") && Server.isHypixel()) || (args[1].equals("RuHypixel") && Server.isRuHypixel())) && setting.isKeyDown()) { runCommand(args[2]); }