Fix rare NPE for gson.fromJson in PlayerHandler

Bump guava from 32.0.1-jre to 32.1.1-jre in /core

.github/labeler.yml

@@ -0,0 +1,14 @@
+"Target: All":
+  - all: ["bukkit/**", "bungeecord/**", "core/**", "velocity/**"]
+
+"Target: Bukkit":
+  - all: ["bukkit/**", "!bungeecord/**", "!core/**", "!velocity/**"]
+
+"Target: BungeeCord":
+  - all: ["!bukkit/**", "bungeecord/**", "!core/**", "!velocity/**"]
+
+"Target: Core":
+  - all: ["!bukkit/**", "!bungeecord/**", "core/**", "!velocity/**"]
+
+"Target: Velocity":
+  - all: ["!bukkit/**", "!bungeecord/**", "!core/**", "velocity/**"]

.github/workflows/docs-deploy.yml

@@ -31,5 +31,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip setuptools
           python -m pip install -r requirements.txt
+      - name: Set up Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "actions@github.com"
       - name: Deploy Files
         run: mkdocs gh-deploy --force

bukkit/pom.xml

@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/objects/placeholders/BukkitServerPlaceholders.java

@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitServer;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 
 public class BukkitServerPlaceholders extends PlaceholderProvider{
@@ -50,28 +51,39 @@ public class BukkitServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    World world = bukkitServer.getWorlds().get(args[1]);
-                    if(world == null)
-                        yield null;
+                if(args.length >= 2){
+                    int players = 0;
+                    for(int i = 1; i < args.length; i++){
+                        World world = bukkitServer.getWorlds().get(args[i]);
+                        if(world == null)
+                            continue;
+                        
+                        players += world.getPlayers().size();
+                    }
                     
-                    yield String.valueOf(world.getPlayers().size());
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(bukkitServer.getPlayersOnline());
             }
             case "playersMax" -> {
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield String.valueOf(bukkitServer.getPlayersMax());
             }
             case "host" -> {
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield bukkitServer.getHost();
             }
+            case "whitelistEnabled" -> {
+                if(args.length >= 2)
+                    yield null;
+                
+                yield String.valueOf(Bukkit.hasWhitelist());
+            }
             default -> null;
         };
     }

bukkit/src/main/resources/paper-plugin.yml

@@ -6,7 +6,7 @@ description: '${plugin.description}'
 main: 'ch.andre601.advancedserverlist.paper.PaperCore'
 loader: 'ch.andre601.advancedserverlist.paper.ASLLoader'
 
-api-version: 1.19
+api-version: '1.19'
 
 dependencies:
   server:

bungeecord/pom.xml

@@ -133,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/BungeeServerPlaceholders.java

