Allow support for vanished players

Unify Placeholder parsing system.
Merge pull request 'Update dependency com.viaversion:viaversion-api to v4.9.3' (#241 ) from renovate/com.viaversion-viaversion-api-4.x into master
2026-11-05 17:02:34 -05:00 · 2024-03-10 14:01:10 +01:00 · 2024-03-07 22:01:18 +01:00 · 2024-03-06 12:46:39 +00:00 · 2024-03-06 12:46:23 +00:00 · 2024-03-06 12:14:43 +00:00
59 changed files with 1225 additions and 493 deletions
@@ -54,6 +54,10 @@
            <id>papermc</id>
            <url>https://papermc.io/repo/repository/maven-public/</url>
        </repository>
+        <repository>
+            <id>libertybans</id>
+            <url>https://mvn-repo.arim.space/affero-gpl3/</url>
+        </repository>
    </repositories>
    
    <dependencies>
@@ -78,6 +82,12 @@
            <version>1.20-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
        
        <!-- Plugin APIs -->
        <dependency>
@@ -86,6 +96,12 @@
            <version>v2.3.0</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>space.arim.libertybans</groupId>
+            <artifactId>bans-api</artifactId>
+            <version>1.1.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
        <dependency>
            <groupId>ch.andre601.asl-api</groupId>
            <artifactId>api</artifactId>
@@ -27,13 +27,15 @@ package ch.andre601.advancedserverlist.banplugins.bungeecord;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;

 import java.util.HashMap;
 import java.util.Map;

 public enum BungeeCordBanPlugins{
    
-    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders());
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
    
    private final String plugin;
    private final PlaceholderProvider placeholderProvider;
@@ -27,13 +27,15 @@ package ch.andre601.advancedserverlist.banplugins.paper;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;

 import java.util.HashMap;
 import java.util.Map;

 public enum PaperBanPlugins{
    
-    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders());
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
    
    private final String plugin;
    private final PlaceholderProvider placeholderProvider;
@@ -0,0 +1,76 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.banplugins.providers.LibertyBansProvider;
+
+import java.util.Arrays;
+
+public class LibertyBansPlaceholders extends PlaceholderProvider{
+    
+    private final LibertyBansProvider provider = LibertyBansProvider.create();
+    
+    public LibertyBansPlaceholders(){
+        super("libertybans");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        String[] args = placeholder.split("\\.");
+        
+        return switch(args[0]){
+            // Mute-related placeholders
+            case "isMuted" -> String.valueOf(provider.muted(player));
+            case "muteReason" -> provider.muteReason(player);
+            case "muteExpiration" -> {
+                if(args.length == 1)
+                    yield provider.muteExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.muteExpirationDate(player, pattern);
+            }
+            
+            // Ban-related placeholders
+            case "isBanned" -> String.valueOf(provider.banned(player));
+            case "banReason" -> provider.banReason(player);
+            case "banExpiration" -> {
+                if(args.length == 1)
+                    yield provider.banExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.banExpirationDate(player, pattern);
+            }
+            
+            // Unknown/Invalid placeholder
+            default -> null;
+        };
+    }
+}
@@ -105,8 +105,7 @@ public class AdvancedBanProvider implements PunishmentProvider{
        if(end < 0L)
            return "never";
        
-        Date date = new Date(end);
-        return new SimpleDateFormat(pattern).format(date);
+        return this.returnDate(pattern, end);
    }
    
    @Override
@@ -119,8 +118,7 @@ public class AdvancedBanProvider implements PunishmentProvider{
        if(end < 0L)
            return "never";
        
-        Date date = new Date(end);
-        return new SimpleDateFormat(pattern).format(date);
+        return this.returnDate(pattern, end);
    }
    
    public String muteDuration(GenericPlayer player, boolean fromStart){
@@ -0,0 +1,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.providers;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import space.arim.libertybans.api.LibertyBans;
+import space.arim.libertybans.api.PunishmentType;
+import space.arim.libertybans.api.punish.Punishment;
+import space.arim.libertybans.api.user.KnownAccount;
+import space.arim.omnibus.Omnibus;
+import space.arim.omnibus.OmnibusProvider;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+
+public class LibertyBansProvider implements PunishmentProvider{
+    private final LibertyBans libertyBans;
+    
+    private LibertyBansProvider(LibertyBans libertyBans){
+        this.libertyBans = libertyBans;
+    }
+    
+    public static LibertyBansProvider create(){
+        Omnibus omnibus = OmnibusProvider.getOmnibus();
+        LibertyBans libertyBans = omnibus.getRegistry().getProvider(LibertyBans.class).orElseThrow();
+        
+        return new LibertyBansProvider(libertyBans);
+    }
+    
+    @Override
+    public boolean muted(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.MUTE) != null;
+    }
+    
+    @Override
+    public boolean banned(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.BAN) != null;
+    }
+    
+    @Override
+    public String muteReason(GenericPlayer player){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        return mute.getReason();
+    }
+    
+    @Override
+    public String banReason(GenericPlayer player){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        return ban.getReason();
+    }
+    
+    @Override
+    public String muteDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String banDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String muteExpirationDate(GenericPlayer player, String pattern){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        if(mute.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, mute.getEndDate().toEpochMilli());
+    }
+    
+    @Override
+    public String banExpirationDate(GenericPlayer player, String pattern){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        if(ban.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, ban.getEndDate().toEpochMilli());
+    }
+    
+    private Punishment punishment(UUID uuid, PunishmentType type){
+        List<? extends KnownAccount> accounts = libertyBans.getAccountSupervisor()
+            .findAccountsMatching(uuid)
+            .join();
+        
+        if(accounts.isEmpty())
+            return null;
+        
+        KnownAccount sorted = Collections.max(accounts, Comparator.comparing(KnownAccount::recorded));
+        
+        return libertyBans.getSelector()
+            .selectionByApplicabilityBuilder(sorted.uuid(), sorted.address())
+            .type(type)
+            .build()
+            .getFirstSpecificPunishment()
+            .toCompletableFuture()
+            .join()
+            .orElse(null);
+    }
+}
@@ -27,6 +27,9 @@ package ch.andre601.advancedserverlist.banplugins.providers;

 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;

+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 public interface PunishmentProvider{
    
    boolean muted(GenericPlayer player);
@@ -53,4 +56,13 @@ public interface PunishmentProvider{
    
    String banExpirationDate(GenericPlayer player, String pattern);
    
+    default String returnDate(String pattern, long end){
+        Date date = new Date(end);
+        try{
+            return new SimpleDateFormat(pattern).format(date);
+        }catch(IllegalArgumentException ex){
+            return new SimpleDateFormat("dd, MMM yyyy HH:mm:ss").format(date);
+        }
+    }
+    
 }
@@ -0,0 +1,56 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.velocity;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.paper.PaperBanPlugins;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum VelocityBanPlugins{
+    
+    LIBERTY_BANS("libertybans", new LibertyBansPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    VelocityBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(VelocityBanPlugins velocityBanPlugins : VelocityBanPlugins.values()){
+            content.put(velocityBanPlugins.plugin, velocityBanPlugins.placeholderProvider);
+        }
+        
+        return content;
+    }
+}
@@ -0,0 +1,82 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.velocity;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import com.google.inject.Inject;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import net.md_5.bungee.api.ProxyServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class VelocityBanPluginsAddon{
+    
+    private final Logger logger = LoggerFactory.getLogger("ASLBanPluginsAddon");
+    
+    private final ProxyServer proxy;
+    
+    @Inject
+    public VelocityBanPluginsAddon(ProxyServer proxy){
+        this.proxy = proxy;
+    }
+    
+    @Subscribe
+    public void init(ProxyInitializeEvent event){
+        if(proxy.getPluginManager().getPlugin("advancedserverlist") == null){
+            logger.warn("AdvancedServerList is not enabled. This plugin requires it to function!");
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            logger.warn("No compatible Ban plugin was found to register placeholders for.");
+        }else{
+            logger.info("Loaded {} Placeholder Set(s) for AdvancedServerList!", loadedPlaceholders);
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = VelocityBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(proxy.getPluginManager().getPlugin(entry.getKey()) != null){
+                logger.info("Registering placeholders for {}...", entry.getKey());
+                api.addPlaceholderProvider(entry.getValue());
+                logger.info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}
@@ -6,5 +6,6 @@ description: 'AdvancedBan Add-on for AdvancedServerList to add placeholders to u
 softDepends:
  - AdvancedServerList
  - AdvancedBan
+  - LibertyBans

 main: 'ch.andre601.advancedserverlist.banplugins.bungeecord.BungeeCordBanPluginsAddon'
@@ -12,5 +12,8 @@ dependencies:
      required: false
      load: BEFORE
    AdvancedBans:
+      required: false
+      load: BEFORE
+    LibertyBans:
      required: false
      load: BEFORE
@@ -0,0 +1,20 @@
+{
+  "id": "aslbanpluginsaddon",
+  "name": "ASLBanPluginsAddon",
+  "version": "${plugin.version}",
+  "description": "${plugin.description}",
+  "authors": [
+    "Andre_601"
+  ],
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": true
+    },
+    {
+      "id": "libertybans",
+      "optional": true
+    }
+  ],
+  "main": "ch.andre601.advancedserverlist.banplugins.velocity.VelocityBanPluginsAddon"
+}
@@ -64,6 +64,8 @@
            <version>${api.version}</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- BungeeCord API -->
        <dependency>
            <groupId>net.md-5</groupId>
            <artifactId>bungeecord-api</artifactId>
@@ -78,6 +80,8 @@
            <type>javadoc</type>
            <scope>provided</scope>
        </dependency>
+        
+        <!-- Adventure Library. Needs to be shaded in -->
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
@@ -96,18 +100,30 @@
            <version>4.3.2</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- Metrics -->
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bungeecord</artifactId>
            <version>3.0.2</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- Configurate -->
        <dependency>
            <groupId>org.spongepowered</groupId>
            <artifactId>configurate-yaml</artifactId>
            <version>4.1.2</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- Plugins -->
+        <dependency>
+            <groupId>com.github.LeonMangler</groupId>
+            <artifactId>PremiumVanishAPI</artifactId>
+            <version>2.9.0-4</version>
+            <scope>provided</scope>
+        </dependency>
    </dependencies>

    <build>
@@ -29,19 +29,24 @@ import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerPlaceholders;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeeServerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeePlayerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeServerPlaceholders;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.config.ServerInfo;
+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 java.awt.image.BufferedImage;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;

 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
    
@@ -51,7 +56,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
    
    @Override
    public void onEnable(){
-        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init());
+        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
    }
    
    @Override
@@ -133,4 +138,15 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
        return Favicon.create(image);
    }
