From 294a15797de28b969bdbfda1ee2e11702ae38ca5 Mon Sep 17 00:00:00 2001
From: kirillsaint <kirillsaint@wtfuck.tk>
Date: Sat, 22 Jul 2023 00:12:56 +0600
Subject: [PATCH] mappings fix

---
 src/main/java/net/silentclient/client/Client.java   | 13 +++++++++----
 .../silentclient/client/utils/FontRendererHook.java |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/silentclient/client/Client.java b/src/main/java/net/silentclient/client/Client.java
index 1c9c51c..cf95082 100644
--- a/src/main/java/net/silentclient/client/Client.java
+++ b/src/main/java/net/silentclient/client/Client.java
@@ -12,10 +12,7 @@ import net.silentclient.client.config.ConfigManager;
 import net.silentclient.client.cosmetics.Cosmetics;
 import net.silentclient.client.event.EventManager;
 import net.silentclient.client.event.EventTarget;
-import net.silentclient.client.event.impl.ClientTickEvent;
-import net.silentclient.client.event.impl.ConnectToServerEvent;
-import net.silentclient.client.event.impl.ServerLeaveEvent;
-import net.silentclient.client.event.impl.SingleplayerJoinEvent;
+import net.silentclient.client.event.impl.*;
 import net.silentclient.client.gui.GuiError;
 import net.silentclient.client.gui.font.SilentFontRenderer;
 import net.silentclient.client.gui.lite.GuiNews;
@@ -25,6 +22,7 @@ import net.silentclient.client.gui.modmenu.ModMenu;
 import net.silentclient.client.gui.silentmainmenu.SilentMainMenu;
 import net.silentclient.client.gui.util.BackgroundPanorama;
 import net.silentclient.client.keybinds.KeyBindManager;
+import net.silentclient.client.mixin.accessors.MinecraftAccessor;
 import net.silentclient.client.mixin.ducks.FontRendererExt;
 import net.silentclient.client.mods.ModInstances;
 import net.silentclient.client.mods.SettingsManager;
@@ -470,6 +468,13 @@ public class Client {
         }
     }
 
+    @EventTarget
+    public void onMouseClick(EventClickMouse event) {
+        if(event.getButton() == 0) {
+            ((MinecraftAccessor) Minecraft.getMinecraft()).setLeftClickCounter(0);
+        }
+    }
+
     @EventTarget
     public void onServerConnect(ConnectToServerEvent event) {
         ping = 0;
diff --git a/src/main/java/net/silentclient/client/utils/FontRendererHook.java b/src/main/java/net/silentclient/client/utils/FontRendererHook.java
index d7f6feb..b13674f 100644
--- a/src/main/java/net/silentclient/client/utils/FontRendererHook.java
+++ b/src/main/java/net/silentclient/client/utils/FontRendererHook.java
@@ -159,10 +159,10 @@ public final class FontRendererHook {
 
         GlStateManager.bindTexture(glTextureId);
         GlStateManager.translate(posX, posY, 0F);
-        Field field = GlStateManager.class.getDeclaredField("textureState");
+        Field field = GlStateManager.class.getDeclaredField(ClientUtils.isDevelopment() ? "textureState" : "p");
         field.setAccessible(true);
 
-        Field field2 = GlStateManager.class.getDeclaredField("activeTextureUnit");
+        Field field2 = GlStateManager.class.getDeclaredField(ClientUtils.isDevelopment() ? "activeTextureUnit" : "o");
         field2.setAccessible(true);
 
         final GlStateManager.TextureState[] textureStates = (GlStateManager.TextureState[]) field.get(new GlStateManager());
@@ -178,7 +178,7 @@ public final class FontRendererHook {
             // Call so states in game know the texture was changed.
             // Otherwise, the game won't know the active texture was changed on the GPU
             textureState.textureName = glTextureId;
-            Field colorStateField = GlStateManager.class.getDeclaredField("colorState");
+            Field colorStateField = GlStateManager.class.getDeclaredField(ClientUtils.isDevelopment() ? "colorState" : "t");
             colorStateField.setAccessible(true);
 
             // Save thing as texture, it updated in GL, so we need to update the MC cache of that value