From 11e6ff9506b8233c31499ef247b0caa23ee4e963 Mon Sep 17 00:00:00 2001 From: kirillsaint Date: Tue, 4 Jul 2023 12:25:39 +0600 Subject: [PATCH] Fixed Bug #1125523465592635515 --- .../java/net/silentclient/client/gui/clickgui/ClickGUI.java | 4 ++-- .../net/silentclient/client/gui/font/SilentFontRenderer.java | 2 +- .../silentclient/client/gui/friends/FriendsListOverlay.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/silentclient/client/gui/clickgui/ClickGUI.java b/src/main/java/net/silentclient/client/gui/clickgui/ClickGUI.java index 6223a51..1c824ae 100644 --- a/src/main/java/net/silentclient/client/gui/clickgui/ClickGUI.java +++ b/src/main/java/net/silentclient/client/gui/clickgui/ClickGUI.java @@ -176,7 +176,7 @@ public class ClickGUI extends SilentScreen { RoundedUtils.drawRoundedOutline(x + 100 + (column == 1 ? 0 : 140), y + modOffsetY - scrollAnimation.getValue(), x + 100 + (column == 1 ? 0 : 140) + 135, y + modOffsetY - scrollAnimation.getValue() + 28, 10, 2, new Color(32, 252, 3).getRGB()); RenderUtil.drawImage(new ResourceLocation("silentclient/transparent.png"), x + 90 + (column == 1 ? 0 : 130) + (column == 1 ? 125 : 135), y + modOffsetY + 7 - scrollAnimation.getValue(), 15, 15, false); ColorUtils.setColor(new Color(255, 255, 255).getRGB()); - Client.getInstance().getSilentFontRenderer().drawString(Client.getInstance().configManager.configFile.getName().replace(".txt", ""), x + 110 + (column == 1 ? 0 : 140), y + modOffsetY + 7 - (int) scrollAnimation.getValue(), 14, SilentFontRenderer.FontType.TITLE); + Client.getInstance().getSilentFontRenderer().drawString(Client.getInstance().configManager.configFile.getName().replace(".txt", ""), x + 110 + (column == 1 ? 0 : 140), y + modOffsetY + 7 - (int) scrollAnimation.getValue(), 14, SilentFontRenderer.FontType.TITLE, 45); modOffsetY+=column == 1 ? 0 : 35; this.scrollHeight += column == 2 ? 28 : 0; @@ -188,7 +188,7 @@ public class ClickGUI extends SilentScreen { RoundedUtils.drawRoundedOutline(x + 100 + (column == 1 ? 0 : 140), y + modOffsetY - scrollAnimation.getValue(), x + 100 + (column == 1 ? 0 : 140) + 135, y + modOffsetY - scrollAnimation.getValue() + 28, 10, 2, new Color(252, 3, 3).getRGB()); RenderUtil.drawImage(new ResourceLocation("silentclient/icons/trash-icon.png"), x + 90 + (column == 1 ? 0 : 130) + (column == 1 ? 125 : 135), y + modOffsetY + 7 - scrollAnimation.getValue(), 15, 15, false); ColorUtils.setColor(new Color(255, 255, 255).getRGB()); - Client.getInstance().getSilentFontRenderer().drawString(config.replace(".txt", ""), x + 110 + (column == 1 ? 0 : 140), y + modOffsetY + 7 - (int) scrollAnimation.getValue(), 14, SilentFontRenderer.FontType.TITLE); + Client.getInstance().getSilentFontRenderer().drawString(config.replace(".txt", ""), x + 110 + (column == 1 ? 0 : 140), y + modOffsetY + 7 - (int) scrollAnimation.getValue(), 14, SilentFontRenderer.FontType.TITLE, 45); modOffsetY+=column == 1 ? 0 : 35; this.scrollHeight += column == 2 ? 28 : 0; diff --git a/src/main/java/net/silentclient/client/gui/font/SilentFontRenderer.java b/src/main/java/net/silentclient/client/gui/font/SilentFontRenderer.java index dcde16e..25793d6 100644 --- a/src/main/java/net/silentclient/client/gui/font/SilentFontRenderer.java +++ b/src/main/java/net/silentclient/client/gui/font/SilentFontRenderer.java @@ -310,7 +310,7 @@ public class SilentFontRenderer { int oneSymbolWidth = this.getStringWidth("a", fontHeight, fontType); int symbolsCount = difference / oneSymbolWidth; - string = string.substring(0, string.length() - symbolsCount - 3); + string = string.substring(0, string.length() - symbolsCount - 3).trim(); string += "..."; } this.renderString(x, y, string, 128 / fontHeight, fontType, true); diff --git a/src/main/java/net/silentclient/client/gui/friends/FriendsListOverlay.java b/src/main/java/net/silentclient/client/gui/friends/FriendsListOverlay.java index f0cf9a6..5251d90 100644 --- a/src/main/java/net/silentclient/client/gui/friends/FriendsListOverlay.java +++ b/src/main/java/net/silentclient/client/gui/friends/FriendsListOverlay.java @@ -62,7 +62,7 @@ public class FriendsListOverlay extends GuiScreen { ColorUtils.setColor(new Color(9, 165, 51).getRGB()); font.drawString(Client.getInstance().getAccount().original_username, 23, 5 - 2, 12, SilentFontRenderer.FontType.TITLE); ColorUtils.setColor(new Color(255, 255, 255, 127).getRGB()); - font.drawString(mc.getCurrentServerData() == null ? "Online" : "Playing on " + mc.getCurrentServerData().serverIP, 23, 5 + 8, 10, SilentFontRenderer.FontType.TITLE, 94); + font.drawString(mc.getCurrentServerData() == null ? "Online" : "Playing on " + mc.getCurrentServerData().serverIP, 23, 5 + 8, 10, SilentFontRenderer.FontType.TITLE, 90); super.drawScreen(mouseX, mouseY, partialTicks); int friendY = 46 - (int) scrollAnimation.getValue(); GL11.glPushMatrix();