Fix saving friends and safer management

Author: Avanatiker

common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

@@ -29,7 +29,7 @@ import com.lambda.util.extension.CommandBuilder
 object ConfigCommand : LambdaCommand(
     name = "config",
     aliases = setOf("cfg"),
-    usage = "config <save|load>",
+    usage = "config <save | load>",
     description = "Save or load the configuration files"
 ) {
     override fun CommandBuilder.create() {

common/src/main/kotlin/com/lambda/command/commands/FriendCommand.kt

@@ -40,7 +40,7 @@ import java.awt.Color
 
 object FriendCommand : LambdaCommand(
     name = "friend",
-    usage = "friend [add/remove] [name]",
+    usage = "friend <add | remove> <name>",
     description = "Add or remove a friend"
 ) {
     override fun CommandBuilder.create() {
@@ -80,7 +80,7 @@ object FriendCommand : LambdaCommand(
                         ?.firstOrNull {
                             it.profile.name == name &&
                             it.profile != mc.gameProfile
-                        } ?: return@executeWithResult failure("Could not find the player in the server")
+                        } ?: return@executeWithResult failure("Could not find the player on the server")
 
                     FriendManager.add(id.profile)
 
@@ -110,7 +110,7 @@ object FriendCommand : LambdaCommand(
 
                 executeWithResult {
                     val name = player().value()
-                    val profile = FriendManager.get(name)
+                    val profile = FriendManager.gameProfile(name)
                         ?: return@executeWithResult failure("This player is not in your friend list")
 
                     FriendManager.remove(profile)

common/src/main/kotlin/com/lambda/command/commands/ReplayCommand.kt

@@ -33,7 +33,7 @@ import com.lambda.util.extension.CommandBuilder
 
 object ReplayCommand : LambdaCommand(
     name = "replay",
-    usage = "replay <play|load|save|prune>",
+    usage = "replay <play | load | save | prune>",
     description = "Play, load, save, or prune a replay"
 ) {
     override fun CommandBuilder.create() {

common/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt

@@ -32,7 +32,7 @@ import com.lambda.util.extension.CommandBuilder
 
 object TransferCommand : LambdaCommand(
     name = "transfer",
-    usage = "transfer <move|cancel|undo> <item> <amount> <to>",
+    usage = "transfer <move | cancel | undo> <item> <amount> <to>",
     description = "Transfer items from anywhere to anywhere",
 ) {
     private var lastTransfer: TransferResult.Transfer? = null

common/src/main/kotlin/com/lambda/friend/FriendManager.kt

@@ -26,14 +26,14 @@ import java.util.*
 
 object FriendManager : Configurable(FriendConfig), Loadable {
     override val name = "friends"
-    val friends by setting("friends", listOf<GameProfile>(), hackDelegates = true)
+    val friends by setting("friends", setOf<GameProfile>())
 
-    fun add(profile: GameProfile) { if (!contains(profile)) friends.add(profile) }
+    fun add(profile: GameProfile) = friends.add(profile)
 
-    fun remove(profile: GameProfile) = friends.remove(profile) // FixMe: For some reasons you can't remove friends
+    fun remove(profile: GameProfile): Boolean = friends.remove(profile)
 
-    fun get(name: String) = friends.firstOrNull { it.name == name }
-    fun get(uuid: UUID) = friends.firstOrNull { it.id == uuid }
+    fun gameProfile(name: String) = friends.firstOrNull { it.name == name }
+    fun gameProfile(uuid: UUID) = friends.firstOrNull { it.id == uuid }
 
     fun contains(profile: GameProfile) = friends.contains(profile)
     fun contains(name: String) = friends.any { it.name == name }

common/src/main/kotlin/com/lambda/module/modules/player/ClickFriend.kt

@@ -44,7 +44,7 @@ object ClickFriend : Module(
     description = "Add or remove friends with a single click",
     defaultTags = setOf(ModuleTag.PLAYER)
 ) {
-    private val friendButton by setting("Friend Button", Mouse.Button.Right, description = "Button to press to friend a player")
+    private val friendButton by setting("Friend Button", Mouse.Button.Middle, description = "Button to press to befriend a player")
     private val friendAction by setting("Action", Mouse.Action.Release, description = "What mouse action should add or remove the player")
     private val comboUnfriend by setting("Combo Unfriend", false, description = "Press a key and right click a player to unfriend")
     private val modUnfriend by setting("Combo Key", MouseMod.Shift, description = "The key to press to activate the unfriend combo") { comboUnfriend }
@@ -59,30 +59,23 @@ object ClickFriend : Module(
             val target = mc.crosshairTarget?.entityResult?.entity as? OtherClientPlayerEntity
                 ?: return@listener
 
-            if ((modUnfriend.flagsPresent(it.modifiers) || !comboUnfriend) && target.isFriend) {
-                target.unfriend()
-                info(buildText {
-                    color(Color.RED) {
-                        literal("Removed ")
-                        color(Color.CYAN) {
+            if (modUnfriend.flagsPresent(it.modifiers) || !comboUnfriend) {
+                when {
+                    target.isFriend && target.unfriend() -> {
+                        this@ClickFriend.info(buildText {
+                            literal(Color.RED, "Removed ")
                             text(target.name)
-                            color(Color.WHITE) { literal(" from your friend list") }
-                        }
+                            literal(Color.WHITE, " from your friend list")
+                        })
                     }
-                })
-            }
-
-            if (!modUnfriend.flagsPresent(it.modifiers) && !target.isFriend) {
-                target.befriend()
-                info(buildText {
-                    color(Color.GREEN) {
-                        literal("Added ")
-                        color(Color.CYAN) {
+                    !target.isFriend && target.befriend() -> {
+                        this@ClickFriend.info(buildText {
+                            literal(Color.GREEN, "Added ")
                             text(target.name)
-                            color(Color.WHITE) { literal(" to your friend list") }
-                        }
+                            literal(Color.WHITE, " to your friend list")
+                        })
                     }
-                })
+                }
             }
         }
     }

common/src/main/kotlin/com/lambda/util/text/TextDsl.kt

@@ -113,6 +113,19 @@ fun TextBuilder.literal(value: String) {
     styleAndAppend(Text.literal(value))
 }
 
+/**
+ * Adds a literal text.
+ *
+ * @param value The text.
+ * @see StyleBuilder for action
+ */
+@TextDsl
+fun TextBuilder.literal(color: Color, value: String) {
+    color(color) {
+        literal(value)
+    }
+}
+
 /**
  * Adds a mutable key bind text.
  *