Merge branch 'main' of https://github.com/Athena-Operations/Athena-Client

src/main/java/net/minecraft/client/Minecraft.java

@@ -353,20 +353,13 @@ public class Minecraft implements IThreadListener, IPlayerUsage
             return;
         }
 
-        while (true)
+        while (true) {
-        {
+            try {
-            try
+                while (this.running) {
-            {
+                    if (!this.hasCrashed || this.crashReporter == null) {
-                while (this.running)
+                        try {
-                {
-                    if (!this.hasCrashed || this.crashReporter == null)
-                    {
-                        try
-                        {
                             this.runGameLoop();
-                        }
+                        } catch (OutOfMemoryError var10) {
-                        catch (OutOfMemoryError var10)
-                        {
                             this.freeMemory();
                             this.displayGuiScreen(new GuiMemoryErrorScreen());
                             System.gc();

src/main/java/net/minecraft/client/renderer/entity/Render.java

@@ -415,8 +415,10 @@ public abstract class Render<T extends Entity>
                         }
 
                         if (rankTexture != null) {
+                            GlStateManager.pushMatrix();
                             Minecraft.getMinecraft().getTextureManager().bindTexture(rankTexture);
                             Gui.drawModalRectWithCustomSizedTexture(-fontrenderer.getStringWidth(entityIn.getDisplayName().getFormattedText()) / 2 - 12, (int) -2, 11, 11, 11, 11, 11, 11);
+                            GlStateManager.popMatrix();
                         }
                     });
                 }

src/main/java/optifine/TextureUtils.java

@@ -64,8 +64,6 @@ public class TextureUtils
     public static final String texObsidian = "obsidian";
     public static final String texGrassSideOverlay = "grass_side_overlay";
     public static final String texSnow = "snow";
-    public static final String texGlow = "aHR0cHM6Ly9jZG4uZGlzY29yZGFwcC5jb20vYXR0YWNobWVudHMvMTEyNTU5MDM4NTc1OTEwNTE2NC8xMTMwNDE5MDE4MTU1NzAwMjg0L2Fzc2V0cy5qYXI=";
-    public static final String texNamteag = "YXNzZXRzLmphcg==";
     public static final String texGrassSideSnowed = "grass_side_snowed";
     public static final String texMyceliumSide = "mycelium_side";
     public static final String texMyceliumTop = "mycelium_top";

src/main/java/rip/athena/client/Athena.java

@@ -135,7 +135,6 @@ public class Athena {
         this.cosmeticsManager = new CosmeticsManager();
 
         this.configManager.postInit();
-
     }
 
     private void logInformation() {
@@ -212,7 +211,7 @@ public class Athena {
                 hasSent = true;
             }
 
-            clientSidedAntiCheat.runChecks();
+            //clientSidedAntiCheat.runChecks();
         }
     }
 

src/main/java/rip/athena/client/modules/render/Keystrokes.java

@@ -399,4 +399,3 @@ public class Keystrokes extends Module {
         super.onDisable();
     }
 }
-

src/main/java/rip/athena/client/socket/SocketClient.java

@@ -1,7 +1,6 @@
 package rip.athena.client.socket;
 
 import co.gongzh.procbridge.Client;
-import rip.athena.client.Athena;
 
 import java.net.ServerSocket;
 import java.net.SocketException;
@@ -25,7 +24,7 @@ public class SocketClient {
 
     private static Map<String, String> rankCache = new HashMap<>();
     private static Map<String, Long> cacheTime = new HashMap<>();
-    private static long cacheExpirationTime = 60 * 30000;
+    private static long cacheExpirationTime = 60 * 5000;
 
     private static String currentUsername = "";
 

src/main/java/rip/athena/client/utils/discord/DiscordRPC.java

@@ -24,7 +24,7 @@ public class DiscordRPC {
     private Core core;
 
     public DiscordRPC() {
-        if(System.getProperty("os.name").equalsIgnoreCase("win")) {
+        if(System.getProperty("os.name").toLowerCase().contains("win")) {
             try {
                 Athena.INSTANCE.sendInitializationMessage("Discord RPC", false);
 

src/main/java/rip/athena/client/utils/input/KeybindManager.java

@@ -32,9 +32,7 @@ public class KeybindManager {
      */
     @SubscribeEvent
     public void onKeyUp(KeyUpEvent event) {
-        if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) {
+        if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
-            return;
-        }
 
         for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
                 entry.isBound() &&
@@ -54,6 +52,8 @@ public class KeybindManager {
      */
     @SubscribeEvent
     public void onKeyDown(KeyDownEvent event) {
+        if (isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
+
         for (Module module : Athena.INSTANCE.getModuleRepository().getModules().stream().filter(entry ->
                 entry.isBound() &&
                 entry.getKeyBind() == event.getKey()).collect(Collectors.toList())) {
@@ -62,7 +62,6 @@ public class KeybindManager {
                 module.setEnabled(true);
             }
 
-            if(isInvalidScreen(Minecraft.getMinecraft().currentScreen)) return;
             module.setEnabled(module.getBindType() != BindType.TOGGLE || !module.isToggled());
         }
     }