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/**"]

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/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:

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>
         

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

@@ -31,11 +31,12 @@ 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 space-separated list of worlds (Spigot/Paper) or Servers (BungeeCord/Velocity) can be provided to display the number of players in these worlds/servers.  
@@ -59,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).

pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.commit/>
         
-        <plugin.version>3.2.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.16
+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>