Linux support

Utility-Client · Jan 19, 2022 · 927dd0d · 927dd0d
2 parents dac176c + 0d934f2
commit 927dd0d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.0.23.Final</version>
+            <version>4.0.56.Final</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
@@ -825,8 +825,6 @@ else if (guiScreenIn == null && this.thePlayer.getHealth() <= 0.0F)
             this.mcSoundHandler.resumeSounds();
             this.setIngameFocus();
         }
-
-        new Thread(System::gc).start(); // UC2: Garbage collection on screen change
     }
 
     /**

diff --git a/src/main/java/net/minecraft/network/PacketBuffer.java b/src/main/java/net/minecraft/network/PacketBuffer.java
@@ -285,14 +285,22 @@ else if (i < 0)
         }
         else
         {
-            String s = new String(this.readBytes(i).array(), Charsets.UTF_8);
+            String s;
+            ByteBuf x = this.readBytes(i);
+
+            byte[] bytes = new byte[x.readableBytes()];
+            x.duplicate().readBytes(bytes);
+
+            s = new String(bytes, Charsets.UTF_8);
 
             if (s.length() > maxLength)
             {
+                x.release();
                 throw new DecoderException("The received string length is longer than maximum allowed (" + i + " > " + maxLength + ")");
             }
             else
             {
+                x.release();
                 return s;
             }
         }

diff --git a/src/main/java/org/utilityclient/UtilityClient.java b/src/main/java/org/utilityclient/UtilityClient.java
@@ -21,19 +21,16 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-import static org.utilityclient.discord.DiscordRP.core;
-
 public class UtilityClient extends Thread {
     public static final CPSThread CPS_THREAD_INSTANCE = new CPSThread();
     public static final DiscordRP DISCORD_INSTANCE = new DiscordRP();
     private static final String CLIENT_NAME = "Utility Client";
-    private static final String CLIENT_VERSION = "2.13-DEV";
+    private static final String CLIENT_VERSION = "2.13-PRE-3";
     private static final UtilityClient CLIENT_INSTANCE = new UtilityClient();
     public static float fovModifier = 1.0f;
     public static ArrayList<KeyBinding> keyBinds = new ArrayList<>();
     public static Theme CURRENT_THEME = Theme.RED;
     public static boolean renderOverlay = true;
-    public static boolean isSprinting = false;
     public static boolean isFulbrightEnabled = false;
     public static boolean streamerMode = false;
 
@@ -74,7 +71,7 @@ public void run() {
         addKeyBind(I18n.format("uc.keybinding.fulbright"), Config.getInteger(ConfigEntry.HOTKEY_FULBRIGHT), false);
         addKeyBind(I18n.format("uc.keybinding.overlay"), Config.getInteger(ConfigEntry.HOTKEY_OVERLAY), false);
         addKeyBind(I18n.format("uc.keybinding.copyCoords"), 66, false);
-        addKeyBind("Debug hotkey", 67, false);
+        //addKeyBind("Debug hotkey", 67, false);
 
         try {
             CrosshairManager.run();
@@ -123,9 +120,9 @@ public void loop() {
                 clipboard.setContents(stringSelection, null);
             }
 
-            if(keyBinds.get(4).isPressed()) {
-                Minecraft.getMinecraft().ingameGUI.setRecordPlaying("Running temporary test code.", false);
-            }
+            //if(keyBinds.get(4).isPressed()) {
+            //    Minecraft.getMinecraft().ingameGUI.setRecordPlaying("Running temporary test code.", false);
+            //}
         }
         MacroManager.loop();
     }

diff --git a/src/main/java/org/utilityclient/overlay/modules/PingModule.java b/src/main/java/org/utilityclient/overlay/modules/PingModule.java
@@ -10,7 +10,11 @@ public String getName() {
 
     @Override
     public String getValue() {
-        return mc().thePlayer.sendQueue.getPlayerInfo(mc().thePlayer.getUniqueID()).getResponseTime() + "ms";
+        try {
+            return mc().thePlayer.sendQueue.getPlayerInfo(mc().thePlayer.getUniqueID()).getResponseTime() + "ms";
+        } catch (Exception ignored) {
+            return "Error";
+        }
     }
 
     @Override