From 6874904b1572fca4753ca4b7f2f052b6bc50ad45 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Mon, 30 Oct 2023 12:33:25 +0600 Subject: [PATCH] New Mod View --- .../java/net/silentclient/client/Client.java | 7 ++++ .../net/silentclient/client/mods/HudMod.java | 4 +- .../client/mods/ModDraggable.java | 2 +- .../client/mods/hud/KeystrokesMod.java | 2 +- .../silentclient/client/mods/util/Server.java | 39 ++++++++++--------- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/main/java/net/silentclient/client/Client.java b/src/main/java/net/silentclient/client/Client.java index 09cf576..b26ce66 100644 --- a/src/main/java/net/silentclient/client/Client.java +++ b/src/main/java/net/silentclient/client/Client.java @@ -30,6 +30,7 @@ import net.silentclient.client.mods.SettingsManager; import net.silentclient.client.mods.settings.FPSBoostMod; import net.silentclient.client.mods.settings.GeneralMod; import net.silentclient.client.mods.util.PingSource; +import net.silentclient.client.mods.util.Server; import net.silentclient.client.mods.util.Utils; import net.silentclient.client.premium.PremiumCosmeticsGui; import net.silentclient.client.premium.PremiumUtils; @@ -512,6 +513,8 @@ public class Client { this.updateUserInformation(); Client.logger.info("Update Connection Server: " + event.getServerData().serverIP); silentSocket.getSocket().emit("update_information", event.getServerData().serverIP); + Server.setHypixel(Server.checkIsHypixel()); + Server.setRuHypixel(Server.checkIsRuHypixel()); } @EventTarget @@ -522,6 +525,8 @@ public class Client { this.updateUserInformation(); Client.logger.info("Update Connection Server: null"); silentSocket.getSocket().emit("update_information", ""); + Server.setHypixel(Server.checkIsHypixel()); + Server.setRuHypixel(Server.checkIsRuHypixel()); } @EventTarget @@ -532,6 +537,8 @@ public class Client { this.updateUserInformation(); Client.logger.info("Update Connection Server: null"); silentSocket.getSocket().emit("update_information", ""); + Server.setHypixel(Server.checkIsHypixel()); + Server.setRuHypixel(Server.checkIsRuHypixel()); } // Instances diff --git a/src/main/java/net/silentclient/client/mods/HudMod.java b/src/main/java/net/silentclient/client/mods/HudMod.java index 24d8cfc..000aaa6 100644 --- a/src/main/java/net/silentclient/client/mods/HudMod.java +++ b/src/main/java/net/silentclient/client/mods/HudMod.java @@ -54,7 +54,7 @@ public class HudMod extends ModDraggable { boolean brackets = Client.getInstance().getSettingsManager().getSettingByName(this, "Brackets").getValBoolean(); if(background) { - return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 58 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 1 : 57); + return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 64 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 64); } return font.getStringWidth((brackets ? "[" : "") + getTextForRender() + (brackets ? "]" : "")); @@ -70,7 +70,7 @@ public class HudMod extends ModDraggable { boolean brackets = Client.getInstance().getSettingsManager().getSettingByName(this, "Brackets").getValBoolean(); if(background) { - return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 58 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 58); + return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 64 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 64); } return font.getStringWidth((brackets ? "[" : "") + getTextForRender() + (brackets ? "]" : "")); diff --git a/src/main/java/net/silentclient/client/mods/ModDraggable.java b/src/main/java/net/silentclient/client/mods/ModDraggable.java index 85811c6..9a269fa 100644 --- a/src/main/java/net/silentclient/client/mods/ModDraggable.java +++ b/src/main/java/net/silentclient/client/mods/ModDraggable.java @@ -43,7 +43,7 @@ public abstract class ModDraggable extends Mod implements IRenderer { @Override public void setup() { - this.addSliderSetting("Scale", this, 3.0F, 1.0F, 5.0F, false); + this.addSliderSetting("Scale", this, 2.0F, 1.0F, 5.0F, false); super.setup(); } diff --git a/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java b/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java index 2f44c7c..d32a159 100644 --- a/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java +++ b/src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java @@ -28,7 +28,7 @@ public class KeystrokesMod extends ModDraggable { @Override public void setup() { - super.setup(); + this.addSliderSetting("Scale", this, 2.23F, 1.0F, 5.0F, false); setUpdated(true); ArrayList cpsModes = new ArrayList<>(); cpsModes.add("None"); diff --git a/src/main/java/net/silentclient/client/mods/util/Server.java b/src/main/java/net/silentclient/client/mods/util/Server.java index 7bba487..ba93469 100644 --- a/src/main/java/net/silentclient/client/mods/util/Server.java +++ b/src/main/java/net/silentclient/client/mods/util/Server.java @@ -2,11 +2,29 @@ package net.silentclient.client.mods.util; import net.minecraft.client.Minecraft; -import java.net.URL; import java.util.regex.Pattern; public class Server { + public static boolean hypixel = false; + public static boolean ruHypixel = false; + public static boolean isHypixel() { + return hypixel; + } + + public static void setHypixel(boolean hypixel) { + Server.hypixel = hypixel; + } + + public static boolean isRuHypixel() { + return ruHypixel; + } + + public static void setRuHypixel(boolean ruHypixel) { + Server.ruHypixel = ruHypixel; + } + + public static boolean checkIsHypixel() { if(Minecraft.getMinecraft().isSingleplayer()) { return false; } @@ -21,24 +39,7 @@ public class Server { } } - public static boolean isSilent() { - if(Minecraft.getMinecraft().isSingleplayer()) { - return false; - } - try { - String serverIp = Minecraft.getMinecraft().getCurrentServerData().serverIP.toString(); - if(!serverIp.startsWith("http") && !serverIp.startsWith("https")){ - serverIp = "http://" + serverIp; - } - URL serverUrl = new URL(serverIp); - - return (serverUrl.getHost().toString().toLowerCase().equals("mc.silentclient.net") || serverUrl.getHost().toString().equals("practice.silentclient.net")); - } catch (Exception err) { - return false; - } - } - - public static boolean isRuHypixel() { + public static boolean checkIsRuHypixel() { if(Minecraft.getMinecraft().isSingleplayer()) { return false; }