Merge pull request #74 from Silent-Client/TEST2

Test2

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

src/main/java/net/silentclient/client/cosmetics/AnimatedResourceLocation.java

@@ -2,6 +2,7 @@ package net.silentclient.client.cosmetics;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ResourceLocation;
+import net.silentclient.client.mixin.ducks.TextureManagerExt;
 import net.silentclient.client.utils.TimerUtils;
 
 import java.util.ArrayList;
@@ -66,12 +67,12 @@ public class AnimatedResourceLocation {
 		}
 	    
 	    public void bindTexture() {
-//			if(currentFrame == 0) {
+			if(currentFrame == 0) {
-//				binding = false;
+				binding = false;
 				Minecraft.getMinecraft().getTextureManager().bindTexture(this.getTexture());
-//				return;
+				return;
-//			}
+			}
-//	    	binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000);
+	    	binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000);
 	    }
 	    
 	    public void setCurrentFrame(int currentFrame) {

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 ? "]" : ""));

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();
 	}
 

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<String> cpsModes = new ArrayList<>();
 		cpsModes.add("None");

src/main/java/net/silentclient/client/mods/hypixel/AutoGGMod.java

@@ -1,13 +1,5 @@
 package net.silentclient.client.mods.hypixel;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import net.minecraft.network.play.server.S02PacketChat;
 import net.silentclient.client.Client;
 import net.silentclient.client.event.EventTarget;
@@ -16,6 +8,14 @@ import net.silentclient.client.mods.Mod;
 import net.silentclient.client.mods.ModCategory;
 import net.silentclient.client.mods.util.Server;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class AutoGGMod extends Mod {
 	
 	private static boolean isHypixel;
@@ -57,15 +57,6 @@ public class AutoGGMod extends Mod {
 			}
 			return;
 		}
-		
-		if(Server.isSilent()) {
-			String formattedMessage = e.getChatComponent().getFormattedText();
-			if(formattedMessage.contains("§r§6Winner:")) {
-				AutoGGMod.isRunning = true;
-				AutoGGMod.THREAD_POOL.submit(new sendGG());
-			}
-			return;
-		}
 				
 		if(AutoGGMod.isHypixel) {
 			try {

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() {
+	public static boolean checkIsRuHypixel() {
-		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() {
 		if(Minecraft.getMinecraft().isSingleplayer()) {
 			return false;
 		}