Add action bar alert manager

Author: LucasCdry

src/main/java/net/clementraynaud/skoice/system/ActionBarAlert.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020, 2021, 2022, 2023, 2024 Clément "carlodrift" Raynaud, Lucas "Lucas_Cdry" Cadiry and contributors
+ *
+ * This file is part of Skoice.
+ *
+ * Skoice is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Skoice is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Skoice.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.clementraynaud.skoice.system;
+
+import java.util.Comparator;
+import java.util.Set;
+
+public enum ActionBarAlert {
+
+    CONNECTING(1),
+    DISCONNECTING(1);
+
+    private final int priority;
+    private final String lowerCaseName;
+
+    ActionBarAlert(int priority) {
+        this.priority = priority;
+        this.lowerCaseName = this.name().toLowerCase() + "-alert";
+    }
+
+    private int getPriority() {
+        return this.priority;
+    }
+
+    @Override
+    public String toString() {
+        return this.lowerCaseName;
+    }
+
+    public static ActionBarAlert getPriorityAlert(Set<ActionBarAlert> alerts) {
+        return alerts.stream()
+                .max(Comparator.comparingInt(ActionBarAlert::getPriority))
+                .orElse(null);
+    }
+}

src/main/java/net/clementraynaud/skoice/system/LinkedPlayer.java

@@ -31,6 +31,7 @@
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
+import java.util.EnumSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -44,6 +45,7 @@ public class LinkedPlayer {
     private final Skoice plugin;
     private final Player player;
     private final String discordId;
+    private final EnumSet<ActionBarAlert> alerts = EnumSet.noneOf(ActionBarAlert.class);
 
     public LinkedPlayer(Skoice plugin, Player player, String discordId) {
         this.plugin = plugin;
@@ -57,6 +59,10 @@ public static Set<LinkedPlayer> getOnlineLinkedPlayers() {
         return LinkedPlayer.onlineLinkedPlayers;
     }
 
+    public static void sendActionBarAlerts() {
+        LinkedPlayer.onlineLinkedPlayers.forEach(LinkedPlayer::sendActionBarAlert);
+    }
+
     public static LinkedPlayer fromMemberId(String memberId) {
         ThreadUtil.ensureNotMainThread();
         return LinkedPlayer.onlineLinkedPlayers.stream()
@@ -70,20 +76,21 @@ public boolean isStateEligible() {
                 && !this.plugin.getConfigYamlFile().getStringList(ConfigField.DISABLED_WORLDS.toString()).contains(this.player.getWorld().getName());
     }
 
-    public void sendConnectingAlert() {
-        this.plugin.adventure().player(this.player).sendActionBar(
-                Component.text(ChatColor.translateAlternateColorCodes('&',
-                        this.plugin.getLang().getMessage("action-bar.connecting-alert")
-                ))
-        );
+    public void addActionBarAlert(ActionBarAlert alert) {
+        this.alerts.add(alert);
     }
 
-    public void sendDisconnectingAlert() {
-        this.plugin.adventure().player(this.player).sendActionBar(
-                Component.text(ChatColor.translateAlternateColorCodes('&',
-                        this.plugin.getLang().getMessage("action-bar.disconnecting-alert")
-                ))
-        );
+    public void sendActionBarAlert() {
+        ActionBarAlert priorityAlert = ActionBarAlert.getPriorityAlert(this.alerts);
+        if (priorityAlert != null) {
+            this.plugin.adventure().player(this.player).sendActionBar(
+                    Component.text(ChatColor.translateAlternateColorCodes('&',
+                            this.plugin.getLang().getMessage("action-bar." + priorityAlert)
+                    ))
+            );
+        }
+
+        this.alerts.clear();
     }
 
     public Set<LinkedPlayer> getPlayersWithinRange() {

src/main/java/net/clementraynaud/skoice/tasks/UpdateNetworksTask.java

@@ -22,6 +22,7 @@
 import com.bugsnag.Severity;
 import net.clementraynaud.skoice.Skoice;
 import net.clementraynaud.skoice.storage.config.ConfigField;
+import net.clementraynaud.skoice.system.ActionBarAlert;
 import net.clementraynaud.skoice.system.LinkedPlayer;
 import net.clementraynaud.skoice.system.Network;
 import net.clementraynaud.skoice.system.Networks;
@@ -89,6 +90,8 @@ private void run() {
             this.mergeNetworks();
             this.manageMoves();
 
+            LinkedPlayer.sendActionBarAlerts();
+
             Set<Member> connectedMembers = new HashSet<>(mainVoiceChannel.getMembers());
             connectedMembers.addAll(ProximityChannels.getInitialized().stream()
                     .map(ProximityChannel::getChannel)
@@ -155,7 +158,7 @@ private void manageConnectedPlayers() {
 
                     } else if (this.plugin.getConfigYamlFile().getBoolean(ConfigField.DISCONNECTING_ALERT.toString())
                             && !network.canPlayerConnect(p)) {
-                        p.sendDisconnectingAlert();
+                        p.addActionBarAlert(ActionBarAlert.DISCONNECTING);
                     }
                 });
     }
@@ -180,7 +183,7 @@ private void manageIsolatedPlayers() {
                                     playerInNearNetwork.getNetwork().add(p);
 
                                     if (this.plugin.getConfigYamlFile().getBoolean(ConfigField.CONNECTING_ALERT.toString())) {
-                                        p.sendConnectingAlert();
+                                        p.addActionBarAlert(ActionBarAlert.CONNECTING);
                                     }
                                 });
 
@@ -190,7 +193,7 @@ private void manageIsolatedPlayers() {
                             new Network(this.plugin, playersWithinRange).build();
 
                             if (this.plugin.getConfigYamlFile().getBoolean(ConfigField.CONNECTING_ALERT.toString())) {
-                                playersWithinRange.forEach(LinkedPlayer::sendConnectingAlert);
+                                playersWithinRange.forEach(playerWithinRange -> playerWithinRange.addActionBarAlert(ActionBarAlert.CONNECTING));
                             }
                         }
                     }