Add support for SayanVanish

Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/393

bungeecord/pom.xml

@@ -49,6 +49,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>repo-sayandevelopment</id>
+            <url>https://repo.sayandev.org/snapshots</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -124,6 +128,18 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-api</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-proxy-bungeecord</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Other -->
         <dependency>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -47,6 +47,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
+import org.sayandev.sayanvanish.bungeecord.api.SayanVanishBungeeAPI;
 
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
@@ -210,6 +211,9 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         // Exclude players when PremiumVanish is enabled and player is hidden.
         if(getProxy().getPluginManager().getPlugin("PremiumVanish") != null){
             players.removeIf(BungeeVanishAPI::isInvisible);
+        }else // Do the same if SayanVanish is enabled.
+        if(getProxy().getPluginManager().getPlugin("SayanVanish") != null){
+            players.removeIf(player -> SayanVanishBungeeAPI.getInstance().isVanished(player.getUniqueId()));
         }
         
         return players.size();

docs/api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md

@@ -13,14 +13,16 @@ constructors:
 methods:
   - name: 'extraPlayersCount'
     description: |
-      Sets the number of players to add to the online players to use as the new max players value.<br>
+      Sets the value to resolve into a number by AdvancedServerList.<br>
+      Strings not resolving into valid numbers will be treated as this option not being set.<br>
+      <br>
       This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled</code></a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
       <br>
-      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
+      Set this to <code>null</code> to not alter the max player count. Alternatively <a href="#setextraplayersenabled(nullbool)"><code>disable extra Players</code></a>.
     parameters:
       - name: 'extraPlayersCount'
         description: 'The number of extra players to add.'
-        type: 'Integer'
+        type: 'String'
         attribute:
           - 'nullable'
     returns: 'This Builder after the extra player count has been set. Useful for chaining.'
@@ -73,7 +75,9 @@ methods:
         description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
   - name: 'maxPlayersCount'
     description: |
-      Sets the number of max players allowed to join this server.<br>
+      Sets the value to resolve into a number by AdvancedServerList.<br>
+      Strings not resolving into valid numbers will be treated as this option not being set.<br>
+      <br>
       This option has no effect when <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled</a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
       <br>
       Set this to <code>null</code> to not alter the max player count. Alternatively <a href="#maxplayersenabled(nullbool)">disable max Players</a>.
@@ -122,7 +126,11 @@ methods:
   - name: 'onlinePlayersCount'
     description: |
       Sets the value to resolve into a number by AdvancedServerList.<br>
-      Strings not resolving into valid numbers will be treated as this option not being set.
+      Strings not resolving into valid numbers will be treated as this option not being set.<br>
+      <br>
+      This option has no effect when <a href="#onlineplayersenabled(nullbool)">maxPlayersEnabled</a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the online player count. Alternatively <a href="#onlineplayersenabled(nullbool)">disable online Players</a>.
     parameters:
       - name: 'onlinePlayersCount'
         description: 'The number of online players to set.'

docs/api/reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md

@@ -43,13 +43,18 @@ constructors:
         attributes:
           - notnull
       - name: 'extraPlayersCount'
-        description: 'The number to add to the online players for the max players number.'
-        type: Integer
+        description: 'The number to add to the online Players for the extra Players.'
+        type: String
         attributes:
           - nullable
       - name: 'maxPlayersCount'
-        description: 'The number to use for the max players count.'
-        type: Integer
+        description: 'The number to set for the max Players count.'
+        type: String
+        attributes:
+          - nullable
+      - name: 'onlinePlayersCount'
+        description: 'The number to set for the Online Players count.'
+        type: String
         attributes:
           - nullable
     seealso:
@@ -76,6 +81,7 @@ methods:
         <li><a href="#maxplayersenabled()"><code>maxPlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBoo.NOT_SET</code></a></li>
         <li><a href="#extraplayerscount()"><code>extraPlayersCount</code></a>: <code>null</code></li>
         <li><a href="#maxplayerscount()"><code>maxPlayersCount</code></a>: <code>null</code></li>
+        <li><a href="#onlineplayerscount()"><code>onlinePlayersCount</code></a>: <code>null</code></li>
       </ul>
     returns: 'New ProfileEntry instance with empty/null values defined'
     attributes:
@@ -164,12 +170,12 @@ methods:
       type: 'object'
       link: '../../objects/nullbool/'
   - name: 'extraPlayersCount'
-    description: 'Gets the currently set number of extra players to use by this ProfileEntry. May be <code>null</code>.'
-    returns: 'Possibly-null integer number of extra players used by this ProfileEntry.'
+    description: 'Gets the currently set number of extra players of this ProfileEntry.'
+    returns: 'The current number of extra players used by this ProfileEntry.'
     attributes:
       - nullable
     type:
-      name: 'Integer'
+      name: 'String'
       type: 'object'
   - name: 'maxPlayersCount'
     description: 'Gets the currently set number of max players of this ProfileEntry.'
@@ -177,7 +183,15 @@ methods:
     attributes:
       - nullable
     type:
-      name: 'Integer'
+      name: 'String'
+      type: 'object'
+  - name: 'onlinePlayersCount'
+    description: 'Gets the currently set number of online players of this ProfileEntry.'
+    returns: 'The current number of online players used by this ProfileEntry.'
+    attributes:
+      - nullable
+    type:
+      name: 'String'
       type: 'object'
   - name: 'isInvalid'
     description: |

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>5.2.1</plugin.version>
+        <plugin.version>5.3.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>4.0.0</api.version>

velocity/pom.xml

@@ -48,6 +48,10 @@
             <id>velocity-repo</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>repo-sayandevelopment</id>
+            <url>https://repo.sayandev.org/snapshots</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -95,6 +99,18 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-api</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sayandev</groupId>
+            <artifactId>sayanvanish-proxy-velocity</artifactId>
+            <version>1.6.1</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Other -->
         <dependency>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/VelocityCore.java

@@ -54,6 +54,7 @@ import de.myzelyam.api.vanish.VelocityVanishAPI;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
+import org.sayandev.sayanvanish.velocity.api.SayanVanishVelocityAPI;
 
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
@@ -226,6 +227,9 @@ public class VelocityCore implements PluginCore<Favicon>{
         // Exclude players when PremiumVanish is enabled and player is hidden.
         if(getProxy().getPluginManager().isLoaded("premiumvanish")){
             players.removeIf(VelocityVanishAPI::isInvisible);
+        }else // Do the same if SayanVanish is enabled.
+        if(getProxy().getPluginManager().isLoaded("sayanvanish")){
+            players.removeIf(player -> SayanVanishVelocityAPI.getInstance().isVanished(player.getUniqueId()));
         }
         
         return players.size();