+    
+    public int getOnlinePlayers(ServerInfo server){
+        List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
+        
+        // Exclude players when PremiumVanish is enabled and player is hidden.
+        if(getProxy().getPluginManager().getPlugin("PremiumVanish") != null){
+            players.removeIf(BungeeVanishAPI::isInvisible);
+        }
+        
+        return players.size();
+    }
 }
@@ -29,8 +29,8 @@ import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerImpl;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeeProxyImpl;
+import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeePlayerImpl;
+import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeeProxyImpl;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
@@ -147,7 +147,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
    
    @Override
    public int getOnlinePlayers(){
-        return ping.getPlayers().getOnline();
+        return plugin.getOnlinePlayers(null);
    }
    
    @Override
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;

 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
@@ -31,8 +31,8 @@ import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 public class BungeePlayerImpl extends GenericPlayerImpl{
    
    public BungeePlayerImpl(CachedPlayer player, int protocol){
-        this.name = player.getName();
+        this.name = player.name();
        this.protocol = protocol;
-        this.uuid = player.getUuid();
+        this.uuid = player.uuid();
    }
 }
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;

 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,24 +23,28 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import net.md_5.bungee.api.config.ServerInfo;

 import java.net.InetSocketAddress;

 public class BungeeServerPlaceholders extends PlaceholderProvider{
    
-    private BungeeServerPlaceholders(){
+    private final BungeeCordCore plugin;
+    
+    private BungeeServerPlaceholders(BungeeCordCore plugin){
        super("server");
+        this.plugin = plugin;
    }
    
-    public static BungeeServerPlaceholders init(){
-        return new BungeeServerPlaceholders();
+    public static BungeeServerPlaceholders init(BungeeCordCore plugin){
+        return new BungeeServerPlaceholders(plugin);
    }
    
    @Override
@@ -64,7 +68,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                        if(info == null)
                            continue;
                        
-                        players += info.getPlayers().size();
+                        players += plugin.getOnlinePlayers(info);
                    }
                    
                    yield String.valueOf(players);
@@ -57,6 +57,10 @@
            <id>sonatype</id>
            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
        </repository>
+        <repository>
+            <id>codeberg</id>
+            <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+        </repository>
    </repositories>
    
    <dependencies>
@@ -68,8 +72,8 @@
        </dependency>
        <dependency>
            <groupId>ch.andre601</groupId>
-            <artifactId>ExpressionParser</artifactId>
-            <version>v1.2.0</version>
+            <artifactId>expressionparser</artifactId>
+            <version>1.3.0</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -98,6 +102,8 @@
            <version>4.16.0</version>
            <scope>provided</scope>
        </dependency>
+        
+        <!-- Misc -->
        <dependency>
            <groupId>com.google.code.gson</groupId>
            <artifactId>gson</artifactId>
@@ -46,7 +46,7 @@ public class AdvancedServerList<F>{
    private final FileHandler fileHandler;
    private final CommandHandler commandHandler;
    private final PlayerHandler playerHandler;
-    private final AdvancedServerListAPI api = AdvancedServerListAPI.get();
+    private static final AdvancedServerListAPI api = AdvancedServerListAPI.get();
    private final ProfileConditionParser parser = ProfileConditionParser.create();
    
    private UpdateChecker updateChecker;
@@ -59,7 +59,7 @@ public class AdvancedServerList<F>{
        this.commandHandler = new CommandHandler(this);
        this.playerHandler = new PlayerHandler(this);
        
-        placeholders.forEach(this.api::addPlaceholderProvider);
+        placeholders.forEach(AdvancedServerList.getApi()::addPlaceholderProvider);
        
        load();
    }
@@ -88,7 +88,7 @@ public class AdvancedServerList<F>{
        return version;
    }
    
-    public AdvancedServerListAPI getApi(){
+    public static AdvancedServerListAPI getApi(){
        return api;
    }
    
@@ -27,28 +27,4 @@ package ch.andre601.advancedserverlist.core.objects;

 import java.util.UUID;

-@SuppressWarnings("FieldMayBeFinal")
-public class CachedPlayer{
-    
-    private String ip;
-    private String name;
-    private UUID uuid;
-    
-    public CachedPlayer(String ip, String name, UUID uuid){
-        this.ip = ip;
-        this.name = name;
-        this.uuid = uuid;
-    }
-    
-    public String getIp(){
-        return ip;
-    }
-    
-    public String getName(){
-        return name;
-    }
-    
-    public UUID getUuid(){
-        return uuid;
-    }
-}
+public record CachedPlayer(String ip, String name, UUID uuid){}
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;

-public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles){
+public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles, String file){
    private static final Random random = new Random();
    
    public boolean evalConditions(ProfileConditionParser parser, PluginLogger logger, GenericPlayer player, GenericServer server){
@@ -50,13 +50,17 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
        ExpressionTemplate template = parser.compile(condition, player, server, collector);
        
        if(collector.hasWarnings()){
-            logger.warn("Encountered %d Error(s) while parsing condition '%s':", collector.getWarnings().size(), condition);
+            logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
            
            for(ParseWarnCollector.Context context : collector.getWarnings()){
                if(context.position() <= -1){
-                    logger.warn("  - %s", context.message());
+                    logger.warn("  - %s", condition);
+                    logger.warn("    -> %s", context.message());
                }else{
-                    logger.warn("  - At Position %d: %s", context.position(), context.message());
+                    logger.warn("  - At position %d:", context.position());
+                    logger.warn("    %s", condition);
+                    logger.warn(" ".repeat(context.position() + 5) + "^");
+                    logger.warn("    -> %s", context.message());
                }
            }
        }
@@ -159,7 +163,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
        }
        
        public ServerListProfile build(){
-            return new ServerListProfile(this.priority, this.condition, this.defaultProfile, this.profiles);
+            return new ServerListProfile(this.priority, this.condition, this.defaultProfile, this.profiles, this.fileName);
        }
    }
 }
@@ -54,7 +54,7 @@ public class ProfileConditionParser implements ExpressionParserEngine{
    }
    
    public static ProfileConditionParser create(){
-        return new ProfileConditionParserBuilder().createDefault()
+        return new ProfileConditionParserBuilder().addDefaults()
            .addTokenReader(new PlaceholderTokenReader(-20))
            .addValueReader(new PlaceholderValueReader())
            .build();
@@ -1,120 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders;
-
-import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
-import ch.andre601.advancedserverlist.api.PlaceholderProvider;
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
-import ch.andre601.expressionparser.ParseWarnCollector;
-
-import java.text.ParsePosition;
-
-public class PlaceholderParser{
-    
-    public static PlaceholderToken.Placeholder parse(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
-        AdvancedServerListAPI api = AdvancedServerListAPI.get();
-        
-        // We want to point to the start of a placeholder in the ParseWarnCollector.
-        // Since the PlaceholderTokenReader updates the index by 2 are we reverting this here.
-        int placeholderStart = position.getIndex() - 2;
-        int index = position.getIndex();
-        
-        StringBuilder identifier = new StringBuilder();
-        StringBuilder values = new StringBuilder();
-        
-        boolean identified = false;
-        boolean invalid = true;
-        
-        char[] chars = text.substring(index).toCharArray();
-        for(final char c : chars){
-            index++;
-            
-            if(c == '}'){
-                invalid = false;
-                break;
-            }
-            
-            if(c == ' ' && !identified){
-                identified = true;
-                continue;
-            }
-            
-            if(identified){
-                values.append(c);
-            }else{
-                identifier.append(c);
-            }
-        }
-        
-        String identifierStr = identifier.toString();
-        String valuesStr = values.toString();
-        
-        StringBuilder raw = new StringBuilder();
-        
-        // Skipping whatever character we currently were on (i.e. })
-        position.setIndex(index + 1);
-        
-        if(invalid){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have a closing bracket (}).", raw.toString());
-            return new PlaceholderToken.Placeholder(raw.toString());
-        }
-        
-        PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierStr);
-        if(provider == null){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            raw.append('}');
-            
-            collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
-            return new PlaceholderToken.Placeholder(raw.toString());
-        }
-        
-        String replacement = provider.parsePlaceholder(valuesStr, player, server);
-        if(replacement == null){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            raw.append('}');
-            
-            collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' has an invalid value String '%s'.", raw.toString(), valuesStr);
-            return new PlaceholderToken.Placeholder(raw.toString());
-        }
-        
-        return new PlaceholderToken.Placeholder(replacement);
-    }
-}
@@ -27,8 +27,8 @@ package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.rea

 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.PlaceholderParser;
 import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.expressionparser.ParseWarnCollector;
 import ch.andre601.expressionparser.tokens.Token;

@@ -44,7 +44,7 @@ public class PlaceholderTokenReader extends CustomTokenReader{
    public Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
        if(position.getIndex() + 1 < text.length() && text.charAt(position.getIndex()) == '$' && text.charAt(position.getIndex() + 1) == '{'){
            position.setIndex(position.getIndex() + 2);
-            return new PlaceholderToken(PlaceholderParser.parse(text, position, player, server, collector));
+            return new PlaceholderToken(StringReplacer.parsePlaceholder(text, position, player, server, collector));
        }
        return null;
    }
@@ -29,6 +29,8 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
 import io.leangen.geantyref.TypeToken;

 import java.io.BufferedReader;
@@ -70,19 +72,18 @@ public class PlayerHandler{
        }
        
        if(core.getFileHandler().getBoolean("disableCache")){
-            logger.info("'disable_cache' is set to true. Skipping playercache.json loading...");
+            logger.info("'disableCache' is set to true. Skipping playercache.json loading...");
            return;
        }
-    
-        try{
-            BufferedReader reader = Files.newBufferedReader(cache);
-            
+        
+        try(BufferedReader reader = Files.newBufferedReader(cache)){
            cachedPlayers = gson.fromJson(reader, listType);
-            
-            reader.close();
        }catch(IOException ex){
            logger.warn("Encountered IOException while reading the playercache.json file!", ex);
            return;
+        }catch(JsonIOException | JsonSyntaxException ex){
+            logger.warn("Encountered Json exception while parsing playercache.json file!", ex);
+            return;
        }
        
        // In case Gson messes up... I guess.
@@ -129,7 +130,7 @@ public class PlayerHandler{
            return getDefaultPlayer();
        
        for(CachedPlayer player : cachedPlayers){
-            if(player.getIp().equals(key))
+            if(player.ip().equals(key))
                return player;
        }
        
@@ -138,7 +139,7 @@ public class PlayerHandler{
    
    public CachedPlayer getCachedPlayer(UUID uuid){
        for(CachedPlayer player : cachedPlayers){
-            if(player.getUuid().equals(uuid))
+            if(player.uuid().equals(uuid))
                return player;
        }
        
@@ -152,7 +153,7 @@ public class PlayerHandler{
    
    private boolean contains(String ip){
        for(CachedPlayer player : cachedPlayers){
-            if(player.getIp().equals(ip))
+            if(player.ip().equals(ip))
                return true;
        }
        
@@ -86,15 +86,15 @@ public class ProfileManager{
        Integer maxPlayers = resolveNullableInt(node, "playerCount", "maxPlayers", "amount");
        
        return new ProfileEntry.Builder()
-            .setMotd(motd)
-            .setPlayers(players)
-            .setPlayerCountText(playerCountText)
-            .setFavicon(favicon)
-            .setHidePlayersEnabled(hidePlayers)
-            .setExtraPlayersEnabled(extraPlayersEnabled)
-            .setMaxPlayersEnabled(maxPlayersEnabled)
-            .setExtraPlayersCount(extraPlayers)
-            .setMaxPlayersCount(maxPlayers)
+            .motd(motd)
+            .players(players)
+            .playerCountText(playerCountText)
+            .favicon(favicon)
+            .hidePlayersEnabled(hidePlayers)
+            .extraPlayersEnabled(extraPlayersEnabled)
+            .maxPlayersEnabled(maxPlayersEnabled)
+            .extraPlayersCount(extraPlayers)
+            .maxPlayersCount(maxPlayers)
            .build();
    }
    
@@ -29,6 +29,11 @@ import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.expressionparser.ParseWarnCollector;
+
+import java.text.ParsePosition;

 public class StringReplacer{
    
@@ -36,99 +41,113 @@ public class StringReplacer{
        if(input == null)
            return null;
        
-        char[] chars = input.toCharArray();
+        ParsePosition position = new ParsePosition(0);
        StringBuilder builder = new StringBuilder(input.length());
        
-        StringBuilder identifier = new StringBuilder();
-        StringBuilder placeholder = new StringBuilder();
-        
-        AdvancedServerListAPI api = AdvancedServerListAPI.get();
-        
-        for(int i = 0; i < chars.length; i++){
-            char c = chars[i];
-            char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
-            
-            if(c != '$' || i + 2 >= chars.length){
-                builder.append(c);
+        while(position.getIndex() < input.length()){
+            if(position.getIndex() + 1 < input.length() && input.charAt(position.getIndex()) == '$' && input.charAt(position.getIndex() + 1) == '{'){
+                position.setIndex(position.getIndex() + 2);
+                builder.append(parsePlaceholder0(input, position, player, server, null));
                continue;
            }
            
-            if(next != '{'){
-                if(next == '\0')
-                    continue;
-                
-                builder.append(next);
-                i++;
-                continue;
-            }
-            
-            i++;
-            
-            boolean identified = false;
-            boolean invalid = true;
-            
-            while(++i < chars.length){
-                final char id = chars[i];
-                
-                if(id == '}'){
-                    invalid = false;
-                    break;
-                }
-                
-                if(id == ' ' && !identified){
-                    identified = true;
-                    continue;
-                }
-                
-                if(identified){
-                    placeholder.append(id);
-                }else{
-                    identifier.append(id);
-                }
-            }
-            
-            String identifierString = identifier.toString();
-            String placeholderString = placeholder.toString();
-            
-            identifier.setLength(0);
-            placeholder.setLength(0);
-            
-            if(invalid){
-                builder.append("${").append(identifierString);
-                
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-                continue;
-            }
-            
-            PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierString);
-            if(provider == null){
-                builder.append("${").append(identifierString);
-    
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-                
-                builder.append('}');
-                continue;
-            }
-            
-            String replacement = provider.parsePlaceholder(placeholderString, player, server);
-            if(replacement == null){
-                builder.append("${").append(identifierString);
-    
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-    
-                builder.append('}');
-                continue;
-            }
-            
-            builder.append(replacement);
+            builder.append(input.charAt(position.getIndex()));
+            position.setIndex(position.getIndex() + 1);
        }
        
        return builder.toString();
    }
+    
+    public static PlaceholderToken.Placeholder parsePlaceholder(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        return new PlaceholderToken.Placeholder(parsePlaceholder0(input, position, player, server, collector));
+    }
+    
+    private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        AdvancedServerListAPI api = AdvancedServerList.getApi();
+        
+        int placeholderStart = position.getIndex() - 2;
+        int index = position.getIndex();
+        
+        StringBuilder identifier = new StringBuilder();
+        StringBuilder values = new StringBuilder();
+        
+        boolean identified = false;
+        boolean invalid = true;
+        
+        char[] chars = input.substring(index).toCharArray();
+        for(final char c : chars){
+            index++;
+            
+            if(c == '}'){
+                invalid = false;
+                break;
+            }
+            
+            if(c == ' ' && !identified){
+                identified = true;
+                continue;
+            }
+            
+            if(identified){
+                values.append(c);
+            }else{
+                identifier.append(c);
+            }
+        }
+        
+        String identifierStr = identifier.toString();
+        String valuesStr = values.toString();
+        
+        StringBuilder raw = new StringBuilder();
+        
+        // Condition parsing needs one extra increase of index... for some reason
+        if(collector != null)
+            index++;
+        
+        position.setIndex(index);
+        
+        if(invalid){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
+            
+            return raw.toString();
+        }
+        
+        PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierStr);
+        if(provider == null){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            raw.append('}');
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+            
+            return raw.toString();
+        }
+        
+        String replacement = provider.parsePlaceholder(valuesStr, player, server);
+        if(replacement == null){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            raw.append('}');
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+            
+            return raw.toString();
+        }
+        
+        return replacement;
+    }
 }
@@ -8,28 +8,28 @@
      Object summaries
    -->
    {% if page.meta.constructors %}
-      {{ info.summary('Constructor Summary', page.meta.constructors, details_type='constructor') }}
+      {{ info.summary('Constructor Summary', page.meta.constructors, details_type='constructor', defaults=page.meta.defaults) }}
    {% endif %}
    {% if page.meta.classes %}
-      {{ info.summary('Class Summary', page.meta.classes, details_type='class') }}
+      {{ info.summary('Class Summary', page.meta.classes, details_type='class', defaults=page.meta.defaults) }}
    {% endif %}
    {% if page.meta.enums %}
-      {{ info.summary('Enum Constant Summary', page.meta.enums, details_type='enum') }}
+      {{ info.summary('Enum Constant Summary', page.meta.enums, details_type='enum', defaults=page.meta.defaults) }}
    {% endif %}
    {% if page.meta.methods or page.meta.inherits %}
-      {{ info.summary('Method Summary', page.meta.methods, page.meta.inherits, details_type='method') }}
+      {{ info.summary('Method Summary', page.meta.methods, page.meta.inherits, details_type='method', defaults=page.meta.defaults) }}
    {% endif %}
    <!--
      Detailed object info
    -->
    {% if page.meta.constructors %}
-      {{ info.info('Constructor Detail', page.meta.constructors) }}
+      {{ info.info('Constructor Detail', page.meta.constructors, defaults=page.meta.defaults) }}
    {% endif %}
    {% if page.meta.enums %}
-      {{ info.info('Enum Constant Detail', page.meta.enums, true) }}
+      {{ info.info('Enum Constant Detail', page.meta.enums, true, defaults=page.meta.defaults) }}
    {% endif %}
    {% if page.meta.methods %}
-      {{ info.info('Method Detail', page.meta.methods)}}
+      {{ info.info('Method Detail', page.meta.methods, defaults=page.meta.defaults)}}
    {% endif %}
  {% endif %}
 {% endblock %}
@@ -1,4 +1,4 @@
-{% macro summary(title, summaries, inherits, details_type = 'unknown') -%}
+{% macro summary(title, summaries, inherits, details_type = 'unknown', defaults = []) -%}
  <h2 id="{{ title | lower() | replace(' ', '-') |  e}}">
    {{ title }}
  </h2>
@@ -28,6 +28,8 @@
                
                {% if summary.type and summary.type.name %}
                  {% set modifiers.name = modifiers.name ~ summary.type.name %}
+                {% elif defaults and defaults.type and defaults.type.name %}
+                  {% set modifiers.name = modifiers.name ~ defaults.type.name %}
                {% else %}
                  {% set modifiers.name = modifiers.name ~ "void" %}
                {% endif %}
@@ -103,7 +105,7 @@
  </div>
 {%- endmacro %}

-{% macro info(title, details, enum = false) -%}
+{% macro info(title, details, enum = false, defaults = []) -%}
  <h2 id="{{ title | lower() | replace(' ', '-') | e}}">
    {{ title }}
  </h2>
@@ -144,6 +146,14 @@
          {% else %}
            <span class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</span>
          {% endif %}
+        {% elif defaults and defaults.type %}
+          {% if defaults.type.link %}
+            <a href="{{ defaults.type.link }}" class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') | e }}</a>
+          {% else %}
+            <span class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') }}</span>
+          {% endif %}
+        {% else %}
+          <span class="api-type__primitive">void</span>
        {% endif %}
        <code>{{ final_name.name | e }}</code><a href="#{{ final_name.name | lower() | replace(' ', '-') | e }}" class="headerlink" title="Permanent link">¶</a>
      </h3>
@@ -32,6 +32,26 @@ Placeholders for the plugin [AdvancedBan](https://www.spigotmc.org/resources/869
    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
    Example: `${advancedban banExpiration yyyy-MM-dd HH:mm:ss}`

+### LibertyBans
+
+Placeholders for the plugin [LibertyBans](https://modrinth.com/plugin/libertybans/){ target="_blank" rel="nofollow" } are available to use.
+
+| Placeholder                     | Description                                                                              |
+|---------------------------------|------------------------------------------------------------------------------------------|
+| `${libertybans isMuted}`        | Whether the player is muted or not.                                                      |
+| `${libertybans muteReason}`     | The reason for why the player was muted. Returns invalid placeholder if no mute was set. |
+| `${libertybans muteExpiration}` | Date on when the mute will expire.[^5]                                                   |
+| `${libertybans isBanned}`       | Whether the player is banned or not.                                                     |
+| `${libertybans banReason}`      | The reason for why the player was banned. Returns invalid placeholder if no ban was set. |
+| `${libertybans banExpiration}`  | Date on when the ban will expire.[^6]                                                    |
+
+[^5]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${libertybans muteExpiration yyyy-MM-dd HH:mm:ss}`
+[^6]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${libertybans banExpiration yyyy-MM-dd HH:mm:ss}`
+
 ## Example

 ```yaml title="banned.yml"
@@ -7,6 +7,85 @@ icon: octicons/log-24
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.

+## v3.2.1 { #v3.2.1 }
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v3.2.1-changed }
+
+- Removed usage of `${api.version}` in the different pom.xml for version resolving.
+
+## v3.2.0 { #v3.2.0 }
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.2.0-added }
+
+- New setter methods added to [`ProfileEntry.Builder`][profileentry.builder] class, replacing old ones (See deprecations below):
+    - [`extraPlayersCount(Integer)`][extraplayerscount]
+    - [`extraPlayersEnabled(NullBool)`][extraplayersenabled]
+    - [`favicon(String)`][favicon]
+    - [`hidePlayersEnabled(NullBool)`][hideplayersenabled]
+    - [`maxPlayersCount(Integer)`][maxplayerscount]
+    - [`maxPlayersEnabled(NullBool)`][maxplayersenabled]
+    - [`motd(List<String>)`][motd]
+    - [`playerCountText(String)`][playercounttext]
+    - [`players(List<String>)`][players]
+
+[extraplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayerscount(integer)
+[extraplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayersenabled(nullbool)
+[favicon]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#favicon(string)
+[hideplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayersenabled(nullbool)
+[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayerscount(integer)
+[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayersenabled(nullbool)
+[motd]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#motd(list<string>)
+[playercounttext]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#playercounttext(string)
+[players]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#players(list<string>)
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v3.2.0-changed }
+
+- The API has been moved to Codeberg and is now available under a new repository URL to download. The group and artifact ID remained the same, but version no longer has a `v` prefix:
+    
+    /// tab | ":simple-apachemaven: Maven (pom.xml)"
+    ```xml
+    <repositories>
+      <repository>
+        <id>codeberg</id>
+        <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+      </repository>
+    </repositories>
+    
+    <dependencies>
+      <dependency>
+        <groupId>ch.andre601.asl-api</groupId>
+        <artifactId>api</artifactId>
+        <version>{apiVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+    </dependencies>
+    ```
+    ///
+    /// tab | ":simple-gradle: Gradle (build.gradle)"
+    ```groovy
+    repositories {
+        maven = { url ="https://codeberg.org/api/packages/Andre601/maven/" }
+    }
+    
+    dependencies {
+        compileOnly "ch.andre601.asl-api:api:{apiVersion}"
+    }
+    ```
+    ///
+
+### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v3.2.0-deprecated }
+
+- Setters in [`ProfileEntry.Builder`][profileentry.builder] deprecated in favour of more consistent method naming.
+    - `setExtraPlayersCount(Integer)`
+    - `setExtraPlayersEnabled(NullBool)`
+    - `setFavicon(String)`
+    - `setHidePlayersEnabled(NullBool)`
+    - `setMaxPlayersCount(Integer)`
+    - `setMaxPlayersEnabled(NullBool)`
+    - `setMotd(List<String>)`
+    - `setPlayerCountText(String)`
+    - `setPlayers(List<String>)`
+
 ## v3.1.0 { #v3.1.0 }

 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.1.0-added }
@@ -111,6 +190,6 @@ Templates for changelog
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v-added }
 ### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v-changed }
 ### :octicons-trash-24:{ .changelog-removed title="Removed" } Removed { #v-removed }
-### :octicons-zap-24:{ .changelog-deprecated title="Deprecated" } Deprecated { #v-deprecated }
+### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v-deprecated }

 -->
@@ -4,8 +4,7 @@ icon: octicons/command-palette-24

 # API

-AdvancedServerList v2 introduced a new API that plugins can hook into to use.  
-It provides a way for your plugin to provide its own placeholders that should be parsed by AdvancedServerList and also an event to modify the server list.
+AdvancedServerList offers an API that other plugins can use to add their own placeholder to the plugin, listen for specific events or even modify Server List Profiles on the fly.

 ## Add dependency

@@ -15,8 +14,8 @@ Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depend
 ```xml title="pom.xml"
 <repositories>
  <repository>
-    <id>jitpack</id>
-    <url>https://jitpack.io/</url>
+    <id>codeberg</id>
+    <url>https://codeberg.org/api/packages/Andre601/maven/</url>
  </repository>
 </repositories>

@@ -54,7 +53,7 @@ Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depend
 /// tab | :simple-gradle: Gradle
 ```groovy title="build.gradle"
 repositorories {
-    maven { url = 'https://jitpack.io/' }
+    maven { url = 'https://codeberg.org/api/packages/Andre601/maven/' }
 }

 dependencies {
@@ -71,7 +70,7 @@ dependencies {
 /// tab | :simple-gradle: Gradle (KTS)
 ```kotlin title="build.gradle.kts"
 repositories {
-    maven("https://jitpack.io")
+    maven("https://codeberg.org/api/packages/Andre601/maven/")
 }

 dependencies {
@@ -1,7 +1,7 @@
 ---
 template: redirect.html

-location: https://docs.andre601.ch/asl-api
+location: https://jd.andre601.ch

 title: Javadocs
 icon: octicons/link-external-24
@@ -1,59 +1,213 @@
 ---
 template: api-doc.html

+defaults:
+  type:
+    name: 'Builder'
+    type: 'object'
+
 constructors:
  - name: 'Builder'
+    description: 'Empty Builder Constructor used to create a new instance of this class.'
  
 methods:
-  - name: 'setMotd'
+  - name: 'extraPlayersCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<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>.
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: 'Integer'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+  - name: 'extraPlayersEnabled'
+    description: |
+      Sets whether the extra players feature should be enabled or not.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    parameters:
+      - name: 'extraPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.
+  - name: 'favicon'
+    description: |
+      Sets the value to use for the favicon.<br>
+      The following values are supported:
+      <ul>
+      <li>URL to a valid PNG file.</li>
+      <li>File name (with <code>.png</code> extension) matching a file saved in the favicons folder of AdvancedServerList.</li>
+      <li><code>${player uuid}</code> to display the avatar of the player.
+      </ul>
+      Set to an empty String or <code>null</code> to not alter the Favicon.
+    parameters:
+      - name: 'favicon'
+        description: 'The favicon to set.'
+        type: 'String'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the Favicon has been set. Useful for chaining.'
+  - name: 'hidePlayersEnabled'
+    description: |
+      Sets whether the player count should be hidden or not.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    parameters:
+      - name: 'hidePlayersEnabled'
+        description: 'Whether the player count should be hidden or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        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>
+      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>.
+    parameters:
+      - name: 'maxPlayersCount'
+        description: 'The number of max players to set.'
+        type: 'Integer'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the max player count has been set. Useful for chaining.'
+  - name: 'maxPlayersEnabled'
+    description: |
+      Sets whether the max players feature should be enabled.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.<br>
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should maxPlayersEnabled be null.
+    parameters:
+      - name: 'maxPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'motd'
    description: |
      Sets a new MOTD to use.<br>
      <br>
      Set to an empty list to not change the MOTD.<br>
-      Only the first two entries of the list will be considered and any additional ones discarded.
-    returns: 'This Builder after the motd has been set. Useful for chaining.'
+      Only the first two entries of the list will be considered and any additional ones discarded.<br>
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided motd list be null.
    parameters:
      - name: 'motd'
        description: 'The MOTD to use.'
        type: 'List<String>'
-        attributes:
-          - notnull
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the motd has been set. Useful for chaining.'
    throws:
      - name: 'IllegalArgumentException'
        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayers'
-    description: |
-      Sets the players (lines) to use for the hover.<br>
-      <br>
-      Set to an empty list to not change the hover text.
-    returns: 'This Builder after the players have been set. Useful for chaining.'
-    parameters:
-      - name: 'players'
-        description: 'The lines to set for the hover.'
-        type: 'List<String>'
-        attributes:
-          - notnull
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayerCountText'
+  - name: 'playerCountText'
    description: |
      Sets the text to override the player count with.<br>
      <br>
      Set to an empty String or <code>null</code> to not alter the player count text.
-    returns: 'This Builder after the player count text has been set. Useful for chaining.'
    parameters:
      - name: 'playerCountText'
        description: 'The text to show in the player count.'
-        type: String
-        attributes:
+        type: 'String'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the player count text has been set. Useful for chaining.'
+  - name: 'players'
+    description: |
+      Sets the players (lines) to use for the hover.<br>
+      <br>
+      Set to an empty list to not change the hover text.
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided okayersmotd list be null.
+    parameters:
+      - name: 'players'
+        description: 'The lines to set for the hover.'
+        type: 'List<String>'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the players have been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'build'
+    description: 'Creates a new <a href="./.."><code>ProfileEntry</code> instance</a> with the values set in this Builder.'
+    returns: 'New <a href="./.."><code>ProfileEntry</code> instance</a>.'
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: './..'
+  #
+  # Deprecated stuff
+  #
+  - name: 'setExtraPlayerCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<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>.
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: Integer
+        attribute:
          - nullable
+    deprecated: 'Typo in the name. Use <a href="#setextraplayerscount(integer)">setExtraPlayersCount(Integer)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setExtraPlayersCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<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>.
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: Integer
+        attribute:
+          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayerscount(integer)">extraPlayersCount(Integer)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setExtraPlayersEnabled'
+    description: |
+      Sets whether the extra players feature should be enabled or not.<br>
+      <br>
+      Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: NullBool
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayersenabled(nullbool)">extraPlayersEnabled(NullBool)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
    type:
      name: 'Builder'
      type: 'object'
@@ -71,8 +225,9 @@ methods:
      - name: 'favicon'
        description: 'The favicon to set'
        type: String
-        attributes:
+        attribute:
          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#favicon(string)">favicon(String)</a> instead.'
    type:
      name: 'Builder'
      type: 'object'
@@ -86,83 +241,15 @@ methods:
      - name: 'hidePlayersEnabled'
        description: 'Whether the player count should be hidden or not.'
        type: NullBool
-        attributes:
+        attribute:
          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#hideplayersenabled(nullbool)">hidePlayersEnabled(NullBool)</a> instead.'
    throws:
      - name: 'IllegalArgumentException'
        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
    type:
      name: 'Builder'
      type: 'object'
-  - name: 'setExtraPlayersEnabled'
-    description: |
-      Sets whether the extra players feature should be enabled or not.<br>
-      <br>
-      Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
-    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersEnabled'
-        description: 'Whether the extra players feature should be enabled or not.'
-        type: NullBool
-        attributes:
-          - notnull
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setMaxPlayersEnabled'
-    description: |
-      Sets whether the max players feature should be enabled.<br>
-      <br>
-      Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
-    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
-    parameters:
-      - name: 'maxPlayersEnabled'
-        description: 'Whether the extra players feature should be enabled or not.'
-        type: NullBool
-        attributes:
-          - notnull
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setExtraPlayerCount'
-    description: |
-      Sets the number of players to add to the online players to use as the new max players value.<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>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersCount'
-        description: 'The number of extra players to add.'
-        type: Integer
-        attributes:
-          - nullable
-    deprecated: 'Typo in the name. Use <a href="#setextraplayerscount(integer)">setExtraPlayersCount(Integer)</a> instead.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setExtraPlayersCount'
-    description: |
-      Sets the number of players to add to the online players to use as the new max players value.<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>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
-    parameters:
-      - name: 'extraPlayersCount'
-        description: 'The number of extra players to add.'
-        type: Integer
-        attributes:
-          - nullable
-    type:
-      name: 'Builder'
-      type: 'object'
  - name: 'setMaxPlayersCount'
    description: |
      Sets the number of max players allowed to join this server.<br>
@@ -174,18 +261,86 @@ methods:
      - name: 'maxPlayersCount'
        description: 'The number of max players to set.'
        type: Integer
-        attributes:
+        attribute:
          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayerscount(integer)">maxPlayersCount(Integer)</a> instead.'
    type:
      name: 'Builder'
      type: 'object'
-  - name: 'build'
-    description: 'Creates a new <a href="./.."><code>ProfileEntry</code> instance</a> with the values set in this Builder.'
-    returns: 'New <a href="./.."><code>ProfileEntry</code> instance</a>.'
+  - name: 'setMaxPlayersEnabled'
+    description: |
+      Sets whether the max players feature should be enabled.<br>
+      <br>
+      Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    parameters:
+      - name: 'maxPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: NullBool
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled(NullBool)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
    type:
-      name: 'ProfileEntry'
+      name: 'Builder'
+      type: 'object'
+  - name: 'setMotd'
+    description: |
+      Sets a new MOTD to use.<br>
+      <br>
+      Set to an empty list to not change the MOTD.<br>
+      Only the first two entries of the list will be considered and any additional ones discarded.
+    returns: 'This Builder after the motd has been set. Useful for chaining.'
+    parameters:
+      - name: 'motd'
+        description: 'The MOTD to use.'
+        type: 'List<String>'
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#motd(string)">motd(String)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setPlayerCountText'
+    description: |
+      Sets the text to override the player count with.<br>
+      <br>
+      Set to an empty String or <code>null</code> to not alter the player count text.
+    returns: 'This Builder after the player count text has been set. Useful for chaining.'
+    parameters:
+      - name: 'playerCountText'
+        description: 'The text to show in the player count.'
+        type: String
+        attribute:
+          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#playercounttext(string)">playerCountText(String)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setPlayers'
+    description: |
+      Sets the players (lines) to use for the hover.<br>
+      <br>
+      Set to an empty list to not change the hover text.
+    returns: 'This Builder after the players have been set. Useful for chaining.'
+    parameters:
+      - name: 'players'
+        description: 'The lines to set for the hover.'
+        type: 'List<String>'
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#players(list<string>)">players(List&lt;String&gt;)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+    type:
+      name: 'Builder'
      type: 'object'
-      link: './..'
 ---

 # <api__class></api__class> Builder
@@ -1,10 +1,10 @@
 ---
 template: redirect.html

-location: https://github.com/Andre601/asl-api
+location: https://codeberg.org/Andre601/asl-api

 title: Source Code
-icon: octicons/mark-github-16
+icon: simple/codeberg
 ---

 <!-- Comment to trigger proper build -->
@@ -1,5 +1,5 @@
 document$.subscribe(async () => {
-    const url = 'https://codeberg-stats-proxy.vercel.app/repo'
+    const url = 'https://codeberg-stats-proxy.vercel.app'
    const repo_stats = document.querySelector('[data-md-component="source"] .md-source__repository');
    
    function loadCodebergInfo(data) {
@@ -31,7 +31,7 @@ document$.subscribe(async () => {
        const versionToken = '{apiVersion}';
        const codeBlocks = document.querySelectorAll('.md-content pre code');
        for(const codeBlock of codeBlocks) {
-            codeBlock.innerHTML = codeBlock.innerHTML.replace(new RegExp(versionToken, 'g'), version);
+            codeBlock.innerHTML = codeBlock.innerHTML.replace(new RegExp(versionToken, 'g'), version.substring(1));
        }
    }
    
@@ -45,10 +45,10 @@ document$.subscribe(async () => {
    }
    
    async function fetchApiInfo() {
-        const tag = await fetch("https://api.github.com/repos/Andre601/asl-api/releases/latest").then(_ => _.json());
+        const tag = await fetch(`${url}/api/latest-release`).then(_ => _.json());
        
        const data = {
-            "version": tag.tag_name
+            "version": tag.name
        };
        
        __md_set("__api_tag", data, sessionStorage);
@@ -57,8 +57,8 @@ document$.subscribe(async () => {
    
    async function fetchInfo() {
        const [release, repo] = await Promise.all([
-            fetch(`${url}/latest-release`).then(_ => _.json()),
-            fetch(`${url}/stats`).then(_ => _.json()),
+            fetch(`${url}/repo/latest-release`).then(_ => _.json()),
+            fetch(`${url}/repo/stats`).then(_ => _.json()),
        ]);
        
        const data = {
@@ -0,0 +1,23 @@
+:root {
+    --admonition-icon--file: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path d="M3 3a2 2 0 0 1 2-2h9.982a2 2 0 0 1 1.414.586l4.018 4.018A2 2 0 0 1 21 7.018V21a2 2 0 0 1-2 2H4.75a.75.75 0 0 1 0-1.5H19a.5.5 0 0 0 .5-.5V8.5h-4a2 2 0 0 1-2-2v-4H5a.5.5 0 0 0-.5.5v6.25a.75.75 0 0 1-1.5 0Zm12-.5v4a.5.5 0 0 0 .5.5h4a.5.5 0 0 0-.146-.336l-4.018-4.018A.5.5 0 0 0 15 2.5Z"></path><path d="M4.53 12.24a.75.75 0 0 1-.039 1.06l-2.639 2.45 2.64 2.45a.75.75 0 1 1-1.022 1.1l-3.23-3a.75.75 0 0 1 0-1.1l3.23-3a.75.75 0 0 1 1.06.04Zm3.979 1.06a.75.75 0 1 1 1.02-1.1l3.231 3a.75.75 0 0 1 0 1.1l-3.23 3a.75.75 0 1 1-1.021-1.1l2.639-2.45-2.64-2.45Z"></path></svg>');
+    
+    --admonition-color-fg--file: #00c853;
+    --admonition-color-bg--file: #00c8531a;
+}
+
+.md-typeset .admonition.file,
+.md-typeset details.file {
+    border-color: var(--admonition-color-fg--file);
+}
+
+.md-typeset .file > .admonition-title,
+.md-typeset .file > summary {
+    background-color: var(--admonition-color-bg--file);
+}
+
+.md-typeset .file > .admonition-title::before,
+.md-typeset .file > summary::before {
+    background-color: var(--admonition-color-fg--file);
+    -webkit-mask-image: var(--admonition-icon--file);
+            mask-image: var(--admonition-icon--file);
+}
@@ -5,7 +5,7 @@ icon: octicons/milestone-24
 # Getting Started

 This page will explain how to set up AdvancedServerList and make it work for your server.  
-It tries to be an easy to understand as possible. But if you still have problems, consider joining the [Discord Server](https://discord.gg/6dazXp6) for help.
+It tries to be as easy to understand as possible. But if you still have problems, consider joining the [Discord Server](https://discord.gg/6dazXp6) for help.

 ## 1. Download the plugin { #download-the-plugin }

@@ -53,46 +53,67 @@ The plugin also supports these additional plugins. They are all optional.
 <div class="grid cards" markdown>

 -   [**PlaceholderAPI**][placeholderapi]
-
+    
    ----
    
-    Supported on:
+    AdvancedServerList supports the use of placeholder from PlaceholderAPI in all its text options, excluding the `condition` option.
    
-    - :fontawesome-solid-paper-plane: Paper
+    ----
+    
+    **Supported on:**  
+    :fontawesome-solid-paper-plane: Paper

 -   [**ViaVersion**][viaversion]
    
    ----
    
-    Supported on:
+    When installed will AdvancedServerList use ViaVersion to resolve the protocol version of a player for its PlaceholderAPI placeholders.
    
-    - :fontawesome-solid-paper-plane: Paper
+    ----
+
+    **Supported on:**  
+    :fontawesome-solid-paper-plane: Paper

 -   [**PAPIProxyBridge**][papiproxybridge]
    
    ----
    
-    Supported on:
+    Allows AdvancedServerList to parse placeholders from PlaceholderAPI while being used on a proxy.
    
-    - :simple-spigotmc: BungeeCord
-    - :fontawesome-solid-paper-plane: Velocity
+    ----
+
+    **Supported on:**  
+    :simple-spigotmc: BungeeCord, :fontawesome-solid-paper-plane: Velocity

 -   [**Maintenance**][maintenance]
    
    ----
    
-    Supported on:
+    AdvancedServerList will disable any modification of the server list entry should Maintenance mode be enabled.
    
-    - :fontawesome-solid-paper-plane: Paper
-    - :simple-spigotmc: BungeeCord
-    - :fontawesome-solid-paper-plane: Velocity
+    ----
+
+    **Supported on:**  
+    :fontawesome-solid-paper-plane: Paper, :simple-spigotmc: BungeeCord, :fontawesome-solid-paper-plane: Velocity
+
+-   [**BanPlugins Addon**][addon]
    
+    ----
+    
+    Official Add-on for AdvancedServerList that adds placeholders for different Ban/Punishment plugins such as AdvancedBan and LibertyBans.
+    
+    ----
+
+    **Supported on:**  
+    :fontawesome-solid-paper-plane: Paper, :simple-spigotmc: BungeeCord, :fontawesome-solid-paper-plane: Velocity
+
 </div>

 [placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
 [viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
 [papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
 [maintenance]: https://hangar.papermc.io/kennytv/Maintenance
+[addon]: ../addons/banplugins.md

 ## 2. Installation { #installation }

@@ -130,6 +151,8 @@ The profiles folder is home of the server list profile files which allow you to
 On first creation will the folder have a `default.yml` file. This file contains all the options available to use alongside comments to try and help you in using it properly.

 /// details | default.yml content
+    type: file
+
 ```yaml
 #
 # Set the priority of this profile.
@@ -310,12 +333,15 @@ These functions include, but aren't limited to:
 - Disabling/Enabling caching of players.
 - Disabling/Enabling checking for updates.
 - Disabling/Enabling debug mode.
+- Setting how long favicons should be cached for.
 - The config version used for migration. Don't touch this, or it may reset your config.

 Similar to the default.yml is this file containing comments to try and explain the settings in questions.  
 Do note that if the config gets migrated from an older version, that the comments will be discarded in the process, unfortunately.

 /// details | default config.yml content
+    type: file
+
 ```yaml
 #
 # Used for when AdvancedServerList doesn't have a cached player to use for player placeholders.
@@ -361,13 +387,21 @@ checkUpdates: true
 #
 debug: false

+#
+# Sets the time in minutes for favicons to be cached.
+# The number cannot be less than 1.
+#
+# Defaults to 1 if not set.
+#
+faviconCacheTime: 1
+
 #
 # DO NOT EDIT!
 #
 # This is used internally to determine if the config needs to be migrated.
 # Changing or even removing this option could result in your config being broken.
 #
-config-version: 2
+config-version: 4
 ```
 ///

@@ -375,18 +409,22 @@ config-version: 2

 There are certain files and folders that get created when certain events happen:

- A `playercache.json` file will be created on plugin shutdown containing a list of IPs, UUIDs and Player names for every player that joined the server while AdvancedServerList was running.  
-    This file allows to replace `${player name}` and `${player uuid}` with their name or UUID respectively, while they are not on the server, by using the IP they used to join with.  
-    This file is not created nor updated when `disableCache` is set to `true` in the config.yml
+- A `playercache.json` file will be created on plugin shutdown containing a collection of IPs, UUIDs and Player names for every player that joined the server while AdvancedServerList was running.  
+    This file is used to identify a player through their last used IP, to replace placeholders such as `${player name}` or `${player uuid}` with their respective values using the cached data.  
+    This file is not created, used nor updated when `disableCache` is set to `true` in the config.yml
 - A `backups` folder containing old config.yml files.  
-    This folder is created when AdvancedServerList migrates your old config to a new version. This allows you to transfer settings over in case the migration didn't work properly.
+    This folder is created when AdvancedServerList migrates your old config to a new version. This allows you to transfer settings over in case the migration didn't work properly.  
+    Each backup will have the name pattern `config-<date>.yml` with `<date>` being the date and time of when this file has been created.

 ## 3. Creating your first profile { #creating-your-first-profile }

 Creating your first profile is relatively simple.

-To start, open the `default.yml` file located inside the `profiles` folder using a file editor of your choice (VSCode or Notepad++ are recommended). It should contain all the available options for a server list profile.  
-Next can you edit the options available to whatever you like. All text options (Except [condition](../profiles/index.md#condition)) support [MiniMessage formatting](../profiles/formatting.md).
+It's best to open the `default.yml` file located inside `profiles` with the file editor of your choice ([:simple-vscodium: VSCodeium](https://vscodium.com/) or [:simple-notepadplusplus: Notepad++](https://notepad-plus-plus.org/) are recommended).  
+This file should contain all available options that you can set and alter.
+
+Edit the options to whatever you like. All text-based options, except [`condition`](../profiles/index.md#condition), support [MiniMessage formatting](../profiles/formatting.md).  
+The [`motd`](../profiles/index.md#motd) option also supports Hexadecimal colors, assuming the server/proxy runs at least MC 1.16.

 If you're unsure how a specific option should look like, head over to the [Profiles page](../profiles/index.md) for more information about the general structure.  
 All you need to know is, that a bare-bones server list profile requires a valid [priority](../profiles/index.md#priority) and at least one of the settings to be present.
@@ -402,7 +440,7 @@ motd:

 ### Additional profiles

-To add additional profiles, create a new YAML file inside the `profiles` folder. The name doesn't matter, but it is recommended to keep it lowercase, use alphanumeric characters (`a-z, 0-9`), hyphens (`-`), underscores (`_`) and avoid spaces.
+To add additional profiles, create a new YAML file inside the `profiles` folder. The name doesn't matter, but it is recommended to keep it lowercase, use alphanumeric characters (`a-z, 0-9`), hyphens (`-`), underscores (`_`) and avoid spaces. You should also name it after what it is for, to have it more easily organized.

 Inside the file, add a priority and at least one setting, similar to the above shown example.  
 This would already be enough to have a valid profile, but depending on the priority and file name may the file not be used, or used over other profiles.
@@ -411,7 +449,7 @@ If you want to only show this file under specific situations can you use the [`c
 The condition option would have a single String containing one or muliple [Expressions](../profiles/expressions.md). Only if the condition would return true, would the profile be displayed, granted that it has a higher priority than any other valid file with a true condition output.

 /// info | Note
-Profiles which do not have any conditions, or have an empty condition, will always considered to have a true condition, meaning that a profile with higher priority and no condition will be selected over a profile with lower priority and a condition, even if said condition returns true.
+Profiles which do not have any conditions, or have an empty condition, will always be considered to have a true condition, meaning that a profile with higher priority and no condition will be selected over a profile with lower priority and a condition, even if said condition returns true.
 ///

 Here is another example profile using conditions to show it when the player was banned on the server:
@@ -431,7 +469,7 @@ The [Examples page](../examples/index.md) contains more examples of different se
 ## 4. Loading profiles { #loading-profiles }

 Once you've set up your server list profile(s) is it time to load it/them.  
-To do this, simply run `/asl reload` as player (Requires permission `advancedserverlist.admin` or `advancedserverlist.command.reload`) or through the Server/Proxy console.
+To do this, simply run `/asl reload` as player (Requires permission `advancedserverlist.admin` or `advancedserverlist.command.reload`) or `asl reload` through the Server/Proxy console.

 The plugin should then load any valid YAML file inside the `profiles` folder to then use.

@@ -33,7 +33,7 @@ The following cases are considered literal values:
 Any number is considered an expression, meaning the below examples are considered valid:

 /// example | Examples
-```
+```shell
 0
 1000
 -7
@@ -53,7 +53,7 @@ To avoid this is it very important to always surround Strings with single or dou
 ///

 /// example | Examples
-```
+```shell
 "Hello World!"
 ""
 ```
@@ -68,7 +68,7 @@ Strings `true` and `false` are treated as boolean literals.
 Any [placeholder](placeholders.md) is a valid expression.

 /// example | Examples
-```
+```shell
 ${player protocol}
 ${player name}

@@ -110,7 +110,7 @@ These additional binary operators can also be used to perform certain actions:
 | `/`      | Divides one number by another. Strings use their text length as number.     |

 /// example | Examples
-```
+```shell
 ${player name} != "Anonymous"
 763 > ${player protocol} > 758
 ${player hasPlayedBefore} and ${player isBanned} == "false"
@@ -126,7 +126,7 @@ Parenthesis can be used to prevent ambiguities.

 `!` can be used to negate boolean expressions.

-```
+```shell
 !${player isWhitelisted}
 ```

@@ -51,6 +51,7 @@ extra_css:
  - assets/stylesheets/custom.css
  - assets/stylesheets/api-docs.css
  - assets/stylesheets/admo.css
+  - assets/stylesheets/admonition.css

 extra_javascript:
  - assets/js/repo-stats.js
@@ -92,7 +92,7 @@
        <dependency>
            <groupId>com.viaversion</groupId>
            <artifactId>viaversion-api</artifactId>
-            <version>4.9.2</version>
+            <version>4.9.3</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -39,11 +39,16 @@ import ch.andre601.advancedserverlist.paper.objects.placeholders.PaperServerPlac
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.CachedServerIcon;

 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;

 public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon>{
    
@@ -68,7 +73,7 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
            }
        }
        
-        this.core = AdvancedServerList.init(this, new PaperPlayerPlaceholders(), new PaperServerPlaceholders());
+        this.core = AdvancedServerList.init(this, new PaperPlayerPlaceholders(), new PaperServerPlaceholders(this));
        
        if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
            papiPlaceholders = new PAPIPlaceholders(this);
@@ -171,6 +176,21 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
        return (worldCache = new WorldCache());
    }
    
+    public int getPlayersOnline(World world){
+        List<? extends Player> players = new ArrayList<>(world == null ? getServer().getOnlinePlayers() : world.getPlayers());
+        
+        players.removeIf(player -> {
+            for(MetadataValue metadata : player.getMetadata("vanished")){
+                if(metadata.asBoolean())
+                    return true;
+            }
+            
+            return false;
+        });
+        
+        return players.size();
+    }
+    
    private void printNoPaperWarning(){
        getPluginLogger().warn("======================================================================================");
        getPluginLogger().warn("THIS SERVER DOES NOT USE PAPER OR A COMPATIBLE FORK!");
@@ -145,7 +145,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    
    @Override
    public int getOnlinePlayers(){
-        return event.getNumPlayers();
+        return plugin.getPlayersOnline(null);
    }
    
    @Override
@@ -178,7 +178,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    
    @Override
    public PaperPlayerImpl createPlayer(CachedPlayer player, int protocol){
-        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
+        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.uuid());
        
        return new PaperPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
    }
@@ -40,9 +40,9 @@ public class PaperPlayerImpl extends GenericPlayerImpl implements BukkitPlayer{
    public PaperPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
        this.player = player;
        
-        this.name = player == null ? cachedPlayer.getName() : player.getName();
+        this.name = player == null ? cachedPlayer.name() : player.getName();
        this.protocol = protocol;
-        this.uuid = player == null ? cachedPlayer.getUuid() : player.getUniqueId();
+        this.uuid = player == null ? cachedPlayer.uuid() : player.getUniqueId();
        
        if(player == null)
            return;
@@ -28,15 +28,20 @@ package ch.andre601.advancedserverlist.paper.objects.placeholders;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.paper.PaperCore;
 import ch.andre601.advancedserverlist.paper.objects.impl.PaperServerImpl;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

 public class PaperServerPlaceholders extends PlaceholderProvider{
    
-    public PaperServerPlaceholders(){
+    private final PaperCore plugin;
+    
+    public PaperServerPlaceholders(PaperCore plugin){
        super("server");
+        this.plugin = plugin;
    }
+    
    @Override
    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
        if(!(server instanceof PaperServerImpl paperServer))
@@ -58,7 +63,7 @@ public class PaperServerPlaceholders extends PlaceholderProvider{
                        if(world == null)
                            continue;
                        
-                        players += world.getPlayers().size();
+                        players += plugin.getPlayersOnline(world);
                    }
                    
                    yield String.valueOf(players);
@@ -36,12 +36,11 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.commit/>
        
-        <plugin.version>4.2.0</plugin.version>
+        <plugin.version>4.4.0</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
-        <api.version>v3.1.0</api.version>
+        <api.version>3.2.1</api.version>
        
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
@@ -52,6 +51,10 @@
            <id>jitpack</id>
            <url>https://jitpack.io/</url>
        </repository>
+        <repository>
+            <id>codeberg</id>
+            <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+        </repository>
    </repositories>
    
    <modules>
@@ -7,18 +7,28 @@
  ],
  "packageRules": [
    {
-      "description": "Use a specific registry URL for specific dependencies",
+      "description": "Use Jitpack registry for AdvancedBan",
      "matchPackageNames": [
-        "ch.andre601.asl-api:platform-bukkit",
-        "ch.andre601.asl-api:platform-bungeecord",
-        "ch.andre601.asl-api:platform-velocity",
-        "ch.andre601.asl-api:api",
        "com.github.DevLeoko:AdvancedBan"
      ],
      "registryUrls": [
        "https://jitpack.io"
      ]
    },
+    {
+      "description": "Use Codeberg packages for asl-api",
+      "matchPackageNames": [
+        "ch.andre601.asl-api:api",
+        "ch.andre601.asl-api:parent",
+        "ch.andre601.asl-api:platform-bukkit",
+        "ch.andre601.asl-api:platform-bungeecord",
+        "ch.andre601.asl-api:platform-velocity",
+        "ch.andre601:ExpressionParser"
+      ],
+      "registryUrls": [
+        "https://codeberg.org/api/packages/Andre601/maven"
+      ]
+    },
    {
      "description": "Apply label for Bukkit platform",
      "matchFileNames": ["bukkit/pom.xml"],
@@ -1,4 +1,4 @@
-mkdocs-material==9.5.10
+mkdocs-material==9.5.13
 mkdocs-glightbox==0.3.7
 mkdocs-awesome-pages-plugin==2.9.2
 git+https://github.com/Andre601/mkdocs-pagenav-generator
@@ -63,24 +63,38 @@
            <version>${api.version}</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- Velocity API -->
        <dependency>
            <groupId>com.velocitypowered</groupId>
            <artifactId>velocity-api</artifactId>
            <version>3.1.2-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
+        
+        <!-- Metrics -->
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-velocity</artifactId>
            <version>3.0.2</version>
            <scope>compile</scope>
        </dependency>
+        
+        <!-- Configurate -->
        <dependency>
            <groupId>org.spongepowered</groupId>
            <artifactId>configurate-yaml</artifactId>
            <version>4.1.2</version>
            <scope>provided</scope>
        </dependency>
+        
+        <!-- Plugins -->
+        <dependency>
+            <groupId>com.github.LeonMangler</groupId>
+            <artifactId>PremiumVanishAPI</artifactId>
+            <version>2.9.0-4</version>
+            <scope>provided</scope>
+        </dependency>
    </dependencies>
    
    <build>
@@ -33,22 +33,27 @@ import ch.andre601.advancedserverlist.velocity.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.velocity.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.velocity.listeners.PingEvent;
 import ch.andre601.advancedserverlist.velocity.logging.VelocityLogger;
-import ch.andre601.advancedserverlist.velocity.objects.VelocityPlayerPlaceholders;
-import ch.andre601.advancedserverlist.velocity.objects.VelocityServerPlaceholders;
+import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityPlayerPlaceholders;
+import ch.andre601.advancedserverlist.velocity.objects.placeholders.VelocityServerPlaceholders;
 import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
+import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.util.Favicon;
+import de.myzelyam.api.vanish.VelocityVanishAPI;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.slf4j.LoggerFactory;

 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;

 public class VelocityCore implements PluginCore<Favicon>{
    
@@ -71,7 +76,7 @@ public class VelocityCore implements PluginCore<Favicon>{
    
    @Subscribe
    public void init(ProxyInitializeEvent event){
-        this.core = AdvancedServerList.init(this, VelocityPlayerPlaceholders.init(), VelocityServerPlaceholders.init());
+        this.core = AdvancedServerList.init(this, VelocityPlayerPlaceholders.init(), VelocityServerPlaceholders.init(this));
    }
    
    @Subscribe
@@ -154,11 +159,25 @@ public class VelocityCore implements PluginCore<Favicon>{
    }
    
    @Override
-    public Favicon createFavicon(BufferedImage image) throws Exception{
+    public Favicon createFavicon(BufferedImage image){
        return Favicon.create(image);
    }
    
    public ProxyServer getProxy(){
        return proxy;
    }
+    
+    public int getOnlinePlayers(RegisteredServer server){
+        if(getProxy() == null)
+            return -1;
+        
+        List<Player> players = new ArrayList<>(server == null ? getProxy().getAllPlayers() : server.getPlayersConnected());
+        
+        // Exclude players when PremiumVanish is enabled and player is hidden.
+        if(getProxy().getPluginManager().isLoaded("premiumvanish")){
+            players.removeIf(VelocityVanishAPI::isInvisible);
+        }
+        
+        return players.size();
+    }
 }
@@ -35,8 +35,8 @@ import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
-import ch.andre601.advancedserverlist.velocity.objects.VelocityPlayerImpl;
-import ch.andre601.advancedserverlist.velocity.objects.VelocityProxyImpl;
+import ch.andre601.advancedserverlist.velocity.objects.impl.VelocityPlayerImpl;
+import ch.andre601.advancedserverlist.velocity.objects.impl.VelocityProxyImpl;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -44,10 +44,7 @@ import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 import net.kyori.adventure.text.Component;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ExecutionException;

 public class VelocityEventWrapper implements GenericEventWrapper<Favicon, VelocityPlayerImpl>{
@@ -146,7 +143,11 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
    
    @Override
    public int getOnlinePlayers(){
-        return builder.getOnlinePlayers();
+        int players = plugin.getOnlinePlayers(null);
+        if(players == -1)
+            return builder.getOnlinePlayers();
+        
+        return players;
    }
    
    @Override
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.objects;
+package ch.andre601.advancedserverlist.velocity.objects.impl;

 import ch.andre601.advancedserverlist.api.velocity.objects.VelocityPlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -35,9 +35,9 @@ public class VelocityPlayerImpl extends GenericPlayerImpl implements VelocityPla
    private final String version;
    
    public VelocityPlayerImpl(CachedPlayer player, int protocol){
-        this.name = player.getName();
+        this.name = player.name();
        this.protocol = protocol;
-        this.uuid = player.getUuid();
+        this.uuid = player.uuid();
        this.version = ProtocolVersion.getProtocolVersion(protocol).getVersionIntroducedIn();
    }
    
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.objects;
+package ch.andre601.advancedserverlist.velocity.objects.impl;

 import ch.andre601.advancedserverlist.api.velocity.objects.VelocityProxy;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.objects;
+package ch.andre601.advancedserverlist.velocity.objects.placeholders;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
@@ -1,7 +1,7 @@
 /*
 * MIT License
 *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,22 +23,26 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.objects;
+package ch.andre601.advancedserverlist.velocity.objects.placeholders;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.velocity.objects.VelocityProxy;
+import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import com.velocitypowered.api.proxy.server.RegisteredServer;

 public class VelocityServerPlaceholders extends PlaceholderProvider{
    
-    private VelocityServerPlaceholders(){
+    private final VelocityCore plugin;
+    
+    private VelocityServerPlaceholders(VelocityCore plugin){
        super("server");
+        this.plugin = plugin;
    }
    
-    public static VelocityServerPlaceholders init(){
-        return new VelocityServerPlaceholders();
+    public static VelocityServerPlaceholders init(VelocityCore core){
+        return new VelocityServerPlaceholders(core);
    }
    
    @Override
@@ -62,7 +66,11 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
                        if(registeredServer == null)
                            continue;
                        
-                        players += registeredServer.getPlayersConnected().size();
+                        int connected = plugin.getOnlinePlayers(registeredServer);
+                        if(connected == -1)
+                            continue;
+                        
+                        players += connected;
                    }
                    
                    yield String.valueOf(players);
@@ -52,7 +52,7 @@
        <dependency>
            <groupId>ch.qos.logback</groupId>
            <artifactId>logback-classic</artifactId>
-            <version>1.5.0</version>
+            <version>1.5.3</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -48,7 +48,8 @@ public enum PlatformInfo{
    VELOCITY(
        "velocity",
        List.of(
-            "velocity/target/AdvancedServerList-Velocity-{{version}}.jar"
+            "velocity/target/AdvancedServerList-Velocity-{{version}}.jar",
+            "addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
        ),
        "velocity"
    );
Author	SHA1	Message	Date
Andre601	2754bf13aa	Allow support for vanished players	2024-03-10 14:01:10 +01:00
Andre601	9ff5fcdaa7	Unify Placeholder parsing system.	2024-03-07 22:01:18 +01:00
Andre601	0ba7ed6ece	Merge pull request 'Update dependency com.viaversion:viaversion-api to v4.9.3' (#241 ) from renovate/com.viaversion-viaversion-api-4.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/241	2024-03-06 12:46:39 +00:00
Andre601	2d8c774401	Merge pull request 'Update dependency mkdocs-material to v9.5.13' (#242 ) from renovate/mkdocs-material-9.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/242	2024-03-06 12:46:23 +00:00
Andre601's Renovate Bot	f68be63f64	Update dependency mkdocs-material to v9.5.13	2024-03-06 12:14:43 +00:00
Andre601's Renovate Bot	2695b393d8	Update dependency com.viaversion:viaversion-api to v4.9.3	2024-03-06 12:14:35 +00:00
Andre601	55821d2edf	Merge pull request 'Update dependency ch.qos.logback:logback-classic to v1.5.3' (#240 ) from renovate/ch.qos.logback-logback-classic-1.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/240	2024-03-05 12:02:36 +00:00
Andre601's Renovate Bot	b64e32503e	Update dependency ch.qos.logback:logback-classic to v1.5.3	2024-03-05 12:01:13 +00:00
Andre601	c5ab9b118f	Use code highlighting for expression examples	2024-03-05 02:11:01 +01:00
Andre601	6cc54349b5	Fix typo with fontawesome	2024-03-05 01:02:47 +00:00
Andre601	98d2de975e	Add divider lines to optional dependencies	2024-03-05 00:59:59 +00:00
Andre601	6d1c118660	Remove unusued project.build.commit tag	2024-03-03 22:14:34 +01:00
Andre601	49e5b195ec	Update way of reporting condition errors	2024-03-03 22:14:11 +01:00
Andre601	c92611e7f8	Merge pull request 'Update dependency ch.qos.logback:logback-classic to v1.5.2' (#238 ) from renovate/ch.qos.logback-logback-classic-1.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/238	2024-03-03 13:46:52 +00:00
Andre601's Renovate Bot	233414c45c	Update dependency ch.qos.logback:logback-classic to v1.5.2	2024-03-03 12:01:19 +00:00
Andre601	c0629e10bc	Add BanPlugins Addon to optional dependencies	2024-03-03 02:00:17 +00:00
Andre601	621eb7c489	Update API reference for ProfileEntry.Builder + changelog	2024-03-03 00:50:16 +01:00
Andre601	38e16f1d4b	Bump version to 4.3.0	2024-03-03 00:14:42 +01:00
Andre601	2e61531079	Merge pull request 'Add LibertyBans' (#233 ) from feature/libertybans-addon into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/233	2024-03-02 23:12:05 +00:00
Andre601	5cf295d4c5	Merge branch 'master' into feature/libertybans-addon	2024-03-02 23:08:55 +00:00
Andre601	24d5865a57	Also add asl parent	2024-03-03 00:08:17 +01:00
Andre601	03c5e7d9d0	Add ExpressionParser to matchPackageNames	2024-03-03 00:08:17 +01:00
Andre601's Renovate Bot	7874fcf265	Update api.version to v3.2.1	2024-03-03 00:08:13 +01:00
Andre601	3e9070ebf9	Fix renovate.json	2024-03-03 00:06:12 +01:00
Andre601	478fa88a97	Also add asl parent	2024-03-02 12:10:33 +00:00
Andre601	346f94decc	Add ExpressionParser to matchPackageNames	2024-03-02 12:09:06 +00:00
Andre601	f5e8a7e460	Merge pull request 'Update api.version to v3.2.1' (#237 ) from renovate/api.version into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/237	2024-03-02 12:06:58 +00:00
Andre601's Renovate Bot	3cb470a086	Update api.version to v3.2.1	2024-03-02 12:06:01 +00:00
Andre601	348ecce315	Fix renovate.json	2024-03-02 12:05:24 +00:00
Andre601	78463bca4f	Merge branch 'master' into feature/libertybans-addon	2024-03-01 19:17:49 +00:00
Andre601	a6bde40f30	Update registry URL for asl API	2024-03-01 16:39:29 +00:00
Andre601	45fa7b5d69	Fix banExpiration placeholder using muteExpiration(player).	2024-03-01 16:18:34 +01:00
Andre601	1f52ff39d1	Update getting started guide	2024-02-29 16:06:42 +00:00
Andre601	bc66d925ff	Merge pull request 'Update dependency mkdocs-material to v9.5.12' (#235 ) from renovate/mkdocs-material-9.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/235	2024-02-29 12:25:20 +00:00
Andre601	41f8f6b29d	Merge branch 'master' into renovate/mkdocs-material-9.x	2024-02-29 12:25:07 +00:00
Andre601	e032b2cc7f	Merge pull request 'Update dependency ch.qos.logback:logback-classic to v1.5.1' (#234 ) from renovate/ch.qos.logback-logback-classic-1.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/234	2024-02-29 12:24:51 +00:00
Andre601's Renovate Bot	7c6d4a3840	Update dependency mkdocs-material to v9.5.12	2024-02-29 12:01:25 +00:00
Andre601's Renovate Bot	2f2095237d	Update dependency ch.qos.logback:logback-classic to v1.5.1	2024-02-29 12:01:20 +00:00
Andre601	2a20af1f9a	Update Javadoc link	2024-02-29 11:45:05 +01:00
Andre601	c424c5abd5	Use custom admonition for files	2024-02-28 15:55:31 +01:00
Andre601	101fc593d2	Update files	2024-02-28 15:50:41 +01:00
Andre601	cb9e65105e	Add LibertyBans placeholder docs	2024-02-26 23:17:42 +01:00
Andre601	9b95bb1222	docs/api/index.md aktualisiert	2024-02-26 19:41:17 +00:00
Andre601	2b01ed9725	Use Collections.max and Update PlatformInfo	2024-02-26 20:29:45 +01:00
Andre601	9b77a1274d	Update Link for api/source redirect	2024-02-26 17:49:01 +01:00
Andre601	18d5cca185	Update Repository URL for API	2024-02-26 17:48:32 +01:00
Andre601	d5b604c1d0	Add LibertyBans	2024-02-26 17:18:00 +01:00
Andre601	e9b4ccbb93	Merge pull request 'Update dependency mkdocs-material to v9.5.11' (#232 ) from renovate/mkdocs-material-9.x into master Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/232	2024-02-24 12:03:07 +00:00
Andre601's Renovate Bot	a14f8c961f	Update dependency mkdocs-material to v9.5.11	2024-02-24 12:01:08 +00:00