From f3a00cb1ccde0592583988a43545660ae8010b67 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Wed, 30 Aug 2023 17:56:41 +0600 Subject: [PATCH] Cursor Reset Fix --- .../silentclient/client/gui/lite/clickgui/ClickGUI.java | 4 +++- .../client/gui/lite/clickgui/GuiColorPicker.java | 7 ++++--- .../silentclient/client/gui/lite/clickgui/ModSettings.java | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/silentclient/client/gui/lite/clickgui/ClickGUI.java b/src/main/java/net/silentclient/client/gui/lite/clickgui/ClickGUI.java index 2bf8267..c0f9515 100644 --- a/src/main/java/net/silentclient/client/gui/lite/clickgui/ClickGUI.java +++ b/src/main/java/net/silentclient/client/gui/lite/clickgui/ClickGUI.java @@ -236,11 +236,13 @@ public class ClickGUI extends SilentScreen { mc.displayGuiScreen(null); } loaded = false; + Client.getInstance().getMouseCursorHandler().disableCursor(); + } else { + Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); } if(introAnimation.isDone() && !close) { loaded = true; } - Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); GlUtils.stopScale(); GlStateManager.popMatrix(); diff --git a/src/main/java/net/silentclient/client/gui/lite/clickgui/GuiColorPicker.java b/src/main/java/net/silentclient/client/gui/lite/clickgui/GuiColorPicker.java index c7e8285..d5c117b 100644 --- a/src/main/java/net/silentclient/client/gui/lite/clickgui/GuiColorPicker.java +++ b/src/main/java/net/silentclient/client/gui/lite/clickgui/GuiColorPicker.java @@ -146,8 +146,6 @@ public class GuiColorPicker extends SilentScreen { cursorType = MouseCursorHandler.CursorType.POINTER; } - Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); - GL11.glPopMatrix(); RenderUtil.drawImage(new ResourceLocation("silentclient/logos/logo.png"), x + 5, y + 5, 77, 15); @@ -161,7 +159,10 @@ public class GuiColorPicker extends SilentScreen { if(ClickGUI.introAnimation.isDone(Direction.BACKWARDS)) { mc.displayGuiScreen(null); } - } + Client.getInstance().getMouseCursorHandler().disableCursor(); + } else { + Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); + } GlUtils.stopScale(); GlStateManager.popMatrix(); diff --git a/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java b/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java index cb267af..499f585 100644 --- a/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java +++ b/src/main/java/net/silentclient/client/gui/lite/clickgui/ModSettings.java @@ -224,7 +224,6 @@ public class ModSettings extends SilentScreen { settingY += settingHeight; } - Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); GL11.glDisable(GL11.GL_SCISSOR_TEST); GL11.glPopMatrix(); @@ -275,7 +274,10 @@ public class ModSettings extends SilentScreen { if(ClickGUI.introAnimation.isDone(Direction.BACKWARDS)) { mc.displayGuiScreen(null); } - } + Client.getInstance().getMouseCursorHandler().disableCursor(); + } else { + Client.getInstance().getMouseCursorHandler().enableCursor(cursorType); + } GlUtils.stopScale(); GlStateManager.popMatrix();