diff --git a/src/main/java/net/silentclient/client/gui/hud/Watermark.java b/src/main/java/net/silentclient/client/gui/hud/Watermark.java index 86c30e2..372da9a 100644 --- a/src/main/java/net/silentclient/client/gui/hud/Watermark.java +++ b/src/main/java/net/silentclient/client/gui/hud/Watermark.java @@ -62,7 +62,7 @@ public class Watermark { y = 3; break; } - + Client.getInstance().getSilentFontRenderer().drawString(Client.getInstance().getFullVersion(), x, y + (21 / 2) - 5 + 3, 10, SilentFontRenderer.FontType.TITLE); } 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 268f2c6..2bf8267 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 @@ -216,7 +216,10 @@ public class ClickGUI extends SilentScreen { RenderUtil.drawImage(new ResourceLocation("silentclient/logos/logo.png"), x + 5, y + 5, 77, 15); if(selectedCategory == ModCategory.PLUS) { - PremiumGui.drawScreen(x, y, width, height, mouseX, mouseY, partialTicks, nametagMessageInput); + MouseCursorHandler.CursorType premiumCursor = PremiumGui.drawScreen(x, y, width, height, mouseX, mouseY, partialTicks, nametagMessageInput); + if(premiumCursor != null) { + cursorType = premiumCursor; + } } super.drawScreen(mouseX, mouseY, partialTicks); diff --git a/src/main/java/net/silentclient/client/premium/PremiumGui.java b/src/main/java/net/silentclient/client/premium/PremiumGui.java index abb8f35..2a2802e 100644 --- a/src/main/java/net/silentclient/client/premium/PremiumGui.java +++ b/src/main/java/net/silentclient/client/premium/PremiumGui.java @@ -32,35 +32,60 @@ import java.net.URI; import java.util.ArrayList; public class PremiumGui { - public static void drawScreen(int x, int y, int width, int height, int mouseX, int mouseY, float partialTicks, Input input) { + public static MouseCursorHandler.CursorType drawScreen(int x, int y, int width, int height, int mouseX, int mouseY, float partialTicks, Input input) { + MouseCursorHandler.CursorType cursorType = null; + if(!Client.getInstance().getAccount().isPlus()) { RenderUtil.drawImage(new ResourceLocation("silentclient/premium/promo.png"), x + 95, y + 40, width - 100, (int) ((width - 100) / 1.777777777777778)); StaticButton.render(x + 132, y + 148, 65, 12, "BUY PREMIUM"); StaticButton.render(x + 272, y + 148, 65, 12, "BUY PREMIUM+"); - return; + if(StaticButton.isHovered(mouseX, mouseY, x + 132, y + 148, 65, 12) || StaticButton.isHovered(mouseX, mouseY, x + 272, y + 148, 65, 12)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + return cursorType; } int settingY = y + 25; int days = Client.getInstance().getAccount().getPlusExpiration(); Client.getInstance().getSilentFontRenderer().drawString(days != -1 ? days + " days left" : "Unknown Time Remaining", x + width - (Client.getInstance().getSilentFontRenderer().getStringWidth(days != -1 ? days + " days left" : "Unknown Time Remaining", 10, SilentFontRenderer.FontType.TITLE)) - 8, y + 8, 10, SilentFontRenderer.FontType.TITLE); ColorPicker.render(x, settingY, width, "Chroma Bandana Color", Client.getInstance().getAccount().getBandanaColor() == 50 ? ColorUtils.getChromaColor(0, 0, 1).getRGB() : Client.getInstance().getAccount().getBandanaColor()); + if(ColorPicker.isHovered(mouseX, mouseY, x, settingY, width)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } settingY += 15; Client.getInstance().getSilentFontRenderer().drawString("Custom Capes", x + 100, settingY + ((9 / 2) - (12 / 2)), 12, SilentFontRenderer.FontType.TITLE); StaticButton.render(x + 310, settingY, 65, 12, Client.getInstance().getAccount().isPremiumPlus() ? "OPEN MENU" : "BUY PREMIUM+"); - settingY += 15; + if(StaticButton.isHovered(mouseX, mouseY, x + 310, settingY, 65, 12)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + settingY += 15; if(Client.getInstance().getAccount().isPremiumPlus()) { ColorUtils.setColor(new Color(255, 255, 255, 127).getRGB()); Client.getInstance().getSilentFontRenderer().drawString("Nametag Message Settings:", x + 100, settingY + ((9 / 2) - (12 / 2)), 12, SilentFontRenderer.FontType.TITLE); settingY += 15; Checkbox.render(mouseX, mouseY, x + 100, settingY - 1, "Show Nametag Message", Client.getInstance().getAccount().showNametagMessage()); - settingY += 15; + if(Checkbox.isHovered(mouseX, mouseY, x + 100, settingY - 1)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + settingY += 15; Client.getInstance().getSilentFontRenderer().drawString("Nametag Message:", x + 100, settingY + (1), 12, SilentFontRenderer.FontType.TITLE); input.render(mouseX, mouseY, x + 100 + ((190 * 2) - 108) / 2, settingY, ((190 * 2) - 108) / 2, true); - settingY += 20; + if(input.isHovered()) { + cursorType = MouseCursorHandler.CursorType.EDIT_TEXT; + } + settingY += 20; StaticButton.render(x + 322, settingY, 50, 12, "Save"); + if(StaticButton.isHovered(mouseX, mouseY, x + 322, settingY, 50, 12)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } } else { Client.getInstance().getSilentFontRenderer().drawString("Nametag Message Settings:", x + 100, settingY + ((9 / 2) - (12 / 2)), 12, SilentFontRenderer.FontType.TITLE); StaticButton.render(x + 310, settingY, 65, 12, "BUY PREMIUM+"); - } + if(StaticButton.isHovered(mouseX, mouseY, x + 310, settingY, 65, 12)) { + cursorType = MouseCursorHandler.CursorType.POINTER; + } + } + + return cursorType; } public static void mouseClicked(int x, int y, int width, int height, int mouseX, int mouseY, int mouseButton, GuiScreen instance, Input input) {