From 209cd1a6dd651e255a74b6d049c828b293bde621 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Sun, 30 Mar 2025 16:30:12 +0700
Subject: [PATCH] refactor: improve vanish selfcare & BotVisibilityCommand

---
 build-number.txt                              |  2 +-
 .../commands/BotVisibilityCommand.java        | 24 +++++++++----------
 .../chomens_bot/plugins/SelfCarePlugin.java   |  6 ++---
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index f541bbdc..8d5106d1 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-2258
\ No newline at end of file
+2263
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java
index 0a491c0a..30518f14 100644
--- a/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java
+++ b/src/main/java/me/chayapak1/chomens_bot/commands/BotVisibilityCommand.java
@@ -30,13 +30,13 @@ public class BotVisibilityCommand extends Command {
         final String action = context.getString(false, false, false);
 
         if (action.isEmpty()) {
-            final boolean visibility = bot.selfCare.visibility;
-            bot.selfCare.visibility = !visibility;
+            final boolean visibility = bot.selfCare.visible;
+            bot.selfCare.visible = !visibility;
+
+            final NamedTextColor greenOrGold = bot.selfCare.visible ? NamedTextColor.GREEN : NamedTextColor.GOLD;
+
+            final String visibleOrInvisible = bot.selfCare.visible ? "visible" : "invisible";
 
-            final NamedTextColor greenOrGold = bot.selfCare.visibility ? NamedTextColor.GREEN : NamedTextColor.GOLD;
-            final String visibleOrInvisible = bot.selfCare.visibility ? "visible" : "invisible";
-            final String disableOrEnable = bot.selfCare.visibility ? "disable" : "enable";
-            bot.core.run("/essentials:vanish " + bot.profile.getName() + " " + disableOrEnable);
             return Component.empty()
                     .append(Component.text("The bot's visibility is now "))
                     .append(Component.text(visibleOrInvisible).color(greenOrGold))
@@ -44,24 +44,22 @@ public class BotVisibilityCommand extends Command {
         } else {
             switch (action) {
                 case "on", "true" -> {
-                    bot.selfCare.visibility = true;
-                    bot.core.run("/essentials:vanish " + bot.profile.getName() + " disable");
+                    bot.selfCare.visible = true;
+
                     return Component.empty()
                             .append(Component.text("The bot's visibility is now "))
                             .append(Component.text("visible").color(NamedTextColor.GREEN))
                             .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
                 }
                 case "off", "false" -> {
-                    bot.selfCare.visibility = false;
-                    bot.core.run("/essentials:vanish " + bot.profile.getName() + " enable");
+                    bot.selfCare.visible = false;
+
                     return Component.empty()
                             .append(Component.text("The bot's visibility is now "))
                             .append(Component.text("invisible").color(NamedTextColor.GOLD))
                             .color(ColorUtilities.getColorByString(bot.config.colorPalette.defaultColor));
                 }
-                default -> {
-                    throw new CommandException(Component.text("Invalid action"));
-                }
+                default -> throw new CommandException(Component.text("Invalid action"));
             }
         }
     }
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
index 6faed114..1be835c9 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/SelfCarePlugin.java
@@ -31,7 +31,7 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
 
     private ScheduledFuture<?> checkTask;
 
-    public boolean visibility = false;
+    public boolean visible = false;
 
     private int entityId;
     public GameMode gamemode;
@@ -126,8 +126,8 @@ public class SelfCarePlugin extends Bot.Listener implements ChatPlugin.Listener,
                     bot.username + " " :
                     "";
 
-            if (selfCares.vanish && !vanish && !visibility && !creayun) {
-                runEssentialsCommand("essentials:vanish " + usernameOrBlank + "enable");
+            if (selfCares.vanish && visible == vanish && !creayun) {
+                runEssentialsCommand("essentials:vanish " + usernameOrBlank + (visible ? "disable" : "enable"));
             } else if (selfCares.nickname && !nickname) {
                 runEssentialsCommand("essentials:nickname " + usernameOrBlank + "off");
             } else if (selfCares.socialspy && !socialspy && !creayun) {