From fbaaaed5203b6087331c120972d2f25e3fc5008c Mon Sep 17 00:00:00 2001
From: scorbett123 <50634068+scorbett123@users.noreply.github.com>
Date: Sat, 16 Jan 2021 17:46:27 +0000
Subject: [PATCH] [enhancement] Add custom message to VisualRange. (#1857)

* [enhancement] Add custom message to visual range.

* Do requested changes

* Cleaned up code

Co-authored-by: Xiaro <62033805+Xiaro@users.noreply.github.com>
---
 .../kami/module/modules/combat/VisualRange.kt | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/combat/VisualRange.kt b/src/main/java/me/zeroeightsix/kami/module/modules/combat/VisualRange.kt
index 421db6fcc..d44ea8454 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/combat/VisualRange.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/combat/VisualRange.kt
@@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.init.SoundEvents
 import net.minecraft.util.text.TextFormatting
 import net.minecraftforge.fml.common.gameevent.TickEvent
+import java.util.*
 
 internal object VisualRange : Module(
     name = "VisualRange",
@@ -23,11 +24,15 @@ internal object VisualRange : Module(
     category = Category.COMBAT,
     alwaysListening = true
 ) {
-    private val playSound = setting("PlaySound", false)
-    private val leaving = setting("CountLeaving", false)
-    private val friends = setting("Friends", true)
-    private val uwuAura = setting("UwUAura", false)
-    private val logToFile = setting("LogToFile", false)
+    private const val NAME_FORMAT = "\$NAME"
+
+    private val playSound by setting("PlaySound", false)
+    private val leaving by setting("CountLeaving", false)
+    private val friends by setting("Friends", true)
+    private val uwuAura by setting("UwUAura", false)
+    private val logToFile by setting("LogToFile", false)
+    private val enterMessage by setting("EnterMessage", "$NAME_FORMAT spotted!")
+    private val leaveMessage by setting("LeaveMessage", "$NAME_FORMAT left!", { leaving })
 
     private val playerSet = LinkedHashSet<EntityPlayer>()
     private val timer = TickTimer(TimeUnit.SECONDS)
@@ -40,7 +45,7 @@ internal object VisualRange : Module(
             for (entityPlayer in loadedPlayerSet) {
                 if (entityPlayer == mc.renderViewEntity || entityPlayer == player) continue // Self/Freecam check
                 if (entityPlayer.entityId < 0) continue // Fake entity check
-                if (!friends.value && FriendManager.isFriend(entityPlayer.name)) continue // Friend check
+                if (!friends && FriendManager.isFriend(entityPlayer.name)) continue // Friend check
 
                 if (playerSet.add(entityPlayer) && isEnabled) {
                     onEnter(entityPlayer)
@@ -59,25 +64,30 @@ internal object VisualRange : Module(
     }
 
     private fun onEnter(player: EntityPlayer) {
-        sendNotification("${getColor(player) format player.name} spotted!")
-        if (logToFile.value) WaypointManager.add(player.flooredPosition, "${player.name} spotted!")
-        if (uwuAura.value) sendServerMessage("/w ${player.name} hi uwu")
+        val message = enterMessage.replaceName(player)
+
+        sendNotification(message)
+        if (logToFile) WaypointManager.add(player.flooredPosition, message)
+        if (uwuAura) sendServerMessage("/w ${player.name} hi uwu")
     }
 
     private fun onLeave(player: EntityPlayer) {
-        if (leaving.value) {
-            sendNotification("${getColor(player) format player.name} left!")
-            if (logToFile.value) WaypointManager.add(player.flooredPosition, "${player.name} left!")
-            if (uwuAura.value) sendServerMessage("/w ${player.name} bye uwu")
-        }
+        if (!leaving) return
+        val message = leaveMessage.replaceName(player)
+
+        sendNotification(message)
+        if (logToFile) WaypointManager.add(player.flooredPosition, message)
+        if (uwuAura) sendServerMessage("/w ${player.name} bye uwu")
     }
 
+    private fun String.replaceName(player: EntityPlayer) = replace(NAME_FORMAT, getColor(player) format player.name)
+
     private fun getColor(player: EntityPlayer) =
         if (FriendManager.isFriend(player.name)) TextFormatting.GREEN
         else TextFormatting.RED
 
     private fun sendNotification(message: String) {
-        if (playSound.value) mc.soundHandler.playSound(PositionedSoundRecord.getRecord(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 1.0f, 1.0f))
+        if (playSound) mc.soundHandler.playSound(PositionedSoundRecord.getRecord(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 1.0f, 1.0f))
         MessageSendHelper.sendChatMessage(message)
     }
 }
\ No newline at end of file