@@ -52,22 +52,33 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    ServerInfo info = proxy.getServers().get(args[1]);
+                if(args.length >= 2){
+                    int players = 0;
                     
-                    yield String.valueOf(info.getPlayers().size());
+                    for(int i = 1; i < args.length; i++){
+                        ServerInfo info = proxy.getServers().get(args[i]);
+                        if(info == null)
+                            continue;
+                        
+                        players += info.getPlayers().size();
+                    }
+                    
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(proxy.getPlayersOnline());
             }
             case "playersMax" -> {
                 // ServerInfo doesn't provide the max players that could join, so we won't allow an extra argument
-                if(args.length == 2)
+                if(args.length >= 2)
                     yield null;
                 
                 yield String.valueOf(proxy.getPlayersMax());
             }
             case "host" -> {
+                if(args.length > 2)
+                    yield null;
+                
                 if(args.length == 2){
                     ServerInfo info = proxy.getServers().get(args[1]);
                     

core/pom.xml

@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.1-jre</version>
+            <version>32.1.1-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -132,7 +132,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -40,6 +40,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -70,7 +73,7 @@ public class FileHandler{
     
     public boolean loadConfig(){
         logger.info("Loading config.yml...");
-        File folder = config.toFile().getParentFile();
+        File folder = plugin.getPlugin().getFolderPath().toFile();
         if(!folder.exists() && !folder.mkdirs()){
             logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
             return false;
@@ -121,6 +124,9 @@ public class FileHandler{
             .nodeStyle(NodeStyle.BLOCK)
             .build();
         
+        if(!makeBackup())
+            return false;
+        
         try{
             node = ConfigMigrator.updateNode(loader.load(), logger);
             loader.save(node);
@@ -188,4 +194,32 @@ public class FileHandler{
     public boolean isOldConfig(){
         return node.node("configVersion").virtual() || node.node("configVersion").getInt(0) < ConfigMigrator.LATEST;
     }
+    
+    private boolean makeBackup(){
+        logger.info("Making backup of old config.yml...");
+        
+        File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
+        if(!backups.exists() && !backups.mkdirs()){
+            logger.warn("Cannot create backups folder for migration!");
+            return false;
+        }
+        
+        String date = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(LocalDateTime.now());
+        
+        File configBackup = new File(backups, "config_" + date.replace(":", "_") + ".yml");
+        try{
+            if(!configBackup.exists() && !configBackup.createNewFile()){
+                logger.warn("Cannot create backup file for config.yml!");
+                return false;
+            }
+            
+            Files.copy(config, configBackup.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.info("Saved backup as '" + configBackup.getName() + "'!");
+            
+            return true;
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to create a backup.", ex);
+            return false;
+        }
+    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/PlayerHandler.java

@@ -31,23 +31,20 @@ import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import com.google.gson.Gson;
 import io.leangen.geantyref.TypeToken;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.Reader;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class PlayerHandler{
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final Path cache;
-    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
     
     private final Type listType = new TypeToken<ArrayList<CachedPlayer>>(){}.getType();
     private final Gson gson = new Gson();
@@ -55,6 +52,7 @@ public class PlayerHandler{
     // UUID of MHF_Question
     private final UUID defaultUUID = UUID.fromString("606e2ff0-ed77-4842-9d6c-e1d3321c7838");
     
+    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
     private CachedPlayer defaultPlayer = null;
     
     public PlayerHandler(AdvancedServerList<?> core){
@@ -75,7 +73,7 @@ public class PlayerHandler{
         }
     
         try{
-            Reader reader = Files.newBufferedReader(cache);
+            BufferedReader reader = Files.newBufferedReader(cache);
             
             cachedPlayers = gson.fromJson(reader, listType);
             
@@ -85,6 +83,14 @@ public class PlayerHandler{
             return;
         }
         
+        // In case Gson messes up... I guess.
+        if(cachedPlayers == null){
+            logger.warn("Couldn't load players from playercache.json file. Is the JSON valid?");
+            // Create new ArrayList instance to avoid further issues.
+            cachedPlayers = new ArrayList<>();
+            return;
+        }
+        
         logger.info("Loaded %d players into cache!", cachedPlayers.size());
     }
     

docs/profiles/index.md

@@ -52,9 +52,10 @@ The following operants are available and can be used in the conditions.
 
 ## Profiles
 
-The profiles option allows you to add multiple combinations of all the other options (Except for [`Priority`](#priority) and [`Conditions`](#conditions)) to have randomized MOTDs, player counts, etc.
+!!! warning "Priority and Conditions are NOT supported!"
 
-If an option is not present in an entry will AdvancedServerList try to use one defined in the file or use whatever default value would be for that option.
+The `profiles` option allows you to set multiple MOTDs, player counts, etc. which the plugin would randomly choose from.  
+If an option such as motd is not present in an entry will it check the file for the option and use that if present.
 
 ??? example "Example"
     ```yaml title="YAML file"
@@ -250,4 +251,4 @@ As an example, setting this to `1` while `10` players are online will display `1
 
     ![hover-example](../assets/images/examples/extraplayers-example.jpg)
 
-    </div>
+    </div>

docs/profiles/placeholders.md

@@ -21,7 +21,9 @@ These placeholders use the player who pinged the server, to return values. They
 | `${player isBanned}`        | Boolean for whether the player has been banned from the server. | Spigot/Paper | Yes                         |
 | `${player isWhitelisted}`   | Boolean for whether the player is whitelisted on the server.    | Spigot/Paper | Yes                         |
 
-[^1]: Whether this placeholder requires the player to have joined before while AdvancedServerList was running. When `disableCache` is enabled will these placeholders not work.
+[^1]:
+    Whether this placeholder requires the player to have joined before while AdvancedServerList was running.  
+    When `disableCache` is enabled will these placeholders not work.
 [^2]: Will default to whatever name has been provided in the `unknownPlayer -> name` option of the config.yml, when the player isn't cached yet.
 [^3]: Will default to whatever name has been provided in the `unknownPlayer -> uuid` option of the config.yml, when the player isn't cached yet.
 
@@ -29,19 +31,22 @@ These placeholders use the player who pinged the server, to return values. They
 
 These placeholders use values given by the server/proxy AdvancedServerList runs on.
 
-| Placeholder               | Description                                                |
-|---------------------------|------------------------------------------------------------|
-| `${server playersOnline}` | The number of players online on this proxy/server.[^4]     |
-| `${server playersMax}`    | The total number of players that can join this server.[^5] |
-| `${server host}`          | The domain/IP the player pinged.[^6]                       |
+| Placeholder                  | Description                                                             |
+|------------------------------|-------------------------------------------------------------------------|
+| `${server playersOnline}`    | The number of players online on this proxy/server.[^4]                  |
+| `${server playersMax}`       | The total number of players that can join this server.[^5]              |
+| `${server host}`             | The domain/IP the player pinged.[^6]                                    |
+| `${server whitelistEnabled}` | Whether the whitelist is enabled or not. Only available on Spigot/Paper |
 
 [^4]:
-    An optional World (For Spigot/Paper) or Server (For BungeeCord/Velocity) can be provided to display the number of players online on said world/server.  
-    Full format is `${server playersOnline [world/server]}` (Replace `[world/server]` with a valid world or server name).
-[^5]: This placeholder is affected by the [`Amount` option](../#amount) in a server list profile, with the exception being when used in [`Conditions`](../#conditions).
+    An space-separated list of worlds (Spigot/Paper) or Servers (BungeeCord/Velocity) can be provided to display the number of players in these worlds/servers.  
+    Example: `${server playersOnline lobby1 lobby2}` will display the numbers of players online on the servers `lobby1` and `lobby2`.
+[^5]:
+    When the [`amount` option](../#amount) is used will this placeholder display the modified max players count.  
+    The only exception is [`conditions`](../#conditions) where it uses the actual max players of the server/proxy.
 [^6]:
     An optional server name can be provided to display the IP/Domain associated with that server. Only works on BungeeCord/Velocity.
-    Full format is `${server host [server]}` (Replace `[server]` with a valid server name).
+    Example: `${server host survival}` would display the IP/Domain associated with the `survival` server.
 
 ## PlaceholderAPI
 
@@ -55,4 +60,4 @@ Depending on the placeholder used is a cached player required (i.e. `%player_nam
 Since version 2 of AdvancedServerList are developers able to provide their own placeholders to be used in a server list profile.  
 The format follows the same one as the [built-in placeholders](#built-in-placeholders), meaning it is `${<identifier> <placeholder>}`.
 
-If you're a developer and want to integrate your own placeholders into AdvancedServerList, read about it [here](../../api).
+If you're a developer and want to integrate your own placeholders into AdvancedServerList, read about it [here](../../api).

hangar-uploader/src/main/java/ch/andre601/advancedserverlist/hangaruploader/HangarUploader.java

@@ -112,8 +112,8 @@ public class HangarUploader{
                 VersionUpload.Platform.VELOCITY, List.of()
             ),
             Map.of(
-                VersionUpload.Platform.PAPER, List.of("1.19.x"),
-                VersionUpload.Platform.WATERFALL, List.of("1.19.x"),
+                VersionUpload.Platform.PAPER, List.of("1.19.x", "1.20.x"),
+                VersionUpload.Platform.WATERFALL, List.of("1.19.x", "1.20.x"),
                 VersionUpload.Platform.VELOCITY, List.of("3.1")
             ),
             body,

pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.commit/>
         
-        <plugin.version>3.1.0</plugin.version>
+        <plugin.version>3.2.1</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>v3.0.0</api.version>

requirements.txt

@@ -1,2 +1,2 @@
-mkdocs-material==9.1.15
+mkdocs-material==9.1.18
 mkdocs-glightbox==0.3.4

velocity/pom.xml

@@ -106,7 +106,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/objects/VelocityServerPlaceholders.java

@@ -50,24 +50,32 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
         
         return switch(args[0]){
             case "playersOnline" -> {
-                if(args.length == 2){
-                    RegisteredServer info = proxy.getServers().get(args[1]);
-                    if(info == null)
-                        yield null;
+                if(args.length >= 2){
+                    int players = 0;
                     
-                    yield String.valueOf(info.getPlayersConnected().size());
+                    for(int i = 1; i < args.length; i++){
+                        RegisteredServer registeredServer = proxy.getServers().get(args[i]);
+                        if(registeredServer == null)
+                            continue;
+                        
+                        players += registeredServer.getPlayersConnected().size();
+                    }
+                    
+                    yield String.valueOf(players);
                 }
                 
                 yield String.valueOf(proxy.getPlayersOnline());
             }
             case "playersMax" -> {
-                if(args.length == 2){
+                if(args.length >= 2)
                     yield null;
-                }
                 
                 yield String.valueOf(proxy.getPlayersMax());
             }
             case "host" -> {
+                if(args.length > 2)
+                    yield null;
+                
                 if(args.length == 2){
                     RegisteredServer info = proxy.getServers().get(args[1]);
                     if(info == null)