From 8c8a0b753cae343a0b405f62c5d0d5750d13f5ad Mon Sep 17 00:00:00 2001 From: Sorzon <64833512+Sorzon@users.noreply.github.com> Date: Mon, 11 May 2020 19:28:55 +0200 Subject: [PATCH 1/3] The friends tab will now always have a minimum width, not just when minimized. --- src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java index 0a5144fd9..cdc7afd6f 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java @@ -280,10 +280,9 @@ public class KamiGUI extends GUI { Frame finalFrame = frame; friends.addTickListener(() -> { friends.setText(""); + friends.setWidth(50); if (!finalFrame.isMinimized()) { Friends.friends.getValue().forEach(friend -> friends.addLine(friend.getUsername())); - } else { - friends.setWidth(50); } }); From 88fe1a8333ca9facb2a9e2a9099e14959182dc4e Mon Sep 17 00:00:00 2001 From: Sorzon <64833512+Sorzon@users.noreply.github.com> Date: Mon, 11 May 2020 19:29:33 +0200 Subject: [PATCH 2/3] Fixed only the last friend in your friends list being highlighted in chat. --- .../kami/module/modules/chat/FriendHighlight.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt index 23998351d..4d6176633 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt +++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt @@ -36,9 +36,9 @@ class FriendHighlight : Module() { @EventHandler var listener = Listener(EventHook { event: ClientChatReceivedEvent -> if (mc.player == null || noFriendsCheck()) return@EventHook - val converted = arrayOf("") - Friends.friends.value.forEach(Consumer { friend: Friend -> converted[0] = event.message.formattedText.replace("(?i)" + friend.username.toRegex(), colour() + bold() + friend.username + TextFormatting.RESET.toString()) }) - val message = TextComponentString(converted[0]) + var converted = event.message.formattedText + Friends.friends.value.forEach(Consumer { friend: Friend -> converted = converted.replace(friend.username.toRegex(), colour() + bold() + friend.username + TextFormatting.RESET.toString()) }) + val message = TextComponentString(converted) event.message = message }) From 323a163bbef6ff869bab563f1467aa6a4875b767 Mon Sep 17 00:00:00 2001 From: Bella Date: Fri, 15 May 2020 14:34:13 -0400 Subject: [PATCH 3/3] Made FriendHighLight case insensitive --- .../me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt index 4d6176633..40c95bbe4 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt +++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/FriendHighlight.kt @@ -37,7 +37,7 @@ class FriendHighlight : Module() { var listener = Listener(EventHook { event: ClientChatReceivedEvent -> if (mc.player == null || noFriendsCheck()) return@EventHook var converted = event.message.formattedText - Friends.friends.value.forEach(Consumer { friend: Friend -> converted = converted.replace(friend.username.toRegex(), colour() + bold() + friend.username + TextFormatting.RESET.toString()) }) + Friends.friends.value.forEach(Consumer { friend: Friend -> converted = converted.replace(friend.username.toRegex(RegexOption.IGNORE_CASE), colour() + bold() + friend.username + TextFormatting.RESET.toString()) }) val message = TextComponentString(converted) event.message = message })