Player: add hiding with invisibility effect

Flectone · Dec 21, 2023 · 288beb5 · 288beb5
1 parent eb52845
commit 288beb5
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 6 deletions.
diff --git a/src/main/java/net/flectone/chat/component/FComponent.java b/src/main/java/net/flectone/chat/component/FComponent.java
@@ -14,11 +14,12 @@
 
 public class FComponent {
 
-    private final BaseComponent component;
+    private BaseComponent component;
     protected final FConfiguration locale;
     protected final FConfiguration config;
     @Getter
     private HoverEvent hoverEvent;
+    private ClickEvent clickEvent;
 
     public FComponent(@Nullable BaseComponent baseComponent) {
         this.component = baseComponent;
@@ -32,6 +33,12 @@ public FComponent(@NotNull String text) {
         this(new TextComponent(fromLegacyText(text)));
     }
 
+    public void set(@NotNull String text) {
+        component = new TextComponent(fromLegacyText(text));
+        component.setClickEvent(clickEvent);
+        component.setHoverEvent(hoverEvent);
+    }
+
     public FComponent() {
         this(new TextComponent());
     }
@@ -63,7 +70,7 @@ public FComponent addHoverText(@NotNull BaseComponent[] baseComponents) {
 
     @NotNull
     public FComponent addOpenURL(@NotNull String url) {
-        component.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url));
+        setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url));
         return this;
     }
 
@@ -75,18 +82,23 @@ public FComponent addHoverItem(@NotNull String itemJson) {
 
     @NotNull
     public FComponent addRunCommand(@NotNull String command) {
-        component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
+        setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
         return this;
     }
 
     @NotNull
     public FComponent addSuggestCommand(@NotNull String command) {
-        component.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command));
+        setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command));
         return this;
     }
 
     public void setHoverEvent(@NotNull HoverEvent hoverEvent) {
         component.setHoverEvent(hoverEvent);
         this.hoverEvent = hoverEvent;
     }
+
+    public void setClickEvent(@NotNull ClickEvent clickEvent) {
+        component.setClickEvent(clickEvent);
+        this.clickEvent = clickEvent;
+    }
 }
diff --git a/src/main/java/net/flectone/chat/component/FPlayerComponent.java b/src/main/java/net/flectone/chat/component/FPlayerComponent.java
@@ -7,6 +7,7 @@
 import net.flectone.chat.util.Pair;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +18,14 @@ public FPlayerComponent(@Nullable CommandSender sender, @Nullable CommandSender
 
         if (!(sender instanceof Player player) || !(recipient instanceof Player recip)) return;
 
+        if (config.getVaultBoolean(player, "player.name.hide-invisible")
+                && player.hasPotionEffect(PotionEffectType.INVISIBILITY)
+                && player.hasPermission("flectonechat.player.name.invisible")) {
+            text = text.replace(player.getName(), locale.getVaultString(player, "player.name.invisible"));
+            set(text);
+            return;
+        }
+
         Pair<String, Pair<String, HoverModule.CommandType>> hoverInfo = null;
 
         FModule fModule = FlectoneChat.getPlugin().getModuleManager().get(HoverModule.class);

diff --git a/src/main/java/net/flectone/chat/util/MessageUtil.java b/src/main/java/net/flectone/chat/util/MessageUtil.java
@@ -10,6 +10,7 @@
 import net.flectone.chat.module.player.name.NameModule;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -90,11 +91,11 @@ public static String formatPlayerString(@Nullable CommandSender commandSender, @
 
         FModule fModule = FlectoneChat.getPlugin().getModuleManager().get(NameModule.class);
         if (fModule instanceof NameModule nameModule) {
-            if (string.contains("<player_name_tab")) {
+            if (string.contains("<player_name_tab>")) {
                 string = string.replace("<player_name_tab>", nameModule.getTab(player));
             }
 
-            if (string.contains("<player_name_real")) {
+            if (string.contains("<player_name_real>")) {
                 string = string.replace("<player_name_real>", nameModule.getReal(player));
             }
 
@@ -111,6 +112,20 @@ public static String formatPlayerString(@Nullable CommandSender commandSender, @
             }
         }
 
+        if (isInvisible(player)) {
+            String invisibleName = FlectoneChat.getPlugin().getFileManager().getLocale().getVaultString(player, "player.name.invisible");
+
+            return string
+                    .replace("<player_prefix>", "")
+                    .replace("<player_suffix>", "")
+                    .replace("<vault_prefix>", "")
+                    .replace("<world_prefix>", "")
+                    .replace("<stream_prefix>", "")
+                    .replace("<player>", invisibleName)
+                    .replace("<vault_suffix>", "")
+                    .replace("<afk_suffix>", "");
+        }
+
         FPlayer fPlayer = FlectoneChat.getPlugin().getPlayerManager().get(player);
 
         return string
@@ -127,4 +142,9 @@ public static String joinArray(@NotNull String[] strings, int start, @NotNull St
                 .collect(Collectors.joining(delimiter));
     }
 
+    public static boolean isInvisible(@NotNull Player player) {
+        return FlectoneChat.getPlugin().getFileManager().getConfig().getVaultBoolean(player, "player.name.hide-invisible")
+                && player.hasPotionEffect(PotionEffectType.INVISIBILITY)
+                && player.hasPermission("flectonechat.player.name.invisible");
+    }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -143,6 +143,8 @@ default:
       real: "<GRADIENT:11b8f0><player></GRADIENT:87cee6>"
       suffix: "<afk_suffix><vault_suffix>"
 
+      hide-invisible: true
+
     name-tag:
       enable: true
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -30,6 +30,8 @@ permissions:
     default: true
   flectonechat.player.hover:
     default: true
+  flectonechat.player.name.invisible:
+    default: true
   flectonechat.player.name.prefix:
     default: true
   flectonechat.player.name.suffix:

diff --git a/src/main/resources/settings/languages/en.yml b/src/main/resources/settings/languages/en.yml
@@ -113,6 +113,8 @@ default:
         message: "#ff4e4e← &&2<player> &&1left the server for the first time"
 
   player:
+    name:
+      invisible: "? Invisible"
     hover:
       message: "&&1Click to write to &&2<player>"
     below-name:

diff --git a/src/main/resources/settings/languages/ru.yml b/src/main/resources/settings/languages/ru.yml
@@ -113,6 +113,8 @@ default:
         message: "#ff4e4e← &&2<player> &&1впервые вышел с сервера"
 
   player:
+    name:
+      invisible: "? Невидимка"
     hover:
       message: "&&1Написать игроку &&2<player>"
     below-name: