Fix a problem with French translation

The locale file didn't contain correct punctuation for SimpleDateFormat.

Wrote a test that catches these regressions in the future.
This test failed before the fix to locale_FR.yml

Affects issues:
- Fixed #3658

.github/workflows/ci.yml

@@ -23,16 +23,16 @@ jobs:
 
     steps:
       - name: 📥 Checkout git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: ☕ Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - name: 💼 Load Gradle Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -54,12 +54,12 @@ jobs:
           echo "versionString=$(cat build/versions/jar.txt)" >> $GITHUB_ENV
           echo "artifactPath=$(pwd)/builds" >> $GITHUB_ENV
       - name: 📤 Upload Plan.jar 
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Plan-${{ env.versionString }}-${{ env.git_hash }}.jar
           path: ${{ env.artifactPath }}/Plan-${{ env.snapshotVersion }}.jar
       - name: 📤 Upload PlanFabric.jar 
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PlanFabric-${{ env.versionString }}-${{ env.git_hash }}.jar
           path: ${{ env.artifactPath }}/PlanFabric-${{ env.snapshotVersion }}.jar

Plan/build.gradle

@@ -16,8 +16,8 @@ plugins {
     id 'java-library'
     id "jacoco"
     id "checkstyle"
-    id "org.sonarqube" version "4.4.1.3373"
+    id "org.sonarqube" version "5.0.0.4638"
-    id 'fabric-loom' version '1.3-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.6-SNAPSHOT' apply false
 }
 
 apply plugin: 'nebula-aggregate-javadocs'
@@ -69,9 +69,9 @@ subprojects {
     }
 
     ext {
-        daggerVersion = "2.50"
+        daggerVersion = "2.51.1"
 
-        palVersion = "5.1.0"
+        palVersion = "5.2.0"
 
         bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
         spigotVersion = "1.13.2-R0.1-SNAPSHOT"
@@ -83,32 +83,33 @@ subprojects {
         redisBungeeVersion = "0.3.8-SNAPSHOT"
         redisBungeeProxioDevVersion = "0.7.3"
 
-        commonsTextVersion = "1.11.0"
+        commonsTextVersion = "1.12.0"
-        commonsCompressVersion = "1.25.0"
+        commonsCompressVersion = "1.26.2"
-        commonsCodecVersion = "1.16.0"
+        commonsCodecVersion = "1.17.0"
         caffeineVersion = "3.1.8"
-        jettyVersion = "11.0.19"
+        jettyVersion = "11.0.21"
         caffeineVersion = "2.9.2"
-        mysqlVersion = "8.3.0"
+        mysqlVersion = "8.4.0"
-        mariadbVersion = "3.3.2"
+        mariadbVersion = "3.4.0"
-        sqliteVersion = "3.45.0.0"
+        sqliteVersion = "3.42.0.1"
-        adventureVersion = "4.14.0"
+        adventureVersion = "4.17.0"
         hikariVersion = "5.1.0"
-        slf4jVersion = "2.0.11"
+        slf4jVersion = "2.0.13"
         geoIpVersion = "4.2.0"
-        gsonVersion = "2.10.1"
+        gsonVersion = "2.11.0"
         dependencyDownloadVersion = "1.3.1"
-        ipAddressMatcherVersion = "5.4.0"
+        ipAddressMatcherVersion = "5.5.0"
         jasyptVersion = "1.9.3"
 
         bstatsVersion = "3.0.2"
         placeholderapiVersion = "2.11.5"
         nkPlaceholderapiVersion = "1.4-SNAPSHOT"
 
-        junitVersion = "5.10.1"
+        junitVersion = "5.10.2"
-        mockitoVersion = "5.10.0"
+        mockitoVersion = "5.12.0"
-        testContainersVersion = "1.19.4"
+        seleniumVersion = "4.21.0"
-        swaggerVersion = "2.2.20"
+        testContainersVersion = "1.19.8"
+        swaggerVersion = "2.2.22"
     }
 
     repositories {

Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java

@@ -36,6 +36,7 @@ import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.lang.reflect.Constructor;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -62,7 +63,18 @@ public class Plan extends JavaPlugin implements PlanPlugin {
 
     @Override
     public void onLoad() {
-        abstractionLayer = new BukkitPlatformLayer(this);
+        if (isFolia()) {
+            try {
+                // Attempt to load and use the Folia library for Java 17+
+                Class<?> foliaPlatformLayer = Class.forName("net.playeranalytics.plugin.FoliaPlatformLayer");
+                abstractionLayer = (PlatformAbstractionLayer) foliaPlatformLayer.getConstructor(JavaPlugin.class).newInstance(this);
+            } catch (Exception e) {
+                this.getLogger().log(Level.SEVERE, "Failed to load FoliaPlatformLayer", e);
+                abstractionLayer = new BukkitPlatformLayer(this);
+            }
+        } else {
+            abstractionLayer = new BukkitPlatformLayer(this);
+        }
         pluginLogger = abstractionLayer.getPluginLogger();
         runnableFactory = abstractionLayer.getRunnableFactory();
     }
@@ -167,7 +179,18 @@ public class Plan extends JavaPlugin implements PlanPlugin {
 
     public void cancelAllTasks() {
         runnableFactory.cancelAllKnownTasks();
-        Bukkit.getScheduler().cancelTasks(this);
+        if (!isFolia()) {
+            Bukkit.getScheduler().cancelTasks(this);
+        }
+    }
+
+    private static boolean isFolia() {
+        try {
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 
     @Override

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.gathering.listeners.bukkit;
 
+import com.djrapitops.plan.gathering.JoinAddressValidator;
 import com.djrapitops.plan.gathering.cache.JoinAddressCache;
 import com.djrapitops.plan.gathering.domain.BukkitPlayerData;
 import com.djrapitops.plan.gathering.domain.event.PlayerJoin;
@@ -28,6 +29,8 @@ import com.djrapitops.plan.identification.ServerUUID;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.transactions.events.BanStatusTransaction;
 import com.djrapitops.plan.storage.database.transactions.events.KickStoreTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.StoreAllowlistBounceTransaction;
+import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import org.bukkit.event.EventHandler;
@@ -50,6 +53,7 @@ public class PlayerOnlineListener implements Listener {
 
     private final PlayerJoinEventConsumer playerJoinEventConsumer;
     private final PlayerLeaveEventConsumer playerLeaveEventConsumer;
+    private final JoinAddressValidator joinAddressValidator;
     private final JoinAddressCache joinAddressCache;
 
     private final ServerInfo serverInfo;
@@ -61,6 +65,7 @@ public class PlayerOnlineListener implements Listener {
     public PlayerOnlineListener(
             PlayerJoinEventConsumer playerJoinEventConsumer,
             PlayerLeaveEventConsumer playerLeaveEventConsumer,
+            JoinAddressValidator joinAddressValidator,
             JoinAddressCache joinAddressCache,
             ServerInfo serverInfo,
             DBSystem dbSystem,
@@ -69,6 +74,7 @@ public class PlayerOnlineListener implements Listener {
     ) {
         this.playerJoinEventConsumer = playerJoinEventConsumer;
         this.playerLeaveEventConsumer = playerLeaveEventConsumer;
+        this.joinAddressValidator = joinAddressValidator;
         this.joinAddressCache = joinAddressCache;
         this.serverInfo = serverInfo;
         this.dbSystem = dbSystem;
@@ -82,18 +88,14 @@ public class PlayerOnlineListener implements Listener {
             UUID playerUUID = event.getPlayer().getUniqueId();
             ServerUUID serverUUID = serverInfo.getServerUUID();
             boolean banned = PlayerLoginEvent.Result.KICK_BANNED == event.getResult();
+            boolean notWhitelisted = PlayerLoginEvent.Result.KICK_WHITELIST == event.getResult();
 
-            String address = event.getHostname();
+            if (notWhitelisted) {
-            if (!address.isEmpty()) {
+                dbSystem.getDatabase().executeTransaction(new StoreAllowlistBounceTransaction(playerUUID, event.getPlayer().getName(), serverUUID, System.currentTimeMillis()));
-                if (address.contains(":")) {
+            }
-                    address = address.substring(0, address.lastIndexOf(':'));
+
-                }
+            @Untrusted String address = joinAddressValidator.sanitize(event.getHostname());
-                if (address.contains("\u0000")) {
+            if (joinAddressValidator.isValid(address)) {
-                    address = address.substring(0, address.indexOf('\u0000'));
-                }
-                if (address.contains("fml")) {
-                    address = address.substring(0, address.lastIndexOf("fml"));
-                }
                 joinAddressCache.put(playerUUID, address);
             }
             dbSystem.getDatabase().executeTransaction(new BanStatusTransaction(playerUUID, serverUUID, banned));

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/timed/BukkitPingCounter.java

@@ -89,9 +89,9 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
         startRecording = new ConcurrentHashMap<>();
         playerHistory = new HashMap<>();
 
-        Optional<PingMethod> pingMethod = loadPingMethod();
+        Optional<PingMethod> loaded = loadPingMethod();
-        if (pingMethod.isPresent()) {
+        if (loaded.isPresent()) {
-            this.pingMethod = pingMethod.get();
+            this.pingMethod = loaded.get();
             pingMethodAvailable = true;
         } else {
             pingMethodAvailable = false;

Plan/common/build.gradle

@@ -3,8 +3,8 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
     id "dev.vankka.dependencydownload.plugin" version "$dependencyDownloadVersion"
-    id "com.github.node-gradle.node" version "7.0.1"
+    id "com.github.node-gradle.node" version "7.0.2"
-    id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.20"
+    id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.22"
 }
 
 configurations {
@@ -56,7 +56,7 @@ dependencies {
     shadow project(":extensions")
 
     shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
-    compileOnly "net.kyori:adventure-api:4.14.0"
+    compileOnly "net.kyori:adventure-api:$adventureVersion"
     shadow("dev.vankka:dependencydownload-runtime:$dependencyDownloadVersion") {
         // Effectively disables relocating
         exclude module: "jar-relocator"
@@ -64,6 +64,7 @@ dependencies {
     mysqlDriver "com.mysql:mysql-connector-j:$mysqlVersion"
     mariadbDriver "org.mariadb.jdbc:mariadb-java-client:$mariadbVersion"
     sqliteDriver "org.xerial:sqlite-jdbc:$sqliteVersion"
+    sqliteDriver "org.slf4j:slf4j-nop:1.7.36"
     ipAddressMatcher "com.github.seancfoley:ipaddress:$ipAddressMatcherVersion"
 
     shadow "org.apache.commons:commons-text:$commonsTextVersion"
@@ -86,7 +87,7 @@ dependencies {
 
 
     // Swagger annotations
-    implementation "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0"
+    implementation "jakarta.ws.rs:jakarta.ws.rs-api:4.0.0"
     implementation "io.swagger.core.v3:swagger-core-jakarta:$swaggerVersion"
     implementation "io.swagger.core.v3:swagger-jaxrs2-jakarta:$swaggerVersion"
 
@@ -94,12 +95,21 @@ dependencies {
     testArtifacts project(":extensions:adventure")
     testImplementation project(":extensions:adventure")
     testImplementation "com.google.code.gson:gson:$gsonVersion"
-    testImplementation "org.seleniumhq.selenium:selenium-java:4.17.0"
+    testImplementation "org.seleniumhq.selenium:selenium-java:$seleniumVersion"
     testImplementation "org.testcontainers:testcontainers:$testContainersVersion"
     testImplementation "org.testcontainers:junit-jupiter:$testContainersVersion"
     testImplementation "org.testcontainers:nginx:$testContainersVersion"
 }
 
+test {
+    environment "PLAN_TEST_NODE_STRING", "String"
+    environment "PLAN_TEST_NODE_BOOLEAN", "true"
+    environment "PLAN_TEST_NODE_INTEGER", "5"
+    environment "PLAN_TEST_NODE_DOUBLE", "0.5"
+    environment "PLAN_TEST_NODE_LONG", "9223372036854775807"
+    environment "PLAN_TEST_NODE_STRINGLIST", "- Test\n- Another"
+}
+
 task updateVersion(type: Copy) {
     from('src/main/resources') {
         include 'plugin.yml'
@@ -232,8 +242,12 @@ artifacts {
 }
 
 processResources {
-    dependsOn copyYarnBuildResults
+    // Skips Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
-    dependsOn determineAssetModifications
+    // Jitpack build is used mainly for java dependencies.
+    if (!project.hasProperty("isJitpack")) {
+        dependsOn copyYarnBuildResults
+        dependsOn determineAssetModifications
+    }
     dependsOn generateResourceForMySQLDriver
     dependsOn generateResourceForSQLiteDriver
     dependsOn generateResourceForIpAddressMatcher

Plan/common/src/main/java/com/djrapitops/plan/ApiServices.java

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan;
+
+import com.djrapitops.plan.component.ComponentSvc;
+import com.djrapitops.plan.delivery.web.ResolverSvc;
+import com.djrapitops.plan.delivery.web.ResourceSvc;
+import com.djrapitops.plan.extension.ExtensionSvc;
+import com.djrapitops.plan.query.QuerySvc;
+import com.djrapitops.plan.settings.ListenerSvc;
+import com.djrapitops.plan.settings.SchedulerSvc;
+import com.djrapitops.plan.settings.SettingsSvc;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Breaks up {@link PlanSystem} to be a smaller class.
+ *
+ * @author AuroraLS3
+ */
+@Singleton
+public class ApiServices {
+
+    private final ComponentSvc componentService;
+    private final ResolverSvc resolverService;
+    private final ResourceSvc resourceService;
+    private final ExtensionSvc extensionService;
+    private final QuerySvc queryService;
+    private final ListenerSvc listenerService;
+    private final SettingsSvc settingsService;
+    private final SchedulerSvc schedulerService;
+
+    @Inject
+    public ApiServices(
+            ComponentSvc componentService,
+            ResolverSvc resolverService,
+            ResourceSvc resourceService,
+            ExtensionSvc extensionService,
+            QuerySvc queryService,
+            ListenerSvc listenerService,
+            SettingsSvc settingsService,
+            SchedulerSvc schedulerService
+    ) {
+        this.componentService = componentService;
+        this.resolverService = resolverService;
+        this.resourceService = resourceService;
+        this.extensionService = extensionService;
+        this.queryService = queryService;
+        this.listenerService = listenerService;
+        this.settingsService = settingsService;
+        this.schedulerService = schedulerService;
+    }
+
+    public void register() {
+        extensionService.register();
+        componentService.register();
+        resolverService.register();
+        resourceService.register();
+        listenerService.register();
+        settingsService.register();
+        schedulerService.register();
+        queryService.register();
+    }
+
+    public void registerExtensions() {
+        extensionService.registerExtensions();
+    }
+
+    public void disableExtensionDataUpdates() {
+        extensionService.disableUpdates();
+    }
+
+    public ComponentSvc getComponentService() {
+        return componentService;
+    }
+
+    public ResolverSvc getResolverService() {
+        return resolverService;
+    }
+
+    public ResourceSvc getResourceService() {
+        return resourceService;
+    }
+
+    public ExtensionSvc getExtensionService() {
+        return extensionService;
+    }
+
+    public QuerySvc getQueryService() {
+        return queryService;
+    }
+
+    public ListenerSvc getListenerService() {
+        return listenerService;
+    }
+
+    public SettingsSvc getSettingsService() {
+        return settingsService;
+    }
+
+    public SchedulerSvc getSchedulerService() {
+        return schedulerService;
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/PlanSystem.java

@@ -17,25 +17,17 @@
 package com.djrapitops.plan;
 
 import com.djrapitops.plan.api.PlanAPI;
-import com.djrapitops.plan.component.ComponentSvc;
 import com.djrapitops.plan.delivery.DeliveryUtilities;
 import com.djrapitops.plan.delivery.export.ExportSystem;
 import com.djrapitops.plan.delivery.formatting.Formatters;
-import com.djrapitops.plan.delivery.web.ResolverSvc;
-import com.djrapitops.plan.delivery.web.ResourceSvc;
 import com.djrapitops.plan.delivery.webserver.NonProxyWebserverDisableChecker;
 import com.djrapitops.plan.delivery.webserver.WebServerSystem;
-import com.djrapitops.plan.extension.ExtensionSvc;
 import com.djrapitops.plan.gathering.cache.CacheSystem;
 import com.djrapitops.plan.gathering.importing.ImportSystem;
 import com.djrapitops.plan.gathering.listeners.ListenerSystem;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.processing.Processing;
-import com.djrapitops.plan.query.QuerySvc;
 import com.djrapitops.plan.settings.ConfigSystem;
-import com.djrapitops.plan.settings.ListenerSvc;
-import com.djrapitops.plan.settings.SchedulerSvc;
-import com.djrapitops.plan.settings.SettingsSvc;
 import com.djrapitops.plan.settings.locale.LocaleSystem;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.file.PlanFiles;
@@ -77,14 +69,7 @@ public class PlanSystem implements SubSystem {
     private final ImportSystem importSystem;
     private final ExportSystem exportSystem;
     private final DeliveryUtilities deliveryUtilities;
-    private final ComponentSvc componentService;
+    private final ApiServices apiServices;
-    private final ResolverSvc resolverService;
-    private final ResourceSvc resourceService;
-    private final ExtensionSvc extensionService;
-    private final QuerySvc queryService;
-    private final ListenerSvc listenerService;
-    private final SettingsSvc settingsService;
-    private final SchedulerSvc schedulerService;
     private final PluginLogger logger;
     private final ErrorLogger errorLogger;
 
@@ -104,16 +89,9 @@ public class PlanSystem implements SubSystem {
             ImportSystem importSystem,
             ExportSystem exportSystem,
             DeliveryUtilities deliveryUtilities,
-            ComponentSvc componentService,
-            ResolverSvc resolverService,
-            ResourceSvc resourceService,
-            ExtensionSvc extensionService,
-            QuerySvc queryService,
-            ListenerSvc listenerService,
-            SettingsSvc settingsService,
-            SchedulerSvc schedulerService,
             PluginLogger logger,
             ErrorLogger errorLogger,
+            ApiServices apiServices, // API v5
             @SuppressWarnings("deprecation") PlanAPI.PlanAPIHolder apiHolder // Deprecated PlanAPI, backwards compatibility
     ) {
         this.files = files;
@@ -130,16 +108,9 @@ public class PlanSystem implements SubSystem {
         this.importSystem = importSystem;
         this.exportSystem = exportSystem;
         this.deliveryUtilities = deliveryUtilities;
-        this.componentService = componentService;
-        this.resolverService = resolverService;
-        this.resourceService = resourceService;
-        this.extensionService = extensionService;
-        this.queryService = queryService;
-        this.listenerService = listenerService;
-        this.settingsService = settingsService;
-        this.schedulerService = schedulerService;
         this.logger = logger;
         this.errorLogger = errorLogger;
+        this.apiServices = apiServices;
 
         logger.info("§2");
         logger.info("§2           ██▌");
@@ -162,14 +133,7 @@ public class PlanSystem implements SubSystem {
      * Enables the rest of the systems that are not enabled in {@link #enableForCommands()}.
      */
     public void enableOtherThanCommands() {
-        extensionService.register();
+        apiServices.register();
-        componentService.register();
-        resolverService.register();
-        resourceService.register();
-        listenerService.register();
-        settingsService.register();
-        schedulerService.register();
-        queryService.register();
 
         enableSystems(
                 processing,
@@ -193,7 +157,7 @@ public class PlanSystem implements SubSystem {
             ));
         }
 
-        extensionService.registerExtensions();
+        apiServices.registerExtensions();
         enabled = true;
 
         String javaVersion = System.getProperty("java.specification.version");
@@ -223,7 +187,7 @@ public class PlanSystem implements SubSystem {
         enabled = false;
         Formatters.clearSingleton();
 
-        extensionService.disableUpdates();
+        apiServices.disableExtensionDataUpdates();
 
         disableSystems(
                 taskSystem,
@@ -316,12 +280,8 @@ public class PlanSystem implements SubSystem {
         return enabled;
     }
 
-    public ExtensionSvc getExtensionService() {
+    public ApiServices getApiServices() {
-        return extensionService;
+        return apiServices;
-    }
-
-    public ComponentSvc getComponentService() {
-        return componentService;
     }
 
     public static long getServerEnableTime() {

Plan/common/src/main/java/com/djrapitops/plan/commands/PlanCommand.java

@@ -140,13 +140,21 @@ public class PlanCommand {
     }
 
     public List<String> serverNames(CMDSender sender, @Untrusted Arguments arguments) {
-        @Untrusted String asString = arguments.concatenate(" ");
+        if (sender.hasPermission(Permissions.SERVER)) {
-        return tabCompleteCache.getMatchingServerIdentifiers(asString);
+            @Untrusted String asString = arguments.concatenate(" ");
+            return tabCompleteCache.getMatchingServerIdentifiers(asString);
+        }
+        return List.of();
     }
 
     private List<String> playerNames(CMDSender sender, @Untrusted Arguments arguments) {
-        @Untrusted String asString = arguments.concatenate(" ");
+        if (sender.hasPermission(Permissions.PLAYER_OTHER)) {
-        return tabCompleteCache.getMatchingPlayerIdentifiers(asString);
+            @Untrusted String asString = arguments.concatenate(" ");
+            return tabCompleteCache.getMatchingPlayerIdentifiers(asString);
+        } else if (sender.hasPermission(Permissions.PLAYER_SELF)) {
+            return sender.getPlayerName().map(List::of).orElse(List.of());
+        }
+        return List.of();
     }
 
     private Subcommand serverCommand() {
@@ -403,6 +411,9 @@ public class PlanCommand {
     }
 
     private List<String> getBackupFilenames(CMDSender sender, @Untrusted Arguments arguments) {
+        if (!sender.hasPermission(Permissions.DATA_RESTORE)) {
+            return List.of();
+        }
         if (arguments.get(1).isPresent()) {
             return DBType.names();
         }
@@ -531,6 +542,9 @@ public class PlanCommand {
     }
 
     private List<String> webGroupTabComplete(CMDSender sender, @Untrusted Arguments arguments) {
+        if (!sender.hasPermission(Permissions.SET_GROUP)) {
+            return List.of();
+        }
         Optional<String> groupArgument = arguments.get(1);
         if (groupArgument.isPresent()) {
             return tabCompleteCache.getMatchingWebGroupNames(groupArgument.get());

Plan/common/src/main/java/com/djrapitops/plan/commands/subcommands/DataUtilityCommands.java

@@ -29,6 +29,7 @@ import com.djrapitops.plan.delivery.formatting.Formatter;
 import com.djrapitops.plan.delivery.formatting.Formatters;
 import com.djrapitops.plan.exceptions.ExportException;
 import com.djrapitops.plan.gathering.domain.GeoInfo;
+import com.djrapitops.plan.gathering.domain.event.JoinAddress;
 import com.djrapitops.plan.gathering.importing.ImportSystem;
 import com.djrapitops.plan.gathering.importing.importers.Importer;
 import com.djrapitops.plan.identification.Identifiers;
@@ -42,6 +43,7 @@ import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.lang.CommandLang;
 import com.djrapitops.plan.settings.locale.lang.GenericLang;
 import com.djrapitops.plan.settings.locale.lang.HelpLang;
+import com.djrapitops.plan.settings.locale.lang.HtmlLang;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries;
@@ -258,12 +260,17 @@ public class DataUtilityCommands {
         Optional<GeoInfo> mostRecentGeoInfo = new GeoInfoMutator(geoInfo).mostRecent();
         String geolocation = mostRecentGeoInfo.isPresent() ? mostRecentGeoInfo.get().getGeolocation() : "-";
         SessionsMutator sessionsMutator = SessionsMutator.forContainer(player);
+        String latestJoinAddress = sessionsMutator.latestSession()
+                .flatMap(session -> session.getExtraData(JoinAddress.class))
+                .map(JoinAddress::getAddress)
+                .orElse("-");
 
         String table = locale.getString(CommandLang.HEADER_INSPECT, playerName) + '\n' +
                 locale.getString(CommandLang.INGAME_ACTIVITY_INDEX, activityIndex.getFormattedValue(formatters.decimals()), activityIndex.getGroup()) + '\n' +
                 locale.getString(CommandLang.INGAME_REGISTERED, timestamp.apply(() -> registered)) + '\n' +
                 locale.getString(CommandLang.INGAME_LAST_SEEN, timestamp.apply(() -> lastSeen)) + '\n' +
                 locale.getString(CommandLang.INGAME_GEOLOCATION, geolocation) + '\n' +
+                "  §2" + locale.getString(HtmlLang.LABEL_LABEL_JOIN_ADDRESS) + ": §f" + latestJoinAddress + '\n' +
                 locale.getString(CommandLang.INGAME_TIMES_KICKED, player.getValue(PlayerKeys.KICK_COUNT).orElse(0)) + '\n' +
                 '\n' +
                 locale.getString(CommandLang.INGAME_PLAYTIME, length.apply(sessionsMutator.toPlaytime())) + '\n' +

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/DateObj.java

@@ -16,6 +16,8 @@
  */
 package com.djrapitops.plan.delivery.domain;
 
+import java.util.Objects;
+
 /**
  * Object that has a value tied to a date.
  *
@@ -39,4 +41,25 @@ public class DateObj<T> implements DateHolder {
     public T getValue() {
         return value;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DateObj<?> dateObj = (DateObj<?>) o;
+        return getDate() == dateObj.getDate() && Objects.equals(getValue(), dateObj.getValue());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getDate(), getValue());
+    }
+
+    @Override
+    public String toString() {
+        return "DateObj{" +
+                "date=" + date +
+                ", value=" + value +
+                '}';
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/JoinAddressCount.java

@@ -28,7 +28,7 @@ import java.util.Objects;
  */
 public class JoinAddressCount implements Comparable<JoinAddressCount> {
 
-    private final int count;
+    private int count;
     private String joinAddress;
 
     public JoinAddressCount(Map.Entry<String, Integer> entry) {
@@ -52,6 +52,10 @@ public class JoinAddressCount implements Comparable<JoinAddressCount> {
         return count;
     }
 
+    public void setCount(int count) {
+        this.count = count;
+    }
+
     @Override
     public int compareTo(@NotNull JoinAddressCount other) {
         return String.CASE_INSENSITIVE_ORDER.compare(this.joinAddress, other.joinAddress);

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/auth/WebPermission.java

@@ -19,6 +19,9 @@ package com.djrapitops.plan.delivery.domain.auth;
 import com.djrapitops.plan.settings.locale.lang.Lang;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 /**
@@ -47,7 +50,8 @@ public enum WebPermission implements Supplier<String>, Lang {
     PAGE_NETWORK_SESSIONS_LIST("See list of sessions"),
     PAGE_NETWORK_JOIN_ADDRESSES("See Join Addresses -tab"),
     PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS("See Join Address graphs"),
-    PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_PIE("See Latest Join Addresses graph"),
+    @Deprecated
+    PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_PIE("See Latest Join Addresses graph", true),
     PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_TIME("See Join Addresses over time graph"),
     PAGE_NETWORK_RETENTION("See Player Retention -tab"),
     PAGE_NETWORK_GEOLOCATIONS("See Geolocations tab"),
@@ -82,7 +86,8 @@ public enum WebPermission implements Supplier<String>, Lang {
     PAGE_SERVER_SESSIONS_LIST("See list of sessions"),
     PAGE_SERVER_JOIN_ADDRESSES("See Join Addresses -tab"),
     PAGE_SERVER_JOIN_ADDRESSES_GRAPHS("See Join Address graphs"),
-    PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_PIE("See Latest Join Addresses graph"),
+    @Deprecated
+    PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_PIE("See Latest Join Addresses graph", true),
     PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_TIME("See Join Addresses over time graph"),
     PAGE_SERVER_RETENTION("See Player Retention -tab"),
     PAGE_SERVER_GEOLOCATIONS("See Geolocations tab"),
@@ -93,6 +98,7 @@ public enum WebPermission implements Supplier<String>, Lang {
     PAGE_SERVER_PERFORMANCE_OVERVIEW("See Performance numbers"),
     PAGE_SERVER_PLUGIN_HISTORY("See Plugin History"),
     PAGE_SERVER_PLUGINS("See Plugins -tabs of servers"),
+    PAGE_SERVER_ALLOWLIST_BOUNCE("See list of Game allowlist bounces"),
 
     PAGE_PLAYER("See all of player page"),
     PAGE_PLAYER_OVERVIEW("See Player Overview -tab"),
@@ -155,4 +161,23 @@ public enum WebPermission implements Supplier<String>, Lang {
     public String getDefault() {
         return description;
     }
+
+    public static WebPermission[] nonDeprecatedValues() {
+        return Arrays.stream(values())
+                .filter(Predicate.not(WebPermission::isDeprecated))
+                .toArray(WebPermission[]::new);
+    }
+
+    public static Optional<WebPermission> findByPermission(String permission) {
+        String name = StringUtils.upperCase(permission).replace('.', '_');
+        try {
+            return Optional.of(valueOf(name));
+        } catch (IllegalArgumentException noSuchEnum) {
+            return Optional.empty();
+        }
+    }
+
+    public static boolean isDeprecated(String permission) {
+        return findByPermission(permission).map(WebPermission::isDeprecated).orElse(false);
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/AllowlistBounce.java

@@ -0,0 +1,82 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.delivery.domain.datatransfer;
+
+import com.djrapitops.plan.utilities.dev.Untrusted;
+
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Represents an event where player bounced off the whitelist.
+ *
+ * @author AuroraLS3
+ */
+public class AllowlistBounce {
+
+    private final UUID playerUUID;
+    @Untrusted
+    private final String playerName;
+    private final int count;
+    private final long lastTime;
+
+    public AllowlistBounce(UUID playerUUID, String playerName, int count, long lastTime) {
+        this.playerUUID = playerUUID;
+        this.playerName = playerName;
+        this.count = count;
+        this.lastTime = lastTime;
+    }
+
+    public UUID getPlayerUUID() {
+        return playerUUID;
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public long getLastTime() {
+        return lastTime;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AllowlistBounce bounce = (AllowlistBounce) o;
+        return getCount() == bounce.getCount() && getLastTime() == bounce.getLastTime() && Objects.equals(getPlayerUUID(), bounce.getPlayerUUID()) && Objects.equals(getPlayerName(), bounce.getPlayerName());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getPlayerUUID(), getPlayerName(), getCount(), getLastTime());
+    }
+
+    @Override
+    public String toString() {
+        return "AllowlistBounce{" +
+                "playerUUID=" + playerUUID +
+                ", playerName='" + playerName + '\'' +
+                ", count=" + count +
+                ", lastTime=" + lastTime +
+                '}';
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/PlayerJoinAddresses.java

@@ -0,0 +1,67 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.delivery.domain.datatransfer;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Represents data returned by {@link com.djrapitops.plan.delivery.webserver.resolver.json.PlayerJoinAddressJSONResolver}.
+ *
+ * @author AuroraLS3
+ */
+public class PlayerJoinAddresses {
+
+    private final List<String> joinAddresses;
+    private final Map<UUID, String> joinAddressByPlayer;
+
+    public PlayerJoinAddresses(List<String> joinAddresses, Map<UUID, String> joinAddressByPlayer) {
+        this.joinAddresses = joinAddresses;
+        this.joinAddressByPlayer = joinAddressByPlayer;
+    }
+
+    public List<String> getJoinAddresses() {
+        return joinAddresses;
+    }
+
+    public Map<UUID, String> getJoinAddressByPlayer() {
+        return joinAddressByPlayer;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PlayerJoinAddresses that = (PlayerJoinAddresses) o;
+        return Objects.equals(getJoinAddresses(), that.getJoinAddresses()) && Objects.equals(getJoinAddressByPlayer(), that.getJoinAddressByPlayer());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getJoinAddresses(), getJoinAddressByPlayer());
+    }
+
+    @Override
+    public String toString() {
+        return "PlayerJoinAddresses{" +
+                "joinAddresses=" + joinAddresses +
+                ", joinAddressByPlayer=" + joinAddressByPlayer +
+                '}';
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/datatransfer/graphs/ServerSpecificLineGraph.java

@@ -28,15 +28,15 @@ import java.util.Objects;
  */
 public class ServerSpecificLineGraph {
 
-    private final List<Double[]> points;
+    private final List<Number[]> points;
     private final ServerDto server;
 
-    public ServerSpecificLineGraph(List<Double[]> points, ServerDto server) {
+    public ServerSpecificLineGraph(List<Number[]> points, ServerDto server) {
         this.points = points;
         this.server = server;
     }
 
-    public List<Double[]> getPoints() {
+    public List<Number[]> getPoints() {
         return points;
     }
 

Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java

@@ -121,7 +121,6 @@ public class NetworkPageExporter extends FileExporter {
                 "graph?type=uniqueAndNew",
                 "graph?type=hourlyUniqueAndNew",
                 "graph?type=serverPie",
-                "graph?type=joinAddressPie",
                 "graph?type=joinAddressByDay",
                 "graph?type=activity",
                 "graph?type=geolocation",

Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java

@@ -100,6 +100,7 @@ public class ServerPageExporter extends FileExporter {
                 server + serverUUID + "/playerbase",
                 server + serverUUID + "/join-addresses",
                 server + serverUUID + "/retention",
+                server + serverUUID + "/allowlist",
                 server + serverUUID + "/players",
                 server + serverUUID + "/geolocations",
                 server + serverUUID + "/performance",
@@ -137,7 +138,6 @@ public class ServerPageExporter extends FileExporter {
                 "graph?type=geolocation&server=" + serverUUID,
                 "graph?type=uniqueAndNew&server=" + serverUUID,
                 "graph?type=hourlyUniqueAndNew&server=" + serverUUID,
-                "graph?type=joinAddressPie&server=" + serverUUID,
                 "graph?type=joinAddressByDay&server=" + serverUUID,
                 "graph?type=serverCalendar&server=" + serverUUID,
                 "graph?type=punchCard&server=" + serverUUID,
@@ -148,7 +148,8 @@ public class ServerPageExporter extends FileExporter {
                 "extensionData?server=" + serverUUID,
                 "serverIdentity?server=" + serverUUID,
                 "retention?server=" + serverUUID,
-                "joinAddresses?server=" + serverUUID
+                "joinAddresses?server=" + serverUUID,
+                "gameAllowlistBounces?server=" + serverUUID
         );
     }
 

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/html/Contributors.java

@@ -110,7 +110,11 @@ public class Contributors {
             new Contributor("xlanyleeet", LANG),
             new Contributor("Jumala9163", LANG),
             new Contributor("Dreeam-qwq", CODE),
-            new Contributor("jhqwqmc", LANG)
+            new Contributor("jhqwqmc", LANG),
+            new Contributor("liuzhen932", LANG),
+            new Contributor("Sniper_TVmc", LANG),
+            new Contributor("mcmdev", CODE),
+            new Contributor("ZhangYuheng", CODE)
     };
 
     private Contributors() {

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java

@@ -18,6 +18,7 @@ package com.djrapitops.plan.delivery.rendering.json;
 
 import com.djrapitops.plan.delivery.domain.DateObj;
 import com.djrapitops.plan.delivery.domain.RetentionData;
+import com.djrapitops.plan.delivery.domain.datatransfer.PlayerJoinAddresses;
 import com.djrapitops.plan.delivery.domain.datatransfer.ServerDto;
 import com.djrapitops.plan.delivery.domain.mutators.PlayerKillMutator;
 import com.djrapitops.plan.delivery.domain.mutators.SessionsMutator;
@@ -34,6 +35,7 @@ import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.identification.ServerUUID;
 import com.djrapitops.plan.settings.config.PlanConfig;
+import com.djrapitops.plan.settings.config.paths.DataGatheringSettings;
 import com.djrapitops.plan.settings.config.paths.DisplaySettings;
 import com.djrapitops.plan.settings.config.paths.TimeSettings;
 import com.djrapitops.plan.settings.locale.Locale;
@@ -48,6 +50,7 @@ import com.djrapitops.plan.storage.database.queries.analysis.PlayerRetentionQuer
 import com.djrapitops.plan.storage.database.queries.objects.*;
 import com.djrapitops.plan.storage.database.queries.objects.playertable.NetworkTablePlayersQuery;
 import com.djrapitops.plan.storage.database.queries.objects.playertable.ServerTablePlayersQuery;
+import com.djrapitops.plan.storage.database.sql.tables.JoinAddressTable;
 import com.djrapitops.plan.utilities.comparators.SessionStartComparator;
 import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.java.Maps;
@@ -160,14 +163,52 @@ public class JSONFactory {
         return db.query(PlayerRetentionQueries.fetchRetentionData());
     }
 
-    public Map<UUID, String> playerJoinAddresses(ServerUUID serverUUID) {
+    private static void removeFiltered(Map<UUID, String> addressByPlayerUUID, List<String> filteredJoinAddresses) {
-        Database db = dbSystem.getDatabase();
+        if (filteredJoinAddresses.isEmpty() || filteredJoinAddresses.equals(List.of("play.example.com"))) return;
-        return db.query(JoinAddressQueries.latestJoinAddressesOfPlayers(serverUUID));
+
+        Set<UUID> toRemove = new HashSet<>();
+        // Remove filtered addresses from the data
+        for (Map.Entry<UUID, String> entry : addressByPlayerUUID.entrySet()) {
+            if (filteredJoinAddresses.contains(entry.getValue())) {
+                toRemove.add(entry.getKey());
+            }
+        }
+        for (UUID playerUUID : toRemove) {
+            addressByPlayerUUID.put(playerUUID, JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
+        }
     }
 
-    public Map<UUID, String> playerJoinAddresses() {
+    public PlayerJoinAddresses playerJoinAddresses(ServerUUID serverUUID, boolean includeByPlayerMap) {
         Database db = dbSystem.getDatabase();
-        return db.query(JoinAddressQueries.latestJoinAddressesOfPlayers());
+        List<String> filteredJoinAddresses = config.get(DataGatheringSettings.FILTER_JOIN_ADDRESSES);
+        if (includeByPlayerMap) {
+            Map<UUID, String> addresses = db.query(JoinAddressQueries.latestJoinAddressesOfPlayers(serverUUID));
+
+            removeFiltered(addresses, filteredJoinAddresses);
+
+            return new PlayerJoinAddresses(
+                    addresses.values().stream().distinct().sorted().collect(Collectors.toList()),
+                    addresses
+            );
+        } else {
+            List<String> addresses = db.query(JoinAddressQueries.uniqueJoinAddresses(serverUUID));
+            addresses.removeAll(filteredJoinAddresses);
+            return new PlayerJoinAddresses(addresses, null);
+        }
+    }
+
+    public PlayerJoinAddresses playerJoinAddresses(boolean includeByPlayerMap) {
+        Database db = dbSystem.getDatabase();
+        List<String> filteredJoinAddresses = config.get(DataGatheringSettings.FILTER_JOIN_ADDRESSES);
+        List<String> unique = db.query(JoinAddressQueries.uniqueJoinAddresses());
+        unique.removeAll(filteredJoinAddresses);
+        if (includeByPlayerMap) {
+            Map<UUID, String> latest = db.query(JoinAddressQueries.latestJoinAddressesOfPlayers());
+            removeFiltered(latest, filteredJoinAddresses);
+            return new PlayerJoinAddresses(unique, latest);
+        } else {
+            return new PlayerJoinAddresses(unique, null);
+        }
     }
 
     public List<Map<String, Object>> serverSessionsAsJSONMap(ServerUUID serverUUID) {
@@ -320,9 +361,9 @@ public class JSONFactory {
 
             tableEntries.add(Maps.builder(String.class, Object.class)
                     .put("country", geolocation)
-                    .put("avg_ping", formatters.decimals().apply(ping.getAverage()) + " ms")
+                    .put("avg_ping", ping.getAverage())
-                    .put("min_ping", ping.getMin() + " ms")
+                    .put("min_ping", ping.getMin())
-                    .put("max_ping", ping.getMax() + " ms")
+                    .put("max_ping", ping.getMax())
                     .build());
         }
         return tableEntries;

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PlayerJSONCreator.java

@@ -154,9 +154,9 @@ public class PlayerJSONCreator {
     private Map<String, Object> createPingGraphJson(PlayerContainer player) {
         PingGraph pingGraph = graphs.line().pingGraph(player.getUnsafe(PlayerKeys.PING));
         return Maps.builder(String.class, Object.class)
-                .put("min_ping_series", pingGraph.getMinGraph().getPoints())
+                .put("min_ping_series", pingGraph.getMinGraph().getPointArrays())
-                .put("avg_ping_series", pingGraph.getAvgGraph().getPoints())
+                .put("avg_ping_series", pingGraph.getAvgGraph().getPointArrays())
-                .put("max_ping_series", pingGraph.getMaxGraph().getPoints())
+                .put("max_ping_series", pingGraph.getMaxGraph().getPointArrays())
                 .put("colors", Maps.builder(String.class, String.class)
                         .put("min", theme.getValue(ThemeVal.GRAPH_MIN_PING))
                         .put("avg", theme.getValue(ThemeVal.GRAPH_AVG_PING))

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/GraphJSONCreator.java

@@ -32,7 +32,6 @@ import com.djrapitops.plan.delivery.rendering.json.graphs.line.LineGraphFactory;
 import com.djrapitops.plan.delivery.rendering.json.graphs.line.PingGraph;
 import com.djrapitops.plan.delivery.rendering.json.graphs.line.Point;
 import com.djrapitops.plan.delivery.rendering.json.graphs.pie.Pie;
-import com.djrapitops.plan.delivery.rendering.json.graphs.pie.PieSlice;
 import com.djrapitops.plan.delivery.rendering.json.graphs.pie.WorldPie;
 import com.djrapitops.plan.delivery.rendering.json.graphs.special.WorldMap;
 import com.djrapitops.plan.delivery.rendering.json.graphs.stack.StackGraph;
@@ -57,7 +56,7 @@ import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries;
 import com.djrapitops.plan.storage.database.queries.objects.*;
 import com.djrapitops.plan.storage.database.sql.tables.JoinAddressTable;
 import com.djrapitops.plan.utilities.comparators.DateHolderOldestComparator;
-import com.djrapitops.plan.utilities.comparators.PieSliceComparator;
+import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.java.Lists;
 import com.djrapitops.plan.utilities.java.Maps;
 import net.playeranalytics.plugin.scheduling.TimeAmount;
@@ -457,34 +456,6 @@ public class GraphJSONCreator {
                 .build();
     }
 
-    public Map<String, Object> playerHostnamePieJSONAsMap() {
-        String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE);
-        Map<String, Integer> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.latestJoinAddresses());
-
-        translateUnknown(joinAddresses);
-
-        List<PieSlice> slices = graphs.pie().joinAddressPie(joinAddresses).getSlices();
-        slices.sort(new PieSliceComparator());
-        return Maps.builder(String.class, Object.class)
-                .put("colors", pieColors)
-                .put("slices", slices)
-                .build();
-    }
-
-    public Map<String, Object> playerHostnamePieJSONAsMap(ServerUUID serverUUID) {
-        String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE);
-        Map<String, Integer> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.latestJoinAddresses(serverUUID));
-
-        translateUnknown(joinAddresses);
-
-        List<PieSlice> slices = graphs.pie().joinAddressPie(joinAddresses).getSlices();
-        slices.sort(new PieSliceComparator());
-        return Maps.builder(String.class, Object.class)
-                .put("colors", pieColors)
-                .put("slices", slices)
-                .build();
-    }
-
     public void translateUnknown(Map<String, Integer> joinAddresses) {
         Integer unknown = joinAddresses.get(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
         if (unknown != null) {
@@ -493,33 +464,65 @@ public class GraphJSONCreator {
         }
     }
 
-    public Map<String, Object> joinAddressesByDay(ServerUUID serverUUID, long after, long before) {
+    public Map<String, Object> joinAddressesByDay(ServerUUID serverUUID, long after, long before, @Untrusted List<String> addressFilter) {
         String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE);
-        List<DateObj<Map<String, Integer>>> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.joinAddressesPerDay(serverUUID, config.getTimeZone().getOffset(System.currentTimeMillis()), after, before));
+        List<DateObj<Map<String, Integer>>> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.joinAddressesPerDay(serverUUID, config.getTimeZone().getOffset(System.currentTimeMillis()), after, before, addressFilter));
 
         return mapToJson(pieColors, joinAddresses);
     }
 
-    public Map<String, Object> joinAddressesByDay(long after, long before) {
+    public Map<String, Object> joinAddressesByDay(long after, long before, @Untrusted List<String> addressFilter) {
         String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE);
-        List<DateObj<Map<String, Integer>>> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.joinAddressesPerDay(config.getTimeZone().getOffset(System.currentTimeMillis()), after, before));
+        List<DateObj<Map<String, Integer>>> joinAddresses = dbSystem.getDatabase().query(JoinAddressQueries.joinAddressesPerDay(config.getTimeZone().getOffset(System.currentTimeMillis()), after, before, addressFilter));
 
         return mapToJson(pieColors, joinAddresses);
     }
 
+    private static void removeFilteredAddresses(List<JoinAddressCount> addresses, List<String> filteredJoinAddresses) {
+        if (filteredJoinAddresses.isEmpty() || filteredJoinAddresses.equals(List.of("play.example.com"))) return;
+
+        List<JoinAddressCount> addressesToRemove = addresses.stream()
+                .filter(address -> filteredJoinAddresses.contains(address.getJoinAddress()))
+                .collect(Collectors.toList());
+
+        if (!addressesToRemove.isEmpty()) {
+            Optional<JoinAddressCount> foundUnknownAddressCount = addresses.stream()
+                    .filter(address -> address.getJoinAddress().equals(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP))
+                    .findFirst();
+            JoinAddressCount unknownAddressCount;
+            if (foundUnknownAddressCount.isEmpty()) {
+                unknownAddressCount = new JoinAddressCount(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP, 0);
+                addresses.add(unknownAddressCount);
+            } else {
+                unknownAddressCount = foundUnknownAddressCount.get();
+            }
+
+            for (JoinAddressCount toRemove : addressesToRemove) {
+                unknownAddressCount.setCount(unknownAddressCount.getCount() + toRemove.getCount());
+                addresses.remove(toRemove);
+            }
+        }
+    }
+
     private Map<String, Object> mapToJson(String[] pieColors, List<DateObj<Map<String, Integer>>> joinAddresses) {
         for (DateObj<Map<String, Integer>> addressesByDate : joinAddresses) {
             translateUnknown(addressesByDate.getValue());
         }
 
+        List<String> filteredJoinAddresses = config.get(DataGatheringSettings.FILTER_JOIN_ADDRESSES);
+
         List<JoinAddressCounts> joinAddressCounts = joinAddresses.stream()
-                .map(addressesOnDay -> new JoinAddressCounts(
+                .map(addressesOnDay -> {
-                        addressesOnDay.getDate(),
+                    List<JoinAddressCount> addresses = addressesOnDay.getValue().entrySet()
-                        addressesOnDay.getValue().entrySet()
+                            .stream()
-                                .stream()
+                            .map(JoinAddressCount::new)
-                                .map(JoinAddressCount::new)
+                            .sorted()
-                                .sorted()
+                            .collect(Collectors.toList());
-                                .collect(Collectors.toList())))
+
+                    removeFilteredAddresses(addresses, filteredJoinAddresses);
+
+                    return new JoinAddressCounts(addressesOnDay.getDate(), addresses);
+                })
                 .sorted(new DateHolderOldestComparator())
                 .collect(Collectors.toList());
 
@@ -537,7 +540,7 @@ public class GraphJSONCreator {
         List<ServerSpecificLineGraph> proxyGraphs = new ArrayList<>();
         for (Server proxy : db.query(ServerQueries.fetchProxyServers())) {
             ServerUUID proxyUUID = proxy.getUuid();
-            List<Double[]> points = Lists.map(
+            List<Number[]> points = Lists.map(
                     db.query(TPSQueries.fetchPlayersOnlineOfServer(halfYearAgo, now, proxyUUID)),
                     point -> Point.fromDateObj(point).toArray()
             );

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/line/LineGraph.java

@@ -21,6 +21,7 @@ import com.djrapitops.plan.delivery.rendering.json.graphs.HighChart;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * This is a LineGraph for any set of Points, thus it is Abstract.
@@ -80,6 +81,10 @@ public class LineGraph implements HighChart {
         return points;
     }
 
+    public List<Number[]> getPointArrays() {
+        return getPoints().stream().map(Point::toArray).collect(Collectors.toList());
+    }
+
     private void addMissingPoints(StringBuilder arrayBuilder, Long lastX, long date) {
         long iterate = lastX + gapStrategy.diffToFirstGapPointMs;
         while (iterate < date) {

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/line/Point.java

@@ -75,7 +75,7 @@ public class Point {
                 "y=" + y + '}';
     }
 
-    public Double[] toArray() {
+    public Number[] toArray() {
-        return new Double[]{x, y};
+        return new Number[]{x, y};
     }
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/pie/JoinAddressPie.java

@@ -1,38 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.delivery.rendering.json.graphs.pie;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class JoinAddressPie extends Pie {
-
-    JoinAddressPie(Map<String, Integer> joinAddresses) {
-        super(turnToSlices(joinAddresses));
-    }
-
-    private static List<PieSlice> turnToSlices(Map<String, Integer> joinAddresses) {
-        List<PieSlice> slices = new ArrayList<>();
-        for (Map.Entry<String, Integer> address : joinAddresses.entrySet()) {
-            String joinAddress = address.getKey();
-            Integer total = address.getValue();
-            slices.add(new PieSlice(joinAddress, total));
-        }
-        return slices;
-    }
-}

Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/pie/PieGraphFactory.java

@@ -68,10 +68,6 @@ public class PieGraphFactory {
         return new ServerPreferencePie(playtimeByServerName);
     }
 
-    public Pie joinAddressPie(Map<String, Integer> joinAddresses) {
-        return new JoinAddressPie(joinAddresses);
-    }
-
     public WorldPie worldPie(WorldTimes worldTimes) {
         WorldAliasSettings worldAliasSettings = config.getWorldAliasSettings();
         Map<String, Long> playtimePerAlias = worldAliasSettings.getPlaytimePerAlias(worldTimes);

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/RateLimitGuard.java

@@ -0,0 +1,77 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.delivery.webserver;
+
+import com.djrapitops.plan.utilities.dev.Untrusted;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Simple guard against DDoS attacks to single endpoint.
+ * <p>
+ * This only protects against a DDoS that doesn't follow redirects.
+ *
+ * @author AuroraLS3
+ */
+public class RateLimitGuard {
+
+    private static final int ATTEMPT_LIMIT = 30;
+    private final Cache<String, Integer> requests = Caffeine.newBuilder()
+            .expireAfterWrite(120, TimeUnit.SECONDS)
+            .build();
+    private final Cache<String, String> lastRequestPath = Caffeine.newBuilder()
+            .expireAfterWrite(120, TimeUnit.SECONDS)
+            .build();
+
+    public boolean shouldPreventRequest(@Untrusted String requestPath, @Untrusted String accessor) {
+        String previous = lastRequestPath.getIfPresent(accessor);
+        if (!Objects.equals(previous, requestPath)) {
+            resetAttemptCount(accessor);
+        }
+
+        Integer attempts = requests.getIfPresent(accessor);
+        if (attempts == null) {
+            attempts = 0;
+        }
+
+        lastRequestPath.put(accessor, requestPath);
+        requests.put(accessor, attempts + 1);
+
+        // Too many attempts, forbid further attempts.
+        return attempts + 1 >= ATTEMPT_LIMIT;
+    }
+
+    public void resetAttemptCount(@Untrusted String accessor) {
+        // previous request changed
+        requests.invalidate(accessor);
+        requests.cleanUp();
+    }
+
+    public static class Disabled extends RateLimitGuard {
+        @Override
+        public boolean shouldPreventRequest(@Untrusted String requestedPath, String accessor) {
+            return false;
+        }
+
+        @Override
+        public void resetAttemptCount(String accessor) { /* Disabled */ }
+    }
+
+}

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/ResponseFactory.java

@@ -475,6 +475,14 @@ public class ResponseFactory {
                 .build();
     }
 
+    public Response failedRateLimit403() {
+        return Response.builder()
+                .setMimeType(MimeType.HTML)
+                .setContent("<h1>403 Forbidden</h1><p>You are being rate-limited.</p>")
+                .setStatus(403)
+                .build();
+    }
+
     public Response ipWhitelist403(@Untrusted String accessor) {
         return Response.builder()
                 .setMimeType(MimeType.HTML)

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/DataID.java

@@ -42,7 +42,6 @@ public enum DataID {
     GRAPH_ACTIVITY,
     GRAPH_PING,
     GRAPH_SERVER_PIE,
-    GRAPH_HOSTNAME_PIE,
     GRAPH_PUNCHCARD,
     SERVER_OVERVIEW,
     ONLINE_OVERVIEW,
@@ -54,11 +53,26 @@ public enum DataID {
     EXTENSION_TABS,
     EXTENSION_JSON,
     LIST_SERVERS,
-    JOIN_ADDRESSES_BY_DAY,
+    JOIN_ADDRESSES_BY_DAY(false),
     PLAYER_RETENTION,
     PLAYER_JOIN_ADDRESSES,
+    PLAYER_ALLOWLIST_BOUNCES,
     ;
 
+    private final boolean cacheable;
+
+    DataID() {
+        this(true);
+    }
+
+    DataID(boolean cacheable) {
+        this.cacheable = cacheable;
+    }
+
+    public boolean isCacheable() {
+        return cacheable;
+    }
+
     public String of(ServerUUID serverUUID) {
         if (serverUUID == null) return name();
         return name() + "_" + serverUUID;

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/cache/JSONStorage.java

@@ -74,6 +74,10 @@ public interface JSONStorage extends SubSystem {
             this.timestamp = timestamp;
         }
 
+        public static StoredJSON fromObject(Object json, long timestamp) {
+            return new StoredJSON(new Gson().toJson(json), timestamp);
+        }
+
         public String getJson() {
             return json;
         }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/configuration/WebserverLogMessages.java

@@ -72,7 +72,7 @@ public class WebserverLogMessages {
     }
 
     public void warnWebserverDisabledByConfig() {
-        logger.warn(locale.getString(PluginLang.ENABLE_NOTIFY_WEB_SERVER_DISABLED));
+        logger.info(locale.getString(PluginLang.ENABLE_NOTIFY_WEB_SERVER_DISABLED));
     }
 
     public void keystoreNotFoundError(InvalidPathException error, String keyStorePath) {

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/AccessLogger.java

@@ -75,8 +75,14 @@ public class AccessLogger {
             }
         }
         try {
+            long timestamp = internalRequest.getTimestamp();
+            String accessAddress = internalRequest.getAccessAddress(webserverConfiguration);
+            String method = internalRequest.getMethod();
+            method = method != null ? method : "?";
+            String url = StoreRequestTransaction.getTruncatedURI(request, internalRequest);
+            int responseCode = response.getCode();
             dbSystem.getDatabase().executeTransaction(
-                    new StoreRequestTransaction(webserverConfiguration, internalRequest, request, response)
+                    new StoreRequestTransaction(timestamp, accessAddress, method, url, responseCode)
             );
         } catch (CompletionException | DBOpException e) {
             errorLogger.warn(e, ErrorContext.builder()

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/InternalRequest.java

@@ -81,4 +81,6 @@ public interface InternalRequest {
         }
         return authenticationExtractor.extractAuthentication(this);
     }
+
+    String getRequestedPath();
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/JettyInternalRequest.java

@@ -129,6 +129,11 @@ public class JettyInternalRequest implements InternalRequest {
         return baseRequest.getRequestURI();
     }
 
+    @Override
+    public String getRequestedPath() {
+        return baseRequest.getHttpURI().getDecodedPath();
+    }
+
     @Override
     public String toString() {
         return "JettyInternalRequest{" +

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/http/RequestHandler.java

@@ -19,6 +19,7 @@ package com.djrapitops.plan.delivery.webserver.http;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
 import com.djrapitops.plan.delivery.webserver.PassBruteForceGuard;
+import com.djrapitops.plan.delivery.webserver.RateLimitGuard;
 import com.djrapitops.plan.delivery.webserver.ResponseFactory;
 import com.djrapitops.plan.delivery.webserver.ResponseResolver;
 import com.djrapitops.plan.delivery.webserver.auth.FailReason;
@@ -40,6 +41,7 @@ public class RequestHandler {
     private final ResponseResolver responseResolver;
 
     private final PassBruteForceGuard bruteForceGuard;
+    private final RateLimitGuard rateLimitGuard;
     private final AccessLogger accessLogger;
 
     @Inject
@@ -50,15 +52,22 @@ public class RequestHandler {
         this.accessLogger = accessLogger;
 
         bruteForceGuard = new PassBruteForceGuard();
+        rateLimitGuard = new RateLimitGuard();
     }
 
     public Response getResponse(InternalRequest internalRequest) {
         @Untrusted String accessAddress = internalRequest.getAccessAddress(webserverConfiguration);
+        @Untrusted String requestedPath = internalRequest.getRequestedPath();
 
+        boolean blocked = false;
         Response response;
         @Untrusted Request request = null;
         if (bruteForceGuard.shouldPreventRequest(accessAddress)) {
             response = responseFactory.failedLoginAttempts403();
+            blocked = true;
+        } else if (rateLimitGuard.shouldPreventRequest(requestedPath, accessAddress)) {
+            response = responseFactory.failedRateLimit403();
+            blocked = true;
         } else if (!webserverConfiguration.getAllowedIpList().isAllowed(accessAddress)) {
             webserverConfiguration.getWebserverLogMessages()
                     .warnAboutWhitelistBlock(accessAddress, internalRequest.getRequestedURIString());
@@ -77,7 +86,9 @@ public class RequestHandler {
         response.getHeaders().putIfAbsent("Access-Control-Allow-Credentials", "true");
         response.getHeaders().putIfAbsent("X-Robots-Tag", "noindex, nofollow");
 
-        accessLogger.log(internalRequest, request, response);
+        if (!blocked) {
+            accessLogger.log(internalRequest, request, response);
+        }
 
         return response;
     }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/AllowlistJSONResolver.java

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.delivery.webserver.resolver.json;
+
+import com.djrapitops.plan.delivery.domain.auth.WebPermission;
+import com.djrapitops.plan.delivery.formatting.Formatter;
+import com.djrapitops.plan.delivery.web.resolver.MimeType;
+import com.djrapitops.plan.delivery.web.resolver.Response;
+import com.djrapitops.plan.delivery.web.resolver.request.Request;
+import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
+import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService;
+import com.djrapitops.plan.delivery.webserver.cache.DataID;
+import com.djrapitops.plan.delivery.webserver.cache.JSONStorage;
+import com.djrapitops.plan.identification.Identifiers;
+import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.DBSystem;
+import com.djrapitops.plan.storage.database.Database;
+import com.djrapitops.plan.storage.database.queries.objects.AllowlistQueries;
+import com.djrapitops.plan.storage.database.queries.objects.SessionQueries;
+import com.djrapitops.plan.utilities.dev.Untrusted;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Response resolver to get game allowlist bounces.
+ *
+ * @author AuroraLS3
+ */
+@Singleton
+@Path("/v1/gameAllowlistBounces")
+public class AllowlistJSONResolver extends JSONResolver {
+
+    private final DBSystem dbSystem;
+    private final Identifiers identifiers;
+    private final AsyncJSONResolverService jsonResolverService;
+
+    @Inject
+    public AllowlistJSONResolver(DBSystem dbSystem, Identifiers identifiers, AsyncJSONResolverService jsonResolverService) {
+        this.dbSystem = dbSystem;
+        this.identifiers = identifiers;
+        this.jsonResolverService = jsonResolverService;
+    }
+
+    @Override
+    public Formatter<Long> getHttpLastModifiedFormatter() {return jsonResolverService.getHttpLastModifiedFormatter();}
+
+    @Override
+    public boolean canAccess(@Untrusted Request request) {
+        WebUser user = request.getUser().orElse(new WebUser(""));
+
+        return user.hasPermission(WebPermission.PAGE_SERVER_ALLOWLIST_BOUNCE);
+    }
+
+    @GET
+    @Operation(
+            description = "Get allowlist bounce data for server",
+            responses = {
+                    @ApiResponse(responseCode = "200", content = @Content(mediaType = MimeType.JSON)),
+                    @ApiResponse(responseCode = "400", description = "If 'server' parameter is not an existing server")
+            },
+            parameters = @Parameter(in = ParameterIn.QUERY, name = "server", description = "Server identifier to get data for (optional)", examples = {
+                    @ExampleObject("Server 1"),
+                    @ExampleObject("1"),
+                    @ExampleObject("1fb39d2a-eb82-4868-b245-1fad17d823b3"),
+            }),
+            requestBody = @RequestBody(content = @Content(examples = @ExampleObject()))
+    )
+    @Override
+    public Optional<Response> resolve(@Untrusted Request request) {
+        return Optional.of(getResponse(request));
+    }
+
+    private Response getResponse(@Untrusted Request request) {
+        JSONStorage.StoredJSON result = getStoredJSON(request);
+        return getCachedOrNewResponse(request, result);
+    }
+
+    @Nullable
+    private JSONStorage.StoredJSON getStoredJSON(Request request) {
+        Optional<Long> timestamp = Identifiers.getTimestamp(request);
+
+        ServerUUID serverUUID = identifiers.getServerUUID(request);
+        Database database = dbSystem.getDatabase();
+        return jsonResolverService.resolve(timestamp, DataID.PLAYER_ALLOWLIST_BOUNCES, serverUUID,
+                theUUID -> Map.of(
+                        "allowlist_bounces", database.query(AllowlistQueries.getBounces(serverUUID)),
+                        "last_seen_by_uuid", database.query(SessionQueries.lastSeen(serverUUID))
+                )
+        );
+    }
+
+}

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/GraphsJSONResolver.java

@@ -39,11 +39,16 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * Resolves /v1/graph JSON requests.
@@ -117,7 +122,6 @@ public class GraphsJSONResolver extends JSONResolver {
                             @ExampleObject("aggregatedPing"),
                             @ExampleObject("punchCard"),
                             @ExampleObject("serverPie"),
-                            @ExampleObject("joinAddressPie"),
                             @ExampleObject("joinAddressByDay"),
                     }),
                     @Parameter(in = ParameterIn.QUERY, name = "server", description = "Server identifier to get data for", examples = {
@@ -156,15 +160,22 @@ public class GraphsJSONResolver extends JSONResolver {
         JSONStorage.StoredJSON storedJSON;
         if (request.getQuery().get("server").isPresent()) {
             ServerUUID serverUUID = identifiers.getServerUUID(request); // Can throw BadRequestException
-            storedJSON = jsonResolverService.resolve(
+            Function<ServerUUID, Object> generationFunction = theServerUUID -> generateGraphDataJSONOfType(dataID, theServerUUID, request.getQuery());
-                    timestamp, dataID, serverUUID,
+            if (dataID.isCacheable()) {
-                    theServerUUID -> generateGraphDataJSONOfType(dataID, theServerUUID, request.getQuery())
+                storedJSON = jsonResolverService.resolve(timestamp, dataID, serverUUID, generationFunction);
-            );
+            } else {
+                storedJSON = JSONStorage.StoredJSON.fromObject(generationFunction.apply(serverUUID), System.currentTimeMillis());
+            }
         } else {
             // Assume network
-            storedJSON = jsonResolverService.resolve(
+            Supplier<Object> generationFunction = () -> generateGraphDataJSONOfType(dataID, request.getQuery());
-                    timestamp, dataID, () -> generateGraphDataJSONOfType(dataID, request.getQuery())
+            if (dataID.isCacheable()) {
-            );
+                storedJSON = jsonResolverService.resolve(
+                        timestamp, dataID, generationFunction
+                );
+            } else {
+                storedJSON = JSONStorage.StoredJSON.fromObject(generationFunction.get(), System.currentTimeMillis());
+            }
         }
         return storedJSON;
     }
@@ -197,8 +208,6 @@ public class GraphsJSONResolver extends JSONResolver {
                 return DataID.GRAPH_PUNCHCARD;
             case "serverPie":
                 return DataID.GRAPH_SERVER_PIE;
-            case "joinAddressPie":
-                return DataID.GRAPH_HOSTNAME_PIE;
             case "joinAddressByDay":
                 return DataID.JOIN_ADDRESSES_BY_DAY;
             default:
@@ -229,8 +238,6 @@ public class GraphsJSONResolver extends JSONResolver {
                 return List.of(WebPermission.PAGE_SERVER_PLAYERBASE_GRAPHS);
             case GRAPH_WORLD_MAP:
                 return List.of(WebPermission.PAGE_SERVER_GEOLOCATIONS_MAP);
-            case GRAPH_HOSTNAME_PIE:
-                return List.of(WebPermission.PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_PIE);
             case JOIN_ADDRESSES_BY_DAY:
                 return List.of(WebPermission.PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_TIME);
             default:
@@ -258,8 +265,6 @@ public class GraphsJSONResolver extends JSONResolver {
                 return List.of(WebPermission.PAGE_NETWORK_GEOLOCATIONS_MAP);
             case GRAPH_ONLINE_PROXIES:
                 return List.of(WebPermission.PAGE_NETWORK_OVERVIEW_GRAPHS_ONLINE);
-            case GRAPH_HOSTNAME_PIE:
-                return List.of(WebPermission.PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_PIE);
             case JOIN_ADDRESSES_BY_DAY:
                 return List.of(WebPermission.PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_TIME);
             default:
@@ -283,8 +288,6 @@ public class GraphsJSONResolver extends JSONResolver {
                 return graphJSON.serverCalendarJSON(serverUUID);
             case GRAPH_WORLD_PIE:
                 return graphJSON.serverWorldPieJSONAsMap(serverUUID);
-            case GRAPH_HOSTNAME_PIE:
-                return graphJSON.playerHostnamePieJSONAsMap(serverUUID);
             case GRAPH_ACTIVITY:
                 return graphJSON.activityGraphsJSONAsMap(serverUUID);
             case GRAPH_WORLD_MAP:
@@ -294,19 +297,24 @@ public class GraphsJSONResolver extends JSONResolver {
             case GRAPH_PUNCHCARD:
                 return graphJSON.punchCardJSONAsMap(serverUUID);
             case JOIN_ADDRESSES_BY_DAY:
-                try {
+                return joinAddressGraph(serverUUID, query);
-                    return graphJSON.joinAddressesByDay(serverUUID,
-                            query.get("after").map(Long::parseLong).orElse(0L),
-                            query.get("before").map(Long::parseLong).orElse(System.currentTimeMillis())
-                    );
-                } catch (@Untrusted NumberFormatException e) {
-                    throw new BadRequestException("'after' or 'before' is not a epoch millisecond (number)");
-                }
             default:
                 throw new BadRequestException("Graph type not supported with server-parameter (" + id.name() + ")");
         }
     }
 
+    private Map<String, Object> joinAddressGraph(ServerUUID serverUUID, @Untrusted URIQuery query) {
+        try {
+            Long after = query.get("after").map(Long::parseLong).orElse(0L);
+            Long before = query.get("before").map(Long::parseLong).orElse(System.currentTimeMillis());
+            @Untrusted List<String> addressFilter = query.get("addresses").map(s -> StringUtils.split(s, ','))
+                    .map(Arrays::asList).orElse(List.of());
+            return graphJSON.joinAddressesByDay(serverUUID, after, before, addressFilter);
+        } catch (@Untrusted NumberFormatException e) {
+            throw new BadRequestException("'after' or 'before' is not a epoch millisecond (number)");
+        }
+    }
+
     private Object generateGraphDataJSONOfType(DataID id, @Untrusted URIQuery query) {
         switch (id) {
             case GRAPH_ACTIVITY:
@@ -319,23 +327,26 @@ public class GraphsJSONResolver extends JSONResolver {
                 return graphJSON.networkCalendarJSON();
             case GRAPH_SERVER_PIE:
                 return graphJSON.serverPreferencePieJSONAsMap();
-            case GRAPH_HOSTNAME_PIE:
-                return graphJSON.playerHostnamePieJSONAsMap();
             case GRAPH_WORLD_MAP:
                 return graphJSON.geolocationGraphsJSONAsMap();
             case GRAPH_ONLINE_PROXIES:
                 return graphJSON.proxyPlayersOnlineGraphs();
             case JOIN_ADDRESSES_BY_DAY:
-                try {
+                return joinAddressGraph(query);
-                    return graphJSON.joinAddressesByDay(
-                            query.get("after").map(Long::parseLong).orElse(0L),
-                            query.get("before").map(Long::parseLong).orElse(System.currentTimeMillis())
-                    );
-                } catch (@Untrusted NumberFormatException e) {
-                    throw new BadRequestException("'after' or 'before' is not a epoch millisecond (number)");
-                }
             default:
                 throw new BadRequestException("Graph type not supported without server-parameter (" + id.name() + ")");
         }
     }
+
+    private Map<String, Object> joinAddressGraph(URIQuery query) {
+        try {
+            Long after = query.get("after").map(Long::parseLong).orElse(0L);
+            Long before = query.get("before").map(Long::parseLong).orElse(System.currentTimeMillis());
+            @Untrusted List<String> addressFilter = query.get("addresses").map(s -> StringUtils.split(s, ','))
+                    .map(Arrays::asList).orElse(List.of());
+            return graphJSON.joinAddressesByDay(after, before, addressFilter);
+        } catch (@Untrusted NumberFormatException e) {
+            throw new BadRequestException("'after' or 'before' is not a epoch millisecond (number)");
+        }
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/PlayerJoinAddressJSONResolver.java

@@ -17,11 +17,13 @@
 package com.djrapitops.plan.delivery.webserver.resolver.json;
 
 import com.djrapitops.plan.delivery.domain.auth.WebPermission;
+import com.djrapitops.plan.delivery.domain.datatransfer.PlayerJoinAddresses;
 import com.djrapitops.plan.delivery.formatting.Formatter;
 import com.djrapitops.plan.delivery.rendering.json.JSONFactory;
 import com.djrapitops.plan.delivery.web.resolver.MimeType;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
+import com.djrapitops.plan.delivery.web.resolver.request.URIQuery;
 import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
 import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService;
 import com.djrapitops.plan.delivery.webserver.cache.DataID;
@@ -34,6 +36,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.ws.rs.GET;
@@ -42,7 +45,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import java.util.Collections;
 import java.util.Optional;
 
 /**
@@ -69,17 +71,27 @@ public class PlayerJoinAddressJSONResolver extends JSONResolver {
     @Override
     public boolean canAccess(@Untrusted Request request) {
         WebUser user = request.getUser().orElse(new WebUser(""));
-        if (request.getQuery().get("server").isPresent()) {
+        @Untrusted URIQuery query = request.getQuery();
-            return user.hasPermission(WebPermission.PAGE_SERVER_RETENTION);
+        Optional<String> listOnly = query.get("listOnly");
+        if (query.get("server").isPresent()) {
+            if (listOnly.isEmpty()) {
+                return user.hasPermission(WebPermission.PAGE_SERVER_RETENTION);
+            } else {
+                return user.hasPermission(WebPermission.PAGE_SERVER_JOIN_ADDRESSES_GRAPHS_TIME);
+            }
+        }
+        if (listOnly.isEmpty()) {
+            return user.hasPermission(WebPermission.PAGE_NETWORK_RETENTION);
+        } else {
+            return user.hasPermission(WebPermission.PAGE_NETWORK_JOIN_ADDRESSES_GRAPHS_TIME);
         }
-        return user.hasPermission(WebPermission.PAGE_NETWORK_RETENTION);
     }
 
     @GET
     @Operation(
             description = "Get join address information of players for server or network",
             responses = {
-                    @ApiResponse(responseCode = "200", content = @Content(mediaType = MimeType.JSON)),
+                    @ApiResponse(responseCode = "200", content = @Content(mediaType = MimeType.JSON, schema = @Schema(implementation = PlayerJoinAddresses.class))),
                     @ApiResponse(responseCode = "400", description = "If 'server' parameter is not an existing server")
             },
             parameters = @Parameter(in = ParameterIn.QUERY, name = "server", description = "Server identifier to get data for (optional)", examples = {
@@ -105,12 +117,12 @@ public class PlayerJoinAddressJSONResolver extends JSONResolver {
         if (request.getQuery().get("server").isPresent()) {
             ServerUUID serverUUID = identifiers.getServerUUID(request);
             return jsonResolverService.resolve(timestamp, DataID.PLAYER_JOIN_ADDRESSES, serverUUID,
-                    theUUID -> Collections.singletonMap("join_address_by_player", jsonFactory.playerJoinAddresses(theUUID))
+                    serverUUID1 -> jsonFactory.playerJoinAddresses(serverUUID1, request.getQuery().get("listOnly").isEmpty())
             );
         }
         // Assume network
         return jsonResolverService.resolve(timestamp, DataID.PLAYER_JOIN_ADDRESSES,
-                () -> Collections.singletonMap("join_address_by_player", jsonFactory.playerJoinAddresses())
+                () -> jsonFactory.playerJoinAddresses(request.getQuery().get("listOnly").isEmpty())
         );
     }
 }

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/RootJSONResolver.java

@@ -90,6 +90,7 @@ public class RootJSONResolver {
             RetentionJSONResolver retentionJSONResolver,
             PlayerJoinAddressJSONResolver playerJoinAddressJSONResolver,
             PluginHistoryJSONResolver pluginHistoryJSONResolver,
+            AllowlistJSONResolver allowlistJSONResolver,
 
             PreferencesJSONResolver preferencesJSONResolver,
             StorePreferencesJSONResolver storePreferencesJSONResolver,
@@ -129,7 +130,8 @@ public class RootJSONResolver {
                 .add("extensionData", extensionJSONResolver)
                 .add("retention", retentionJSONResolver)
                 .add("joinAddresses", playerJoinAddressJSONResolver)
-                .add("preferences", preferencesJSONResolver);
+                .add("preferences", preferencesJSONResolver)
+                .add("gameAllowlistBounces", allowlistJSONResolver);
 
         this.webServer = webServer;
         // These endpoints require authentication to be enabled.

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/query/FiltersJSONResolver.java

@@ -114,7 +114,7 @@ public class FiltersJSONResolver implements Resolver {
                 )).build();
     }
 
-    private List<Double[]> fetchViewGraphPoints() {
+    private List<Number[]> fetchViewGraphPoints() {
         List<DateObj<Integer>> data = dbSystem.getDatabase().query(TPSQueries.fetchViewPreviewGraphData(serverInfo.getServerUUID()));
         Long earliestStart = dbSystem.getDatabase().query(SessionQueries.earliestSessionStart());
         data.add(0, new DateObj<>(earliestStart, 1));
@@ -136,9 +136,9 @@ public class FiltersJSONResolver implements Resolver {
     class FilterResponseDto {
         final List<FilterDto> filters;
         final ViewDto view;
-        final List<Double[]> viewPoints;
+        final List<Number[]> viewPoints;
 
-        public FilterResponseDto(Map<String, Filter> filtersByKind, ViewDto view, List<Double[]> viewPoints) {
+        public FilterResponseDto(Map<String, Filter> filtersByKind, ViewDto view, List<Number[]> viewPoints) {
             this.viewPoints = viewPoints;
             this.filters = new ArrayList<>();
             for (Map.Entry<String, Filter> entry : filtersByKind.entrySet()) {

Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/webgroup/WebPermissionJSONResolver.java

@@ -37,6 +37,8 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 /**
  * Endpoint for getting list of available Plan web permissions.
@@ -75,7 +77,10 @@ public class WebPermissionJSONResolver implements Resolver {
     }
 
     private Response getResponse() {
-        List<String> permissions = dbSystem.getDatabase().query(WebUserQueries.fetchAvailablePermissions());
+        List<String> permissions = dbSystem.getDatabase().query(WebUserQueries.fetchAvailablePermissions())
+                .stream()
+                .filter(Predicate.not(WebPermission::isDeprecated))
+                .collect(Collectors.toList());
 
         WebPermissionList permissionList = new WebPermissionList(permissions);
         return Response.builder()

Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/DBOpException.java

@@ -30,6 +30,7 @@ import java.util.Optional;
 public class DBOpException extends IllegalStateException implements ExceptionWithContext {
 
     public static final String CONSTRAINT_VIOLATION = "Constraint Violation";
+    public static final String DUPLICATE_KEY = "Duplicate key";
     private final ErrorContext context;
 
     public DBOpException(String message) {
@@ -77,7 +78,7 @@ public class DBOpException extends IllegalStateException implements ExceptionWit
             case 1022:
             case 23001:
             case 23505:
-                context.related("Duplicate key")
+                context.related(DUPLICATE_KEY)
                         .whatToDo("Report this, duplicate key exists in SQL.");
                 break;
             // Constraint violation
@@ -165,4 +166,9 @@ public class DBOpException extends IllegalStateException implements ExceptionWit
                 && getCause() != null
                 && getCause().getMessage().contains("user_id");
     }
+
+    public boolean isDuplicateKeyViolation() {
+        return context != null
+                && context.getRelated().contains(DBOpException.CONSTRAINT_VIOLATION);
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalPlayerResultsTransaction.java

@@ -1,192 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.extension.implementation.storage.transactions.results;
-
-import com.djrapitops.plan.storage.database.DBType;
-import com.djrapitops.plan.storage.database.sql.tables.extension.*;
-import com.djrapitops.plan.storage.database.transactions.ExecStatement;
-import com.djrapitops.plan.storage.database.transactions.Executable;
-import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
-
-/**
- * Transaction to remove older results that violate an updated condition value.
- * <p>
- * How it works:
- * - Select all fulfilled conditions for all players (conditionName when true and not_conditionName when false)
- * - Left join with player value and provider tables when uuids match, and when condition matches a condition in the query above.
- * - Filter the join query for values where the condition did not match any provided condition in the join (Is null)
- * - Delete all player values with IDs that are returned by the left join query after filtering
- *
- * @author AuroraLS3
- */
-public class RemoveUnsatisfiedConditionalPlayerResultsTransaction extends ThrowawayTransaction {
-
-    private final String providerTable;
-    private final String playerValueTable;
-    private final String playerTableValueTable;
-    private final String tableTable;
-    private final String groupTable;
-
-    public RemoveUnsatisfiedConditionalPlayerResultsTransaction() {
-        providerTable = ExtensionProviderTable.TABLE_NAME;
-        playerValueTable = ExtensionPlayerValueTable.TABLE_NAME;
-        tableTable = ExtensionTableProviderTable.TABLE_NAME;
-        groupTable = ExtensionGroupsTable.TABLE_NAME;
-        playerTableValueTable = ExtensionPlayerTableValueTable.TABLE_NAME;
-    }
-
-    @Override
-    protected void performOperations() {
-        String selectSatisfiedConditions = getSatisfiedConditionsSQL();
-
-        execute(deleteUnsatisfiedValues(selectSatisfiedConditions));
-        execute(deleteUnsatisfiedGroupValues(selectSatisfiedConditions));
-        execute(deleteUnsatisfiedTableValues(selectSatisfiedConditions));
-    }
-
-    private String getSatisfiedConditionsSQL() {
-        String reversedCondition = dbType == DBType.SQLITE ? "'not_' || " + ExtensionProviderTable.PROVIDED_CONDITION : "CONCAT('not_'," + ExtensionProviderTable.PROVIDED_CONDITION + ')';
-
-        String selectSatisfiedPositiveConditions = SELECT +
-                ExtensionProviderTable.PROVIDED_CONDITION + ',' +
-                ExtensionProviderTable.PLUGIN_ID + ',' +
-                ExtensionPlayerTableValueTable.USER_UUID +
-                FROM + providerTable +
-                INNER_JOIN + playerValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionPlayerValueTable.PROVIDER_ID +
-                WHERE + ExtensionPlayerValueTable.BOOLEAN_VALUE + "=?" +
-                AND + ExtensionProviderTable.PROVIDED_CONDITION + IS_NOT_NULL;
-        String selectSatisfiedNegativeConditions = SELECT +
-                reversedCondition + " as " + ExtensionProviderTable.PROVIDED_CONDITION + ',' +
-                ExtensionProviderTable.PLUGIN_ID + ',' +
-                ExtensionPlayerTableValueTable.USER_UUID +
-                FROM + providerTable +
-                INNER_JOIN + playerValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionPlayerValueTable.PROVIDER_ID +
-                WHERE + ExtensionPlayerValueTable.BOOLEAN_VALUE + "=?" +
-                AND + ExtensionProviderTable.PROVIDED_CONDITION + IS_NOT_NULL;
-
-        // Query contents: Set of provided_conditions
-        return '(' + selectSatisfiedPositiveConditions + " UNION " + selectSatisfiedNegativeConditions + ") q1";
-    }
-
-    private Executable deleteUnsatisfiedValues(String selectSatisfiedConditions) {
-        // Query contents:
-        // id | uuid | q1.uuid | condition | q1.provided_condition
-        // -- | ---- | ------- | --------- | ---------------------
-        // 1  | ...  | ...     | A         | A                     Satisfied condition
-        // 2  | ...  | ...     | not_B     | not_B                 Satisfied condition
-        // 3  | ...  | ...     | NULL      | NULL                  Satisfied condition
-        // 4  | ...  | ...     | B         | NULL                  Unsatisfied condition, filtered to these in WHERE clause.
-        // 5  | ...  | ...     | not_C     | NULL                  Unsatisfied condition
-        String selectUnsatisfiedValueIDs = SELECT + playerValueTable + '.' + ExtensionPlayerValueTable.ID +
-                FROM + providerTable +
-                INNER_JOIN + playerValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionPlayerValueTable.PROVIDER_ID +
-                LEFT_JOIN + selectSatisfiedConditions + // Left join to preserve values that don't have their condition fulfilled
-                " on (" + // Join when uuid and plugin_id match and condition for the group provider is satisfied
-                playerValueTable + '.' + ExtensionPlayerValueTable.USER_UUID +
-                "=q1." + ExtensionPlayerValueTable.USER_UUID +
-                AND + ExtensionProviderTable.CONDITION +
-                "=q1." + ExtensionProviderTable.PROVIDED_CONDITION +
-                AND + providerTable + '.' + ExtensionProviderTable.PLUGIN_ID +
-                "=q1." + ExtensionProviderTable.PLUGIN_ID +
-                ')' +
-                WHERE + "q1." + ExtensionProviderTable.PROVIDED_CONDITION + IS_NULL + // Conditions that were not in the satisfied condition query
-                AND + ExtensionProviderTable.CONDITION + IS_NOT_NULL; // Ignore values that don't need condition
-
-        // Nested query here is required because MySQL limits update statements with nested queries:
-        // The nested query creates a temporary table that bypasses the same table query-update limit.
-        // Note: MySQL versions 5.6.7+ might optimize this nested query away leading to an exception.
-        String sql = DELETE_FROM + playerValueTable +
-                WHERE + ExtensionPlayerValueTable.ID + " IN (" + SELECT + ExtensionPlayerValueTable.ID + FROM + '(' + selectUnsatisfiedValueIDs + ") as ids)";
-
-        return new ExecStatement(sql) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setBoolean(1, true);  // Select provided conditions with 'true' value
-                statement.setBoolean(2, false); // Select negated conditions with 'false' value
-            }
-        };
-    }
-
-    private Executable deleteUnsatisfiedTableValues(String selectSatisfiedConditions) {
-        String selectUnsatisfiedValueIDs = SELECT + ExtensionTableProviderTable.ID +
-                FROM + tableTable +
-                LEFT_JOIN + selectSatisfiedConditions + // Left join to preserve values that don't have their condition fulfilled
-                " on (" + // Join when plugin_id matches and condition for the group provider is satisfied
-                tableTable + '.' + ExtensionTableProviderTable.CONDITION +
-                "=q1." + ExtensionProviderTable.PROVIDED_CONDITION +
-                AND + tableTable + '.' + ExtensionTableProviderTable.PLUGIN_ID +
-                "=q1." + ExtensionProviderTable.PLUGIN_ID +
-                ')' +
-                WHERE + "q1." + ExtensionProviderTable.PROVIDED_CONDITION + IS_NULL + // Conditions that were not in the satisfied condition query
-                AND + ExtensionProviderTable.CONDITION + IS_NOT_NULL; // Ignore values that don't need condition
-
-        // Nested query here is required because MySQL limits update statements with nested queries:
-        // The nested query creates a temporary table that bypasses the same table query-update limit.
-        // Note: MySQL versions 5.6.7+ might optimize this nested query away leading to an exception.
-        String deleteValuesSQL = DELETE_FROM + playerTableValueTable +
-                WHERE + ExtensionPlayerTableValueTable.TABLE_ID + " IN (" + SELECT + ExtensionTableProviderTable.ID + FROM + '(' + selectUnsatisfiedValueIDs + ") as ids)";
-
-        return new ExecStatement(deleteValuesSQL) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setBoolean(1, true);  // Select provided conditions with 'true' value
-                statement.setBoolean(2, false); // Select negated conditions with 'false' value
-            }
-        };
-    }
-
-    private Executable deleteUnsatisfiedGroupValues(String selectSatisfiedConditions) {
-        // plan_extensions_player_groups.id is needed for removal of the correct row.
-        // The id is known if group_id & uuid are known
-        // -
-        // Conditions are in plan_extensions_providers
-        // selectSatisfiedConditions lists 'provided_condition' Strings
-        String selectUnsatisfiedIDs = SELECT + groupTable + '.' + ID +
-                FROM + groupTable +
-                INNER_JOIN + providerTable + " on " + providerTable + '.' + ID + '=' + groupTable + '.' + ExtensionGroupsTable.PROVIDER_ID +
-                LEFT_JOIN + selectSatisfiedConditions + // Left join to preserve values that don't have their condition fulfilled
-                " on (" + // Join when uuid and plugin_id match and condition for the group provider is satisfied
-                groupTable + '.' + P_UUID +
-                "=q1." + P_UUID +
-                AND + ExtensionProviderTable.CONDITION +
-                "=q1." + ExtensionProviderTable.PROVIDED_CONDITION +
-                AND + providerTable + '.' + ExtensionProviderTable.PLUGIN_ID +
-                "=q1." + ExtensionProviderTable.PLUGIN_ID +
-                ')' +
-                WHERE + "q1." + ExtensionProviderTable.PROVIDED_CONDITION + IS_NULL + // Conditions that were not in the satisfied condition query
-                AND + ExtensionProviderTable.CONDITION + IS_NOT_NULL; // Ignore values that don't need condition
-
-        // Nested query here is required because MySQL limits update statements with nested queries:
-        // The nested query creates a temporary table that bypasses the same table query-update limit.
-        // Note: MySQL versions 5.6.7+ might optimize this nested query away leading to an exception.
-        String deleteValuesSQL = DELETE_FROM + groupTable +
-                WHERE + ID + " IN (" + SELECT + ID + FROM + '(' + selectUnsatisfiedIDs + ") as ids)";
-
-        return new ExecStatement(deleteValuesSQL) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setBoolean(1, true);  // Select provided conditions with 'true' value
-                statement.setBoolean(2, false); // Select negated conditions with 'false' value
-            }
-        };
-    }
-}

Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/RemoveUnsatisfiedConditionalServerResultsTransaction.java

@@ -1,150 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.extension.implementation.storage.transactions.results;
-
-import com.djrapitops.plan.storage.database.DBType;
-import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable;
-import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerTableValueTable;
-import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable;
-import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionTableProviderTable;
-import com.djrapitops.plan.storage.database.transactions.ExecStatement;
-import com.djrapitops.plan.storage.database.transactions.Executable;
-import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
-
-/**
- * Transaction to remove older results that violate an updated condition value.
- * <p>
- * How it works:
- * - Select all fulfilled conditions for all servers (conditionName when true and not_conditionName when false)
- * - Left join with server value and provider tables when plugin_ids match, and when condition matches a condition in the
- * query above. (plugin_ids can be linked to servers)
- * - Filter the join query for values where the condition did not match any provided condition in the join (Is null)
- * - Delete all server values with IDs that are returned by the left join query after filtering
- *
- * @author AuroraLS3
- */
-public class RemoveUnsatisfiedConditionalServerResultsTransaction extends ThrowawayTransaction {
-
-    private final String providerTable;
-    private final String serverValueTable;
-    private final String serverTableValueTable;
-    private final String tableTable;
-
-    public RemoveUnsatisfiedConditionalServerResultsTransaction() {
-        providerTable = ExtensionProviderTable.TABLE_NAME;
-        serverValueTable = ExtensionServerValueTable.TABLE_NAME;
-        tableTable = ExtensionTableProviderTable.TABLE_NAME;
-        serverTableValueTable = ExtensionServerTableValueTable.TABLE_NAME;
-    }
-    
-    @Override
-    protected void performOperations() {
-        String selectSatisfiedConditions = getSatisfiedConditionsSQL();
-        execute(deleteUnsatisfiedValues(selectSatisfiedConditions));
-        execute(deleteUnsatisfiedTableValues(selectSatisfiedConditions));
-    }
-
-    private Executable deleteUnsatisfiedValues(String selectSatisfiedConditions) {
-        // Query contents:
-        // id | provider_id | q1.provider_id | condition | q1.provided_condition
-        // -- | ----------- | -------------- | --------- | ---------------------
-        // 1  | ...         | ...            | A         | A                     Satisfied condition
-        // 2  | ...         | ...            | not_B     | not_B                 Satisfied condition
-        // 3  | ...         | ...            | NULL      | NULL                  Satisfied condition
-        // 4  | ...         | ...            | B         | NULL                  Unsatisfied condition, filtered to these in WHERE clause.
-        // 5  | ...         | ...            | not_C     | NULL                  Unsatisfied condition
-        String selectUnsatisfiedValueIDs = SELECT + serverValueTable + '.' + ExtensionServerValueTable.ID +
-                FROM + providerTable +
-                INNER_JOIN + serverValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionServerValueTable.PROVIDER_ID +
-                LEFT_JOIN + selectSatisfiedConditions + // Left join to preserve values that don't have their condition fulfilled
-                " on (" +
-                ExtensionProviderTable.CONDITION + "=q1." + ExtensionProviderTable.PROVIDED_CONDITION +
-                AND + providerTable + '.' + ExtensionProviderTable.PLUGIN_ID + "=q1." + ExtensionProviderTable.PLUGIN_ID +
-                ')' +
-                WHERE + "q1." + ExtensionProviderTable.PROVIDED_CONDITION + IS_NULL + // Conditions that were not in the satisfied condition query
-                AND + ExtensionProviderTable.CONDITION + IS_NOT_NULL; // Ignore values that don't need condition
-
-        // Nested query here is required because MySQL limits update statements with nested queries:
-        // The nested query creates a temporary table that bypasses the same table query-update limit.
-        // Note: MySQL versions 5.6.7+ might optimize this nested query away leading to an exception.
-        String sql = DELETE_FROM + serverValueTable +
-                WHERE + ExtensionServerValueTable.ID + " IN (" + SELECT + ExtensionServerValueTable.ID + FROM + '(' + selectUnsatisfiedValueIDs + ") as ids)";
-
-        return new ExecStatement(sql) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setBoolean(1, true);  // Select provided conditions with 'true' value
-                statement.setBoolean(2, false); // Select negated conditions with 'false' value
-            }
-        };
-    }
-
-    private String getSatisfiedConditionsSQL() {
-        String reversedCondition = dbType == DBType.SQLITE ? "'not_' || " + ExtensionProviderTable.PROVIDED_CONDITION : "CONCAT('not_'," + ExtensionProviderTable.PROVIDED_CONDITION + ')';
-
-        String selectSatisfiedPositiveConditions = SELECT +
-                ExtensionProviderTable.PROVIDED_CONDITION + ',' +
-                ExtensionProviderTable.PLUGIN_ID +
-                FROM + providerTable +
-                INNER_JOIN + serverValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionServerValueTable.PROVIDER_ID +
-                WHERE + ExtensionServerValueTable.BOOLEAN_VALUE + "=?" +
-                AND + ExtensionProviderTable.PROVIDED_CONDITION + IS_NOT_NULL;
-        String selectSatisfiedNegativeConditions = SELECT +
-                reversedCondition + " as " + ExtensionProviderTable.PROVIDED_CONDITION + ',' +
-                ExtensionProviderTable.PLUGIN_ID +
-                FROM + providerTable +
-                INNER_JOIN + serverValueTable + " on " + providerTable + '.' + ExtensionProviderTable.ID + "=" + ExtensionServerValueTable.PROVIDER_ID +
-                WHERE + ExtensionServerValueTable.BOOLEAN_VALUE + "=?" +
-                AND + ExtensionProviderTable.PROVIDED_CONDITION + IS_NOT_NULL;
-
-        // Query contents: Set of provided_conditions
-        return '(' + selectSatisfiedPositiveConditions + " UNION " + selectSatisfiedNegativeConditions + ") q1";
-    }
-
-    private Executable deleteUnsatisfiedTableValues(String selectSatisfiedConditions) {
-        String selectUnsatisfiedValueIDs = SELECT + ExtensionTableProviderTable.ID +
-                FROM + tableTable +
-                LEFT_JOIN + selectSatisfiedConditions + // Left join to preserve values that don't have their condition fulfilled
-                " on (" +
-                tableTable + '.' + ExtensionTableProviderTable.CONDITION +
-                "=q1." + ExtensionProviderTable.PROVIDED_CONDITION +
-                AND + tableTable + '.' + ExtensionTableProviderTable.PLUGIN_ID +
-                "=q1." + ExtensionProviderTable.PLUGIN_ID +
-                ')' +
-                WHERE + "q1." + ExtensionProviderTable.PROVIDED_CONDITION + IS_NULL + // Conditions that were not in the satisfied condition query
-                AND + ExtensionProviderTable.CONDITION + IS_NOT_NULL; // Ignore values that don't need condition
-
-        // Nested query here is required because MySQL limits update statements with nested queries:
-        // The nested query creates a temporary table that bypasses the same table query-update limit.
-        // Note: MySQL versions 5.6.7+ might optimize this nested query away leading to an exception.
-        String deleteValuesSQL = DELETE_FROM + serverTableValueTable +
-                WHERE + ExtensionServerTableValueTable.TABLE_ID + " IN (" + SELECT + ExtensionTableProviderTable.ID + FROM + '(' + selectUnsatisfiedValueIDs + ") as ids)";
-
-        return new ExecStatement(deleteValuesSQL) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setBoolean(1, true);  // Select provided conditions with 'true' value
-                statement.setBoolean(2, false); // Select negated conditions with 'false' value
-            }
-        };
-    }
-}

Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StorePlayerBooleanResultTransaction.java

@@ -19,13 +19,20 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result
 import com.djrapitops.plan.extension.implementation.ProviderInformation;
 import com.djrapitops.plan.extension.implementation.providers.Parameters;
 import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.queries.QueryStatement;
+import com.djrapitops.plan.storage.database.sql.building.Sql;
 import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable;
 import com.djrapitops.plan.storage.database.transactions.ExecStatement;
 import com.djrapitops.plan.storage.database.transactions.Executable;
 import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction;
+import org.intellij.lang.annotations.Language;
+import org.jetbrains.annotations.NotNull;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 import static com.djrapitops.plan.storage.database.sql.building.Sql.AND;
@@ -61,6 +68,13 @@ public class StorePlayerBooleanResultTransaction extends ThrowawayTransaction {
     @Override
     protected void performOperations() {
         execute(storeValue());
+        commitMidTransaction();
+        List<Integer> providerIds = selectUnfulfilledProviderIds();
+        if (!providerIds.isEmpty()) {
+            execute(deleteUnsatisfiedConditionalResults(providerIds));
+            execute(deleteUnsatisfiedConditionalGroups(providerIds));
+        }
+        execute(deleteUnsatisfiedConditionalTables());
     }
 
     private Executable storeValue() {
@@ -104,4 +118,92 @@ public class StorePlayerBooleanResultTransaction extends ThrowawayTransaction {
             }
         };
     }
+
+    private Executable deleteUnsatisfiedConditionalResults(List<Integer> providerIds) {
+        @Language("SQL") String deleteUnsatisfiedValues = "DELETE FROM plan_extension_user_values " +
+                "WHERE uuid=? " +
+                "AND provider_id IN (" + Sql.nParameters(providerIds.size()) + ")";
+
+        return deleteIds(providerIds, deleteUnsatisfiedValues);
+    }
+
+    @NotNull
+    private ExecStatement deleteIds(List<Integer> providerIds, @Language("SQL") String deleteUnsatisfiedValues) {
+        return new ExecStatement(deleteUnsatisfiedValues) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setString(1, playerUUID.toString());
+                for (int i = 0; i < providerIds.size(); i++) {
+                    statement.setInt(i + 2, providerIds.get(i));
+                }
+            }
+        };
+    }
+
+    private Executable deleteUnsatisfiedConditionalGroups(List<Integer> providerIds) {
+        @Language("SQL") String deleteUnsatisfiedValues = "DELETE FROM plan_extension_groups " +
+                "WHERE uuid=? " +
+                "AND provider_id IN (" + Sql.nParameters(providerIds.size()) + ")";
+
+        return deleteIds(providerIds, deleteUnsatisfiedValues);
+    }
+
+    private List<Integer> selectUnfulfilledProviderIds() {
+        // Need to select:
+        // Provider IDs where condition of this provider is met
+        @Language("SQL") String selectUnsatisfiedProviderIds = "SELECT unfulfilled.id " +
+                "FROM plan_extension_providers indb " +
+                "JOIN plan_extension_providers unfulfilled ON unfulfilled.condition_name=" +
+                // This gives the unfulfilled condition, eg. if value is true not_condition is unfulfilled.
+                (value ? Sql.concat(dbType, "'not_'", "indb.provided_condition") : "indb.provided_condition") +
+                " AND indb.plugin_id=unfulfilled.plugin_id" +
+                " WHERE indb.id=" + ExtensionProviderTable.STATEMENT_SELECT_PROVIDER_ID +
+                " AND indb.provided_condition IS NOT NULL";
+
+        return extractIds(selectUnsatisfiedProviderIds);
+    }
+
+    private Executable deleteUnsatisfiedConditionalTables() {
+        List<Integer> tableIds = selectUnfulfilledTableIds();
+        if (tableIds.isEmpty()) return Executable.empty();
+
+        @Language("SQL") String deleteUnsatisfiedValues = "DELETE FROM plan_extension_user_table_values " +
+                "WHERE uuid=? " +
+                "AND table_id IN (" + Sql.nParameters(tableIds.size()) + ")";
+
+        return deleteIds(tableIds, deleteUnsatisfiedValues);
+    }
+
+    private List<Integer> selectUnfulfilledTableIds() {
+        // Need to select:
+        // Provider IDs where condition of this provider is met
+        @Language("SQL") String selectUnsatisfiedProviderIds = "SELECT unfulfilled.id " +
+                "FROM plan_extension_providers indb " +
+                "JOIN plan_extension_tables unfulfilled ON unfulfilled.condition_name=" +
+                // This gives the unfulfilled condition, eg. if value is true not_condition is unfulfilled.
+                (value ? Sql.concat(dbType, "'not_'", "indb.provided_condition") : "indb.provided_condition") +
+                " AND indb.plugin_id=unfulfilled.plugin_id" +
+                " WHERE indb.id=" + ExtensionProviderTable.STATEMENT_SELECT_PROVIDER_ID +
+                " AND indb.provided_condition IS NOT NULL";
+
+        return extractIds(selectUnsatisfiedProviderIds);
+    }
+
+    private List<Integer> extractIds(@Language("SQL") String selectUnsatisfiedProviderIds) {
+        return query(new QueryStatement<>(selectUnsatisfiedProviderIds) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                ExtensionProviderTable.set3PluginValuesToStatement(statement, 1, providerName, pluginName, serverUUID);
+            }
+
+            @Override
+            public List<Integer> processResults(ResultSet set) throws SQLException {
+                List<Integer> ids = new ArrayList<>();
+                while (set.next()) {
+                    ids.add(set.getInt(1));
+                }
+                return ids;
+            }
+        });
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/transactions/results/StoreServerBooleanResultTransaction.java

@@ -19,13 +19,19 @@ package com.djrapitops.plan.extension.implementation.storage.transactions.result
 import com.djrapitops.plan.extension.implementation.ProviderInformation;
 import com.djrapitops.plan.extension.implementation.providers.Parameters;
 import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.queries.QueryStatement;
+import com.djrapitops.plan.storage.database.sql.building.Sql;
 import com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionProviderTable;
 import com.djrapitops.plan.storage.database.transactions.ExecStatement;
 import com.djrapitops.plan.storage.database.transactions.Executable;
 import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction;
+import org.intellij.lang.annotations.Language;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.djrapitops.plan.storage.database.sql.building.Sql.WHERE;
 import static com.djrapitops.plan.storage.database.sql.tables.extension.ExtensionServerValueTable.*;
@@ -61,6 +67,9 @@ public class StoreServerBooleanResultTransaction extends ThrowawayTransaction {
     @Override
     protected void performOperations() {
         execute(storeValue());
+        commitMidTransaction();
+        execute(deleteUnsatisfiedConditionalResults());
+        execute(deleteUnsatisfiedConditionalTables());
     }
 
     private Executable storeValue() {
@@ -100,4 +109,86 @@ public class StoreServerBooleanResultTransaction extends ThrowawayTransaction {
             }
         };
     }
+
+    private Executable deleteUnsatisfiedConditionalResults() {
+        List<Integer> providerIds = selectUnfulfilledProviderIds();
+        if (providerIds.isEmpty()) return Executable.empty();
+
+        @Language("SQL") String deleteUnsatisfiedValues = "DELETE FROM plan_extension_server_values " +
+                "WHERE provider_id IN (" + Sql.nParameters(providerIds.size()) + ")";
+
+        return new ExecStatement(deleteUnsatisfiedValues) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                for (int i = 0; i < providerIds.size(); i++) {
+                    statement.setInt(i + 1, providerIds.get(i));
+                }
+            }
+        };
+    }
+
+    private List<Integer> selectUnfulfilledProviderIds() {
+        // Need to select:
+        // Provider IDs where condition of this provider is met
+        @Language("SQL") String selectUnsatisfiedProviderIds = "SELECT unfulfilled.id " +
+                "FROM plan_extension_providers indb " +
+                "JOIN plan_extension_providers unfulfilled ON unfulfilled.condition_name=" +
+                // This gives the unfulfilled condition, eg. if value is true not_condition is unfulfilled.
+                (value ? Sql.concat(dbType, "'not_'", "indb.provided_condition") : "indb.provided_condition") +
+                " AND indb.plugin_id=unfulfilled.plugin_id" +
+                " WHERE indb.id=" + ExtensionProviderTable.STATEMENT_SELECT_PROVIDER_ID +
+                " AND indb.provided_condition IS NOT NULL";
+
+        return extractIds(selectUnsatisfiedProviderIds);
+    }
+
+    private Executable deleteUnsatisfiedConditionalTables() {
+        List<Integer> tableIds = selectUnfulfilledTableIds();
+        if (tableIds.isEmpty()) return Executable.empty();
+
+        @Language("SQL") String deleteUnsatisfiedValues = "DELETE FROM plan_extension_server_table_values " +
+                "WHERE table_id IN (" + Sql.nParameters(tableIds.size()) + ")";
+
+        return new ExecStatement(deleteUnsatisfiedValues) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                for (int i = 0; i < tableIds.size(); i++) {
+                    statement.setInt(i + 1, tableIds.get(i));
+                }
+            }
+        };
+    }
+
+    private List<Integer> selectUnfulfilledTableIds() {
+        // Need to select:
+        // Provider IDs where condition of this provider is met
+        @Language("SQL") String selectUnsatisfiedProviderIds = "SELECT unfulfilled.id " +
+                "FROM plan_extension_providers indb " +
+                "JOIN plan_extension_tables unfulfilled ON unfulfilled.condition_name=" +
+                // This gives the unfulfilled condition, eg. if value is true not_condition is unfulfilled.
+                (value ? Sql.concat(dbType, "'not_'", "indb.provided_condition") : "indb.provided_condition") +
+                " AND indb.plugin_id=unfulfilled.plugin_id" +
+                " WHERE indb.id=" + ExtensionProviderTable.STATEMENT_SELECT_PROVIDER_ID +
+                " AND indb.provided_condition IS NOT NULL";
+
+        return extractIds(selectUnsatisfiedProviderIds);
+    }
+
+    private List<Integer> extractIds(@Language("SQL") String selectUnsatisfiedProviderIds) {
+        return query(new QueryStatement<>(selectUnsatisfiedProviderIds) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                ExtensionProviderTable.set3PluginValuesToStatement(statement, 1, providerName, pluginName, serverUUID);
+            }
+
+            @Override
+            public List<Integer> processResults(ResultSet set) throws SQLException {
+                List<Integer> ids = new ArrayList<>();
+                while (set.next()) {
+                    ids.add(set.getInt(1));
+                }
+                return ids;
+            }
+        });
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/gathering/JoinAddressValidator.java

@@ -0,0 +1,94 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.gathering;
+
+import com.djrapitops.plan.settings.config.PlanConfig;
+import com.djrapitops.plan.settings.config.paths.DataGatheringSettings;
+import com.djrapitops.plan.utilities.dev.Untrusted;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility for validating and sanitizing join addresses.
+ *
+ * @author AuroraLS3
+ */
+@Singleton
+public class JoinAddressValidator {
+
+    private final PlanConfig config;
+    private List<String> filteredAddresses;
+
+    @Inject
+    public JoinAddressValidator(PlanConfig config) {
+        /* Dagger injection constructor */
+        this.config = config;
+    }
+
+    private void prepareFilteredAddresses() {
+        if (filteredAddresses == null) {
+            filteredAddresses = config.get(DataGatheringSettings.FILTER_JOIN_ADDRESSES);
+            if (filteredAddresses == null) filteredAddresses = new ArrayList<>();
+        }
+    }
+
+    @Untrusted
+    public String sanitize(@Untrusted String address) {
+        if (address == null || config.isFalse(DataGatheringSettings.JOIN_ADDRESSES)) return "";
+        if (!address.isEmpty()) {
+            // Remove port
+            if (address.contains(":")) {
+                address = address.substring(0, address.lastIndexOf(':'));
+            }
+            // Remove data added by Bungeecord/Velocity
+            if (address.contains("\u0000")) {
+                address = address.substring(0, address.indexOf('\u0000'));
+            }
+            // Remove data added by Forge Mod Loader
+            if (address.contains("fml")) {
+                address = address.substring(0, address.lastIndexOf("fml"));
+            }
+            if (config.isFalse(DataGatheringSettings.PRESERVE_JOIN_ADDRESS_CASE)) {
+                address = StringUtils.lowerCase(address);
+            }
+            prepareFilteredAddresses();
+            if (filteredAddresses.contains(address)) {
+                address = "";
+            }
+        }
+        return address;
+    }
+
+    public boolean isValid(@Untrusted String address) {
+        if (address.isEmpty()) return false;
+        if (config.isTrue(DataGatheringSettings.PRESERVE_INVALID_JOIN_ADDRESS)) return true;
+        try {
+            URI uri = new URI(address);
+            String path = uri.getPath();
+            return path != null && path.indexOf('.') != -1;
+        } catch (URISyntaxException uriSyntaxException) {
+            return false;
+        }
+    }
+
+}

Plan/common/src/main/java/com/djrapitops/plan/gathering/ServerShutdownSave.java

@@ -48,7 +48,6 @@ public abstract class ServerShutdownSave {
     private final ErrorLogger errorLogger;
 
     private boolean shuttingDown = false;
-    private boolean startedDatabase = false;
 
     protected ServerShutdownSave(
             Locale locale,
@@ -90,7 +89,7 @@ public abstract class ServerShutdownSave {
 
     private Optional<Future<?>> attemptSave(Collection<ActiveSession> activeSessions) {
         try {
-            return Optional.of(saveActiveSessions(finishSessions(activeSessions, System.currentTimeMillis())));
+            return saveActiveSessions(finishSessions(activeSessions, System.currentTimeMillis()));
         } catch (DBInitException e) {
             errorLogger.error(e, ErrorContext.builder()
                     .whatToDo("Find the sessions in the error file and save them manually or ignore. Report & delete the error file after.")
@@ -101,20 +100,19 @@ public abstract class ServerShutdownSave {
         } catch (IllegalStateException ignored) {
             /* Database is not initialized */
             return Optional.empty();
-        } finally {
-            closeDatabase(dbSystem.getDatabase());
         }
     }
 
-    private Future<?> saveActiveSessions(Collection<FinishedSession> finishedSessions) {
+    private Optional<Future<?>> saveActiveSessions(Collection<FinishedSession> finishedSessions) {
         Database database = dbSystem.getDatabase();
         if (database.getState() == Database.State.CLOSED) {
-            // Ensure that database is not closed when performing the transaction.
+            // Don't attempt to save if database is closed, session storage will be handled by
-            startedDatabase = true;
+            // ShutdownDataPreservation instead.
-            database.init();
+            // Previously database reboot was attempted, but this could lead to server hang.
+            return Optional.empty();
         }
 
-        return saveSessions(finishedSessions, database);
+        return Optional.of(saveSessions(finishedSessions, database));
     }
 
     Collection<FinishedSession> finishSessions(Collection<ActiveSession> activeSessions, long now) {
@@ -127,10 +125,4 @@ public abstract class ServerShutdownSave {
     private Future<?> saveSessions(Collection<FinishedSession> finishedSessions, Database database) {
         return database.executeTransaction(new ServerShutdownTransaction(finishedSessions));
     }
-
-    private void closeDatabase(Database database) {
-        if (startedDatabase) {
-            database.close();
-        }
-    }
 }

Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/PlatformPlayerData.java

@@ -16,6 +16,8 @@
  */
 package com.djrapitops.plan.gathering.domain;
 
+import com.djrapitops.plan.utilities.dev.Untrusted;
+
 import java.net.InetAddress;
 import java.util.Optional;
 import java.util.UUID;
@@ -24,8 +26,10 @@ public interface PlatformPlayerData {
 
     UUID getUUID();
 
+    @Untrusted
     String getName();
 
+    @Untrusted
     default Optional<String> getDisplayName() {
         return Optional.empty();
     }
@@ -38,6 +42,7 @@ public interface PlatformPlayerData {
         return Optional.empty();
     }
 
+    @Untrusted
     default Optional<String> getJoinAddress() {
         return Optional.empty();
     }

Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/event/PlayerJoin.java

@@ -64,6 +64,13 @@ public class PlayerJoin {
         return time;
     }
 
+    /**
+     * Get address used to join the server.
+     *
+     * @return Join address of the player.
+     * @deprecated {@link com.djrapitops.plan.gathering.JoinAddressValidator} should be used when looking at join address.
+     */
+    @Deprecated(since = "2024-04-27")
     public String getJoinAddress() {
         return player.getJoinAddress().orElse(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
     }

Plan/common/src/main/java/com/djrapitops/plan/gathering/events/PlayerJoinEventConsumer.java

@@ -22,6 +22,7 @@ import com.djrapitops.plan.delivery.domain.ServerName;
 import com.djrapitops.plan.delivery.export.Exporter;
 import com.djrapitops.plan.extension.CallEvents;
 import com.djrapitops.plan.extension.ExtensionSvc;
+import com.djrapitops.plan.gathering.JoinAddressValidator;
 import com.djrapitops.plan.gathering.cache.NicknameCache;
 import com.djrapitops.plan.gathering.cache.SessionCache;
 import com.djrapitops.plan.gathering.domain.ActiveSession;
@@ -38,7 +39,6 @@ import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.sql.tables.JoinAddressTable;
 import com.djrapitops.plan.storage.database.transactions.Transaction;
 import com.djrapitops.plan.storage.database.transactions.events.*;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -52,6 +52,7 @@ public class PlayerJoinEventConsumer {
     private final PlanConfig config;
     private final DBSystem dbSystem;
 
+    private final JoinAddressValidator joinAddressValidator;
     private final GeolocationCache geolocationCache;
     private final SessionCache sessionCache;
     private final NicknameCache nicknameCache;
@@ -63,7 +64,7 @@ public class PlayerJoinEventConsumer {
     public PlayerJoinEventConsumer(
             Processing processing,
             PlanConfig config,
-            DBSystem dbSystem,
+            DBSystem dbSystem, JoinAddressValidator joinAddressValidator,
             GeolocationCache geolocationCache,
             SessionCache sessionCache,
             NicknameCache nicknameCache,
@@ -73,6 +74,7 @@ public class PlayerJoinEventConsumer {
         this.processing = processing;
         this.config = config;
         this.dbSystem = dbSystem;
+        this.joinAddressValidator = joinAddressValidator;
         this.geolocationCache = geolocationCache;
         this.sessionCache = sessionCache;
         this.nicknameCache = nicknameCache;
@@ -110,7 +112,8 @@ public class PlayerJoinEventConsumer {
 
     private void storeJoinAddress(PlayerJoin join) {
         join.getPlayer().getJoinAddress()
-                .map(joinAddress -> config.isTrue(DataGatheringSettings.PRESERVE_JOIN_ADDRESS_CASE) ? joinAddress : StringUtils.lowerCase(joinAddress))
+                .map(joinAddressValidator::sanitize)
+                .filter(joinAddressValidator::isValid)
                 .map(StoreJoinAddressTransaction::new)
                 .ifPresent(dbSystem.getDatabase()::executeTransaction);
     }
@@ -141,7 +144,10 @@ public class PlayerJoinEventConsumer {
 
     private CompletableFuture<?> storeGamePlayer(PlayerJoin join) {
         long registerDate = getRegisterDate(join);
-        String joinAddress = join.getPlayer().getJoinAddress().orElse(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
+        String joinAddress = join.getPlayer().getJoinAddress()
+                .map(joinAddressValidator::sanitize)
+                .filter(joinAddressValidator::isValid)
+                .orElse(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
         Transaction transaction = new StoreServerPlayerTransaction(
                 join.getPlayerUUID(), registerDate, join.getPlayer().getName(), join.getServerUUID(), joinAddress
         );
@@ -171,12 +177,16 @@ public class PlayerJoinEventConsumer {
     }
 
     private ActiveSession mapToActiveSession(PlayerJoin join) {
+        String joinAddress = join.getPlayer().getJoinAddress()
+                .map(joinAddressValidator::sanitize)
+                .filter(joinAddressValidator::isValid)
+                .orElse(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
         ActiveSession session = new ActiveSession(join.getPlayerUUID(), join.getServerUUID(), join.getTime(),
                 join.getPlayer().getCurrentWorld().orElse(null),
                 join.getPlayer().getCurrentGameMode().orElse(null));
         session.getExtraData().put(PlayerName.class, new PlayerName(join.getPlayer().getName()));
         session.getExtraData().put(ServerName.class, new ServerName(join.getServer().isProxy() ? join.getServer().getName() : "Proxy Server"));
-        session.getExtraData().put(JoinAddress.class, new JoinAddress(config.isTrue(DataGatheringSettings.PRESERVE_JOIN_ADDRESS_CASE) ? join.getJoinAddress() : StringUtils.lowerCase(join.getJoinAddress())));
+        session.getExtraData().put(JoinAddress.class, new JoinAddress(joinAddress));
         return session;
     }
 

Plan/common/src/main/java/com/djrapitops/plan/gathering/geolocation/GeoLite2Geolocator.java

@@ -20,15 +20,13 @@ import com.djrapitops.plan.exceptions.PreparationException;
 import com.djrapitops.plan.settings.config.PlanConfig;
 import com.djrapitops.plan.settings.config.paths.DataGatheringSettings;
 import com.djrapitops.plan.storage.file.PlanFiles;
-import com.djrapitops.plan.utilities.Base64Util;
 import com.maxmind.geoip2.DatabaseReader;
 import com.maxmind.geoip2.exception.GeoIp2Exception;
 import com.maxmind.geoip2.model.CountryResponse;
 import com.maxmind.geoip2.record.Country;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
-import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -38,10 +36,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.URL;
+import java.net.URLConnection;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.zip.GZIPInputStream;
 
 /**
@@ -83,62 +81,45 @@ public class GeoLite2Geolocator implements Geolocator {
                 Files.delete(geolocationDB.toPath()); // Delete old data according to restriction 3. in EULA
             }
         }
-
         downloadDatabase();
         // Delete old Geolocation database file if it still exists (on success to avoid a no-file situation)
         Files.deleteIfExists(files.getFileFromPluginFolder("GeoIP.dat").toPath());
     }
 
-    private static String a(String c, String d) {
-        var o = new StandardPBEStringEncryptor();
-        g(c, q(o));
-        return o.decrypt(d);
-    }
-
-    private static void g(String h, Consumer<String> b) {
-        b.accept(l(h));
-    }
-
-    private static Consumer<String> q(StandardPBEStringEncryptor t) {
-        return t::setPassword;
-    }
-
-    private static String l(String f) {
-        return Base64Util.decode(f);
-    }
-
     private void downloadDatabase() throws IOException {
         // Avoid Socket leak with the parameters in case download url has proxy
-        // https://AuroraLS3.github.io/mishaps/java_socket_leak_incident
         Properties properties = System.getProperties();
         properties.setProperty("sun.net.client.defaultConnectTimeout", Long.toString(TimeUnit.MINUTES.toMillis(1L)));
         properties.setProperty("sun.net.client.defaultReadTimeout", Long.toString(TimeUnit.MINUTES.toMillis(1L)));
         properties.setProperty("sun.net.http.retryPost", Boolean.toString(false));
 
-        String key = getKey();
+        String downloadURL = config.get(DataGatheringSettings.GEOLOCATION_DOWNLOAD_URL);
-        String downloadFrom = "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=" + key + "&suffix=tar.gz";
+        URL downloadSite = new URL(downloadURL);
-        URL downloadSite = new URL(downloadFrom);
+        if (downloadURL.startsWith("https://download.maxmind.com/app/geoip_download")) {
-        try (
+            try (
-                InputStream in = downloadSite.openStream();
+                    InputStream in = downloadSite.openStream();
-                GZIPInputStream gzipIn = new GZIPInputStream(in);
+                    GZIPInputStream gzipIn = new GZIPInputStream(in);
-                TarArchiveInputStream tarIn = new TarArchiveInputStream(gzipIn);
+                    TarArchiveInputStream tarIn = new TarArchiveInputStream(gzipIn);
-                FileOutputStream fos = new FileOutputStream(geolocationDB.getAbsoluteFile())
+                    FileOutputStream fos = new FileOutputStream(geolocationDB.getAbsoluteFile())
-        ) {
+            ) {
-            findAndCopyFromTar(tarIn, fos);
+                findAndCopyFromTar(tarIn, fos);
+            }
+        } else {
+            URLConnection connection = downloadSite.openConnection();
+            connection.setRequestProperty("X-PLAN-GEODB-TOKEN", "68342d1f-5fc9-4853-bd1e-ba88c466b3a6");
+            try (
+                    InputStream in = connection.getInputStream();
+                    FileOutputStream fos = new FileOutputStream(geolocationDB.getAbsoluteFile())
+            ) {
+                IOUtils.copy(in, fos);
+            }
         }
     }
 
-    private String getKey() throws IOException {
-        String y = "bGljZW5z";
-        String u = new String(files.getResourceFromJar(y + "ZV9wYXNz.txt").asBytes());
-        String h = new String(files.getResourceFromJar(y + "ZV9rZXlz.txt").asBytes());
-        return a(u, h);
-    }
-
     private void findAndCopyFromTar(TarArchiveInputStream tarIn, FileOutputStream fos) throws IOException {
         // Breadth first search
         Queue<TarArchiveEntry> entries = new ArrayDeque<>();
-        entries.add(tarIn.getNextTarEntry());
+        entries.add(tarIn.getNextEntry());
         while (!entries.isEmpty()) {
             TarArchiveEntry entry = entries.poll();
             if (entry.isDirectory()) {
@@ -151,7 +132,7 @@ public class GeoLite2Geolocator implements Geolocator {
                 break; // Found it
             }
 
-            TarArchiveEntry next = tarIn.getNextTarEntry();
+            TarArchiveEntry next = tarIn.getNextEntry();
             if (next != null) entries.add(next);
         }
     }

Plan/common/src/main/java/com/djrapitops/plan/gathering/timed/InstalledPluginGatheringTask.java

@@ -57,7 +57,7 @@ public class InstalledPluginGatheringTask extends TaskSystem.Task {
     @Override
     public void register(RunnableFactory runnableFactory) {
         runnableFactory.create(this)
-                .runTaskLater(20, TimeUnit.SECONDS);
+                .runTaskLaterAsynchronously(20, TimeUnit.SECONDS);
     }
 
     @Override

Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java

@@ -27,6 +27,7 @@ import com.djrapitops.plan.gathering.domain.ActiveSession;
 import com.djrapitops.plan.gathering.domain.FinishedSession;
 import com.djrapitops.plan.gathering.domain.GeoInfo;
 import com.djrapitops.plan.gathering.domain.PlayerKill;
+import com.djrapitops.plan.gathering.domain.event.JoinAddress;
 import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.settings.config.PlanConfig;
@@ -157,6 +158,14 @@ public class PlayerPlaceHolders implements Placeholders {
                         .orElse(locale.getString(GenericLang.UNKNOWN))
         );
 
+        placeholders.register("player_join_address",
+                player -> SessionsMutator.forContainer(player)
+                        .latestSession()
+                        .flatMap(session -> session.getExtraData(JoinAddress.class))
+                        .map(JoinAddress::getAddress)
+                        .orElse(locale.getString(GenericLang.UNKNOWN))
+        );
+
         registerPlaytimePlaceholders(placeholders, time);
         registerSessionLengethPlaceholders(placeholders, time);
 

Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java

@@ -19,12 +19,17 @@ package com.djrapitops.plan.placeholder;
 import com.djrapitops.plan.commands.use.Arguments;
 import com.djrapitops.plan.delivery.formatting.Formatter;
 import com.djrapitops.plan.delivery.formatting.Formatters;
+import com.djrapitops.plan.gathering.ServerUptimeCalculator;
 import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.settings.config.PlanConfig;
+import com.djrapitops.plan.settings.config.paths.TimeSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.Query;
+import com.djrapitops.plan.storage.database.queries.analysis.ActivityIndexQueries;
+import com.djrapitops.plan.storage.database.queries.analysis.NetworkActivityIndexQueries;
 import com.djrapitops.plan.storage.database.queries.analysis.PlayerCountQueries;
 import com.djrapitops.plan.storage.database.queries.analysis.TopListQueries;
 import com.djrapitops.plan.storage.database.queries.objects.ServerQueries;
@@ -50,19 +55,24 @@ import static com.djrapitops.plan.utilities.MiscUtils.*;
 @Singleton
 public class ServerPlaceHolders implements Placeholders {
 
+    private final PlanConfig config;
     private final DBSystem dbSystem;
     private final ServerInfo serverInfo;
     private final Formatters formatters;
+    private final ServerUptimeCalculator serverUptimeCalculator;
 
     @Inject
     public ServerPlaceHolders(
+            PlanConfig config,
             DBSystem dbSystem,
             ServerInfo serverInfo,
-            Formatters formatters
+            Formatters formatters, ServerUptimeCalculator serverUptimeCalculator
     ) {
+        this.config = config;
         this.dbSystem = dbSystem;
         this.serverInfo = serverInfo;
         this.formatters = formatters;
+        this.serverUptimeCalculator = serverUptimeCalculator;
     }
 
     @Override
@@ -197,9 +207,19 @@ public class ServerPlaceHolders implements Placeholders {
         placeholders.registerStatic("server_name",
                 () -> serverInfo.getServer().getName());
 
+        placeholders.registerStatic("server_uptime",
+                parameters -> serverUptimeCalculator.getServerUptimeMillis(getServerUUID(parameters))
+                        .map(String::valueOf)
+                        .orElse("-"));
+
         placeholders.registerStatic("server_uuid",
                 serverInfo::getServerUUID);
 
+        placeholders.registerStatic("regular_players",
+                parameters -> database.query(ActivityIndexQueries.fetchRegularPlayerCount(System.currentTimeMillis(), getServerUUID(parameters), config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD))));
+        placeholders.registerStatic("network_regular_players",
+                () -> database.query(NetworkActivityIndexQueries.fetchRegularPlayerCount(System.currentTimeMillis(), config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD))));
+
         registerDynamicCategoryPlaceholders(placeholders, database);
     }
 
@@ -215,7 +235,9 @@ public class ServerPlaceHolders implements Placeholders {
     private void registerDynamicCategoryPlaceholders(PlanPlaceholders placeholders, Database database) {
         List<TopCategoryQuery<Long>> queries = new ArrayList<>();
         queries.addAll(createCategoryQueriesForAllTimespans("playtime", (index, timespan, parameters) -> TopListQueries.fetchNthTop10PlaytimePlayerOn(getServerUUID(parameters), index, System.currentTimeMillis() - timespan, System.currentTimeMillis())));
+        queries.addAll(createCategoryQueriesForAllTimespans("network_playtime", (index, timespan, parameters) -> TopListQueries.fetchNthTop10PlaytimePlayerOn(null, index, System.currentTimeMillis() - timespan, System.currentTimeMillis())));
         queries.addAll(createCategoryQueriesForAllTimespans("active_playtime", (index, timespan, parameters) -> TopListQueries.fetchNthTop10ActivePlaytimePlayerOn(getServerUUID(parameters), index, System.currentTimeMillis() - timespan, System.currentTimeMillis())));
+        queries.addAll(createCategoryQueriesForAllTimespans("network_active_playtime", (index, timespan, parameters) -> TopListQueries.fetchNthTop10ActivePlaytimePlayerOn(null, index, System.currentTimeMillis() - timespan, System.currentTimeMillis())));
         queries.addAll(createCategoryQueriesForAllTimespans("player_kills", (index, timespan, parameters) -> TopListQueries.fetchNthTop10PlayerKillCountOn(getServerUUID(parameters), index, System.currentTimeMillis() - timespan, System.currentTimeMillis())));
 
         for (int i = 0; i < 10; i++) {

Plan/common/src/main/java/com/djrapitops/plan/placeholder/SessionPlaceHolders.java

@@ -52,6 +52,11 @@ public class SessionPlaceHolders implements Placeholders {
     private final ServerInfo serverInfo;
     private final Formatters formatters;
 
+    private Formatter<Long> timeAmount;
+    private Formatter<DateHolder> year;
+    private Formatter<Double> decimals;
+    private Database database;
+
     @Inject
     public SessionPlaceHolders(
             PlanConfig config,
@@ -71,67 +76,149 @@ public class SessionPlaceHolders implements Placeholders {
         return timeAmount.apply(sessionCount != 0 ? playtime / sessionCount : playtime);
     }
 
+
+    private static String getPlaytime(Database database, long after, long before, Formatter<Long> timeAmount) {
+        Long playtime = database.query(SessionQueries.playtime(after, before));
+        Long sessionCount = database.query(SessionQueries.sessionCount(after, before));
+        return timeAmount.apply(sessionCount != 0 ? playtime / sessionCount : playtime);
+    }
+
     @Override
     public void register(
             PlanPlaceholders placeholders
     ) {
         int tzOffsetMs = config.getTimeZone().getOffset(System.currentTimeMillis());
-        Formatter<Long> timeAmount = formatters.timeAmount();
+        timeAmount = formatters.timeAmount();
-        Formatter<DateHolder> year = formatters.year();
+        year = formatters.year();
-        Formatter<Double> decimals = formatters.decimals();
+        decimals = formatters.decimals();
-        Database database = dbSystem.getDatabase();
+        database = dbSystem.getDatabase();
 
-        placeholders.registerStatic("sessions_play_time_total",
+        registerServerPlaytime(placeholders);
-                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(0L, now(), getServerUUID(parameters)))));
+        registerNetworkPlaytime(placeholders);
-        placeholders.registerStatic("sessions_play_time_total_raw",
+        registerServerActivePlaytime(placeholders);
-                parameters -> database.query(SessionQueries.playtime(0L, now(), getServerUUID(parameters))));
+        registerNetworkActivePlaytime(placeholders);
-        placeholders.registerStatic("sessions_play_time_day",
+        registerServerAfkTime(placeholders);
-                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(dayAgo(), now(), getServerUUID(parameters)))));
+        registerNetworkAfkTime(placeholders);
-        placeholders.registerStatic("sessions_play_time_day_raw",
-                parameters -> database.query(SessionQueries.playtime(dayAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_play_time_week",
-                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(weekAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_play_time_week_raw",
-                parameters -> database.query(SessionQueries.playtime(weekAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_play_time_month",
-                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(monthAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_play_time_month_raw",
-                parameters -> database.query(SessionQueries.playtime(monthAgo(), now(), getServerUUID(parameters))));
 
-        placeholders.registerStatic("sessions_active_time_total",
+        registerServerPve(placeholders);
-                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(0L, now(), getServerUUID(parameters)))));
+        registerSessionLength(placeholders);
-        placeholders.registerStatic("sessions_active_time_total_raw",
-                parameters -> database.query(SessionQueries.activePlaytime(0L, now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_active_time_day",
-                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(dayAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_active_time_day_raw",
-                parameters -> database.query(SessionQueries.activePlaytime(dayAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_active_time_week",
-                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(weekAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_active_time_week_raw",
-                parameters -> database.query(SessionQueries.activePlaytime(weekAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_active_time_month",
-                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(monthAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_active_time_month_raw",
-                parameters -> database.query(SessionQueries.activePlaytime(monthAgo(), now(), getServerUUID(parameters))));
 
-        placeholders.registerStatic("sessions_afk_time_total",
+        registerServerUniquePlayers(placeholders);
-                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(0L, now(), getServerUUID(parameters)))));
+        registerNetworkUniquePlayers(placeholders);
-        placeholders.registerStatic("sessions_afk_time_total_raw",
+        registerAverageUniquePlayer(placeholders, tzOffsetMs);
-                parameters -> database.query(SessionQueries.afkTime(0L, now(), getServerUUID(parameters))));
+        registerNewPlayer(placeholders);
-        placeholders.registerStatic("sessions_afk_time_day",
-                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(dayAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_afk_time_day_raw",
-                parameters -> database.query(SessionQueries.afkTime(dayAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_afk_time_week",
-                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(weekAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_afk_time_week_raw",
-                parameters -> database.query(SessionQueries.afkTime(weekAgo(), now(), getServerUUID(parameters))));
-        placeholders.registerStatic("sessions_afk_time_month",
-                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(monthAgo(), now(), getServerUUID(parameters)))));
-        placeholders.registerStatic("sessions_afk_time_month_raw",
-                parameters -> database.query(SessionQueries.afkTime(monthAgo(), now(), getServerUUID(parameters))));
 
+        registerPing(placeholders);
+        registerServerPeakCounts(placeholders);
+    }
+
+    private void registerServerPeakCounts(PlanPlaceholders placeholders) {
+        placeholders.registerStatic("sessions_peak_count",
+                parameters -> database.query(TPSQueries.fetchAllTimePeakPlayerCount(getServerUUID(parameters))).map(DateObj::getValue).orElse(0));
+        placeholders.registerStatic("sessions_peak_date",
+                parameters -> database.query(TPSQueries.fetchAllTimePeakPlayerCount(getServerUUID(parameters))).map(year).orElse("-"));
+        placeholders.registerStatic("sessions_recent_peak_count",
+                parameters -> database.query(TPSQueries.fetchPeakPlayerCount(getServerUUID(parameters), now() - TimeUnit.DAYS.toMillis(2L))).map(DateObj::getValue).orElse(0));
+        placeholders.registerStatic("sessions_recent_peak_date",
+                parameters -> database.query(TPSQueries.fetchPeakPlayerCount(getServerUUID(parameters), now() - TimeUnit.DAYS.toMillis(2L))).map(year).orElse("-"));
+    }
+
+    private void registerPing(PlanPlaceholders placeholders) {
+        placeholders.registerStatic("ping_total",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(0L, now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("ping_day",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(dayAgo(), now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("ping_week",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(weekAgo(), now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("ping_month",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(monthAgo(), now(), getServerUUID(parameters)))) + " ms");
+
+        placeholders.registerStatic("network_ping_total",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(0L, now()))) + " ms");
+        placeholders.registerStatic("network_ping_day",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(dayAgo(), now()))) + " ms");
+        placeholders.registerStatic("network_ping_week",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(weekAgo(), now()))) + " ms");
+        placeholders.registerStatic("network_ping_month",
+                parameters -> decimals.apply(database.query(PingQueries.averagePing(monthAgo(), now()))) + " ms");
+    }
+
+    private void registerNewPlayer(PlanPlaceholders placeholders) {
+        placeholders.registerStatic("sessions_new_players_day",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(dayAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_new_players_week",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(weekAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_new_players_month",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(monthAgo(), now(), getServerUUID(parameters))));
+
+        placeholders.registerStatic("network_sessions_new_players_day",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(dayAgo(), now())));
+        placeholders.registerStatic("network_sessions_new_players_week",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(weekAgo(), now())));
+        placeholders.registerStatic("network_sessions_new_players_month",
+                parameters -> database.query(PlayerCountQueries.newPlayerCount(monthAgo(), now())));
+    }
+
+    private void registerAverageUniquePlayer(PlanPlaceholders placeholders, int tzOffsetMs) {
+        placeholders.registerStatic("sessions_average_unique_players_total",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(0L, now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_average_unique_players_day",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(dayAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_average_unique_players_week",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(weekAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_average_unique_players_month",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(monthAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+
+
+        placeholders.registerStatic("network_sessions_average_unique_players_total",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(0L, now(), tzOffsetMs)));
+        placeholders.registerStatic("network_sessions_average_unique_players_day",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(dayAgo(), now(), tzOffsetMs)));
+        placeholders.registerStatic("network_sessions_average_unique_players_week",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(weekAgo(), now(), tzOffsetMs)));
+        placeholders.registerStatic("network_sessions_average_unique_players_month",
+                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(monthAgo(), now(), tzOffsetMs)));
+    }
+
+    private void registerSessionLength(PlanPlaceholders placeholders) {
+        placeholders.registerStatic("sessions_average_session_length_total",
+                parameters -> getPlaytime(database, 0L, now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("sessions_average_session_length_day",
+                parameters -> getPlaytime(database, dayAgo(), now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("sessions_average_session_length_week",
+                parameters -> getPlaytime(database, weekAgo(), now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("sessions_average_session_length_month",
+                parameters -> getPlaytime(database, monthAgo(), now(), getServerUUID(parameters), timeAmount));
+
+        placeholders.registerStatic("network_sessions_average_session_length_total",
+                parameters -> getPlaytime(database, 0L, now(), timeAmount));
+        placeholders.registerStatic("network_sessions_average_session_length_day",
+                parameters -> getPlaytime(database, dayAgo(), now(), timeAmount));
+        placeholders.registerStatic("network_sessions_average_session_length_week",
+                parameters -> getPlaytime(database, weekAgo(), now(), timeAmount));
+        placeholders.registerStatic("network_sessions_average_session_length_month",
+                parameters -> getPlaytime(database, monthAgo(), now(), timeAmount));
+    }
+
+    private void registerNetworkUniquePlayers(PlanPlaceholders placeholders) {
+        PlanPlaceholders.StaticPlaceholderLoader networkUniquePlayers = parameters -> database.query(PlayerCountQueries.newPlayerCount(0L, now()));
+        placeholders.registerStatic("network_sessions_unique_players_total", networkUniquePlayers);
+        placeholders.registerStatic("network_sessions_new_players_total", networkUniquePlayers);
+
+        placeholders.registerStatic("network_sessions_unique_players_day",
+                parameters -> database.query(PlayerCountQueries.uniquePlayerCount(dayAgo(), now())));
+        placeholders.registerStatic("network_sessions_unique_players_today",
+                parameters -> {
+                    NavigableMap<Long, Integer> playerCounts = database.query(PlayerCountQueries.uniquePlayerCounts(dayAgo(), now(), config.getTimeZone().getOffset(now())));
+                    return playerCounts.isEmpty() ? 0 : playerCounts.lastEntry().getValue();
+                });
+        placeholders.registerStatic("network_sessions_unique_players_week",
+                parameters -> database.query(PlayerCountQueries.uniquePlayerCount(weekAgo(), now())));
+        placeholders.registerStatic("network_sessions_unique_players_month",
+                parameters -> database.query(PlayerCountQueries.uniquePlayerCount(monthAgo(), now())));
+    }
+
+    private void registerServerUniquePlayers(PlanPlaceholders placeholders) {
         PlanPlaceholders.StaticPlaceholderLoader uniquePlayers = parameters -> database.query(PlayerCountQueries.newPlayerCount(0L, now(), getServerUUID(parameters)));
         placeholders.registerStatic("sessions_unique_players_total", uniquePlayers);
         placeholders.registerStatic("sessions_new_players_total", uniquePlayers);
@@ -147,7 +234,9 @@ public class SessionPlaceHolders implements Placeholders {
                 parameters -> database.query(PlayerCountQueries.uniquePlayerCount(weekAgo(), now(), getServerUUID(parameters))));
         placeholders.registerStatic("sessions_unique_players_month",
                 parameters -> database.query(PlayerCountQueries.uniquePlayerCount(monthAgo(), now(), getServerUUID(parameters))));
+    }
 
+    private void registerServerPve(PlanPlaceholders placeholders) {
         placeholders.registerStatic("sessions_players_death_total",
                 parameters -> database.query(KillQueries.deathCount(0L, now(), getServerUUID(parameters))));
         placeholders.registerStatic("sessions_players_death_day",
@@ -174,50 +263,120 @@ public class SessionPlaceHolders implements Placeholders {
                 parameters -> database.query(KillQueries.mobKillCount(weekAgo(), now(), getServerUUID(parameters))));
         placeholders.registerStatic("sessions_mob_kill_month",
                 parameters -> database.query(KillQueries.mobKillCount(monthAgo(), now(), getServerUUID(parameters))));
+    }
 
-        placeholders.registerStatic("sessions_average_session_length_total",
+    private void registerNetworkAfkTime(PlanPlaceholders placeholders) {
-                parameters -> getPlaytime(database, 0L, now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("network_sessions_afk_time_total",
-        placeholders.registerStatic("sessions_average_session_length_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(0L, now()))));
-                parameters -> getPlaytime(database, dayAgo(), now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("network_sessions_afk_time_total_raw",
-        placeholders.registerStatic("sessions_average_session_length_week",
+                parameters -> database.query(SessionQueries.afkTime(0L, now())));
-                parameters -> getPlaytime(database, weekAgo(), now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("network_sessions_afk_time_day",
-        placeholders.registerStatic("sessions_average_session_length_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(dayAgo(), now()))));
-                parameters -> getPlaytime(database, monthAgo(), now(), getServerUUID(parameters), timeAmount));
+        placeholders.registerStatic("network_sessions_afk_time_day_raw",
+                parameters -> database.query(SessionQueries.afkTime(dayAgo(), now())));
+        placeholders.registerStatic("network_sessions_afk_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(weekAgo(), now()))));
+        placeholders.registerStatic("network_sessions_afk_time_week_raw",
+                parameters -> database.query(SessionQueries.afkTime(weekAgo(), now())));
+        placeholders.registerStatic("network_sessions_afk_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(monthAgo(), now()))));
+        placeholders.registerStatic("network_sessions_afk_time_month_raw",
+                parameters -> database.query(SessionQueries.afkTime(monthAgo(), now())));
+    }
 
-        placeholders.registerStatic("sessions_average_unique_players_total",
+    private void registerServerAfkTime(PlanPlaceholders placeholders) {
-                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(0L, now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_total",
-        placeholders.registerStatic("sessions_average_unique_players_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(0L, now(), getServerUUID(parameters)))));
-                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(dayAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_total_raw",
-        placeholders.registerStatic("sessions_average_unique_players_week",
+                parameters -> database.query(SessionQueries.afkTime(0L, now(), getServerUUID(parameters))));
-                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(weekAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_day",
-        placeholders.registerStatic("sessions_average_unique_players_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(dayAgo(), now(), getServerUUID(parameters)))));
-                parameters -> database.query(PlayerCountQueries.averageUniquePlayerCount(monthAgo(), now(), tzOffsetMs, getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_day_raw",
+                parameters -> database.query(SessionQueries.afkTime(dayAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(weekAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_afk_time_week_raw",
+                parameters -> database.query(SessionQueries.afkTime(weekAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_afk_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.afkTime(monthAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_afk_time_month_raw",
+                parameters -> database.query(SessionQueries.afkTime(monthAgo(), now(), getServerUUID(parameters))));
+    }
 
-        placeholders.registerStatic("sessions_new_players_day",
+    private void registerNetworkActivePlaytime(PlanPlaceholders placeholders) {
-                parameters -> database.query(PlayerCountQueries.newPlayerCount(dayAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("network_sessions_active_time_total",
-        placeholders.registerStatic("sessions_new_players_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(0L, now()))));
-                parameters -> database.query(PlayerCountQueries.newPlayerCount(weekAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("network_sessions_active_time_total_raw",
-        placeholders.registerStatic("sessions_new_players_month",
+                parameters -> database.query(SessionQueries.activePlaytime(0L, now())));
-                parameters -> database.query(PlayerCountQueries.newPlayerCount(monthAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("network_sessions_active_time_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(dayAgo(), now()))));
+        placeholders.registerStatic("network_sessions_active_time_day_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(dayAgo(), now())));
+        placeholders.registerStatic("network_sessions_active_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(weekAgo(), now()))));
+        placeholders.registerStatic("network_sessions_active_time_week_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(weekAgo(), now())));
+        placeholders.registerStatic("network_sessions_active_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(monthAgo(), now()))));
+        placeholders.registerStatic("network_sessions_active_time_month_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(monthAgo(), now())));
+    }
 
-        placeholders.registerStatic("ping_total",
+    private void registerServerActivePlaytime(PlanPlaceholders placeholders) {
-                parameters -> decimals.apply(database.query(PingQueries.averagePing(0L, now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("sessions_active_time_total",
-        placeholders.registerStatic("ping_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(0L, now(), getServerUUID(parameters)))));
-                parameters -> decimals.apply(database.query(PingQueries.averagePing(dayAgo(), now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("sessions_active_time_total_raw",
-        placeholders.registerStatic("ping_week",
+                parameters -> database.query(SessionQueries.activePlaytime(0L, now(), getServerUUID(parameters))));
-                parameters -> decimals.apply(database.query(PingQueries.averagePing(weekAgo(), now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("sessions_active_time_day",
-        placeholders.registerStatic("ping_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(dayAgo(), now(), getServerUUID(parameters)))));
-                parameters -> decimals.apply(database.query(PingQueries.averagePing(monthAgo(), now(), getServerUUID(parameters)))) + " ms");
+        placeholders.registerStatic("sessions_active_time_day_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(dayAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_active_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(weekAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_active_time_week_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(weekAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_active_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.activePlaytime(monthAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_active_time_month_raw",
+                parameters -> database.query(SessionQueries.activePlaytime(monthAgo(), now(), getServerUUID(parameters))));
+    }
 
-        placeholders.registerStatic("sessions_peak_count",
+    private void registerNetworkPlaytime(PlanPlaceholders placeholders) {
-                parameters -> database.query(TPSQueries.fetchAllTimePeakPlayerCount(getServerUUID(parameters))).map(DateObj::getValue).orElse(0));
+        placeholders.registerStatic("network_sessions_play_time_total",
-        placeholders.registerStatic("sessions_peak_date",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(0L, now()))));
-                parameters -> database.query(TPSQueries.fetchAllTimePeakPlayerCount(getServerUUID(parameters))).map(year).orElse("-"));
+        placeholders.registerStatic("network_sessions_play_time_total_raw",
+                parameters -> database.query(SessionQueries.playtime(0L, now())));
+        placeholders.registerStatic("network_sessions_play_time_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(dayAgo(), now()))));
+        placeholders.registerStatic("network_sessions_play_time_day_raw",
+                parameters -> database.query(SessionQueries.playtime(dayAgo(), now())));
+        placeholders.registerStatic("network_sessions_play_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(weekAgo(), now()))));
+        placeholders.registerStatic("network_sessions_play_time_week_raw",
+                parameters -> database.query(SessionQueries.playtime(weekAgo(), now())));
+        placeholders.registerStatic("network_sessions_play_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(monthAgo(), now()))));
+        placeholders.registerStatic("network_sessions_play_time_month_raw",
+                parameters -> database.query(SessionQueries.playtime(monthAgo(), now())));
+    }
 
-        placeholders.registerStatic("sessions_recent_peak_count",
+    private void registerServerPlaytime(PlanPlaceholders placeholders) {
-                parameters -> database.query(TPSQueries.fetchPeakPlayerCount(getServerUUID(parameters), now() - TimeUnit.DAYS.toMillis(2L))).map(DateObj::getValue).orElse(0));
+        placeholders.registerStatic("sessions_play_time_total",
-        placeholders.registerStatic("sessions_recent_peak_date",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(0L, now(), getServerUUID(parameters)))));
-                parameters -> database.query(TPSQueries.fetchPeakPlayerCount(getServerUUID(parameters), now() - TimeUnit.DAYS.toMillis(2L))).map(year).orElse("-"));
+        placeholders.registerStatic("sessions_play_time_total_raw",
+                parameters -> database.query(SessionQueries.playtime(0L, now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_play_time_day",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(dayAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_play_time_day_raw",
+                parameters -> database.query(SessionQueries.playtime(dayAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_play_time_week",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(weekAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_play_time_week_raw",
+                parameters -> database.query(SessionQueries.playtime(weekAgo(), now(), getServerUUID(parameters))));
+        placeholders.registerStatic("sessions_play_time_month",
+                parameters -> timeAmount.apply(database.query(SessionQueries.playtime(monthAgo(), now(), getServerUUID(parameters)))));
+        placeholders.registerStatic("sessions_play_time_month_raw",
+                parameters -> database.query(SessionQueries.playtime(monthAgo(), now(), getServerUUID(parameters))));
     }
 
     private ServerUUID getServerUUID(@Untrusted Arguments parameters) {

Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigNode.java

@@ -200,6 +200,14 @@ public class ConfigNode {
         return key;
     }
 
+    private String getEnvironmentVariableKey() {
+        String deepKey = parent != null ? parent.getKey(true) + "." + key : "";
+        if (deepKey.startsWith(".")) {
+            deepKey = deepKey.substring(1);
+        }
+        return "PLAN_" + StringUtils.replaceChars(StringUtils.upperCase(deepKey), '.', '_');
+    }
+
     public void sort() {
         Collections.sort(nodeOrder);
     }
@@ -255,32 +263,51 @@ public class ConfigNode {
         this.comment = comment;
     }
 
+    private String getEnvironmentVariable() {
+        String key = getEnvironmentVariableKey();
+        String variable = System.getenv(key);
+        Map<String, String> env = System.getenv();
+        return variable;
+    }
+
     public List<String> getStringList() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.StringListParser().compose(environmentVariable);
         return value == null ? Collections.emptyList()
                 : new ConfigValueParser.StringListParser().compose(value);
     }
 
     public Integer getInteger() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.IntegerParser().compose(environmentVariable);
         return value == null ? null
                 : new ConfigValueParser.IntegerParser().compose(value);
     }
 
     public Long getLong() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.LongParser().compose(environmentVariable);
         return value == null ? null
                 : new ConfigValueParser.LongParser().compose(value);
     }
 
     public String getString() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.StringParser().compose(environmentVariable);
         return value == null ? null
                 : new ConfigValueParser.StringParser().compose(value);
     }
 
     public Double getDouble() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.DoubleParser().compose(environmentVariable);
         return value == null ? null
                 : new ConfigValueParser.DoubleParser().compose(value);
     }
 
     public boolean getBoolean() {
+        String environmentVariable = getEnvironmentVariable();
+        if (environmentVariable != null) return new ConfigValueParser.BooleanParser().compose(environmentVariable);
         return new ConfigValueParser.BooleanParser().compose(value);
     }
 

Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigValueParser.java

@@ -39,6 +39,8 @@ public interface ConfigValueParser<T> {
             return new BooleanParser();
         } else if (Long.class.isAssignableFrom(type)) {
             return new LongParser();
+        } else if (Double.class.isAssignableFrom(type)) {
+            return new DoubleParser();
         } else if (Integer.class.isAssignableFrom(type)) {
             return new IntegerParser();
         }

Plan/common/src/main/java/com/djrapitops/plan/settings/config/changes/ConfigUpdater.java

@@ -177,6 +177,9 @@ public class ConfigUpdater {
                 new ConfigChange.Removed("Plugin.Use_Legacy_Frontend"),
                 new ConfigChange.Removed("Customized_files.Enable_web_dev_mode"),
                 new ConfigChange.Removed("Customized_files.Plan"),
+
+                new ConfigChange.Moved("Data_gathering.Preserve_join_address_case", "Data_gathering.Join_addresses.Preserve_case"),
+                new ConfigChange.Moved("Data_gathering.Preserve_invalid_join_addresses", "Data_gathering.Join_addresses.Preserve_invalid"),
         };
     }
 

Plan/common/src/main/java/com/djrapitops/plan/settings/config/paths/DataGatheringSettings.java

@@ -18,6 +18,10 @@ package com.djrapitops.plan.settings.config.paths;
 
 import com.djrapitops.plan.settings.config.paths.key.BooleanSetting;
 import com.djrapitops.plan.settings.config.paths.key.Setting;
+import com.djrapitops.plan.settings.config.paths.key.StringListSetting;
+import com.djrapitops.plan.settings.config.paths.key.StringSetting;
+
+import java.util.List;
 
 /**
  * {@link Setting} values that are in "Data_gathering" section.
@@ -28,11 +32,15 @@ public class DataGatheringSettings {
 
     public static final Setting<Boolean> GEOLOCATIONS = new BooleanSetting("Data_gathering.Geolocations");
     public static final Setting<Boolean> ACCEPT_GEOLITE2_EULA = new BooleanSetting("Data_gathering.Accept_GeoLite2_EULA");
+    public static final Setting<String> GEOLOCATION_DOWNLOAD_URL = new StringSetting("Data_gathering.Geolocation_Download_URL");
     public static final Setting<Boolean> PING = new BooleanSetting("Data_gathering.Ping");
     public static final Setting<Boolean> DISK_SPACE = new BooleanSetting("Data_gathering.Disk_space");
     public static final Setting<Boolean> LOG_UNKNOWN_COMMANDS = new BooleanSetting("Data_gathering.Commands.Log_unknown");
     public static final Setting<Boolean> COMBINE_COMMAND_ALIASES = new BooleanSetting("Data_gathering.Commands.Log_aliases_as_main_command");
-    public static final Setting<Boolean> PRESERVE_JOIN_ADDRESS_CASE = new BooleanSetting("Data_gathering.Preserve_join_address_case");
+    public static final Setting<Boolean> JOIN_ADDRESSES = new BooleanSetting("Data_gathering.Join_addresses.Enabled");
+    public static final Setting<Boolean> PRESERVE_JOIN_ADDRESS_CASE = new BooleanSetting("Data_gathering.Join_addresses.Preserve_case");
+    public static final Setting<Boolean> PRESERVE_INVALID_JOIN_ADDRESS = new BooleanSetting("Data_gathering.Join_addresses.Preserve_invalid");
+    public static final Setting<List<String>> FILTER_JOIN_ADDRESSES = new StringListSetting("Data_gathering.Join_addresses.Filter_out_from_data");
 
     private DataGatheringSettings() {
         /* static variable class */

Plan/common/src/main/java/com/djrapitops/plan/settings/locale/LangCode.java

@@ -26,11 +26,11 @@ public enum LangCode {
     CUSTOM("Custom", ""),
     EN("English", "AuroraLS3"),
     ES("Español", "Catalina, itaquito, Elguerrero & 4drian3d"),
-    CN("\u6C49\u8BED", "f0rb1d (\u4f5b\u58c1\u706f), qsefthuopq, shaokeyibb, Fur_xia, 10935336, SkipM4,  TheLittle_Yang & jhqwqmc"), // Simplified Chinese
+    CN("\u6C49\u8BED", "f0rb1d (\u4f5b\u58c1\u706f), qsefthuopq, shaokeyibb, Fur_xia, 10935336, SkipM4, TheLittle_Yang, jhqwqmc & liuzhen932"), // Simplified Chinese
     CS("\u010de\u0161tina", "Shadowhackercz, QuakyCZ, MrFriggo & WolverStones"),
     DE("Deutsch", "Eyremba, fuzzlemann, Morsmorse, hallo1142 & DubHacker"),
     FI("suomi", "AuroraLS3, KasperiP"),
-    FR("français", "CyanTech, Aurelien & Nogapra"),
+    FR("français", "CyanTech, Aurelien, Nogapra & Sniper_TVmc"),
     IT("Italiano", "Malachiel & Mastory_Md5"),
     JA("\u65E5\u672C\u8A9E", "yukieji, inductor, lis2a, yu_solt , Jumala9163 & ringoXD"),
     KO("\uD55C\uAD6D\uC5B4", "Guinness_Akihiko"),

Plan/common/src/main/java/com/djrapitops/plan/settings/locale/LocaleSystem.java

@@ -108,7 +108,7 @@ public class LocaleSystem implements SubSystem {
                 HtmlLang.values(),
                 JSLang.values(),
                 PluginLang.values(),
-                WebPermission.values(),
+                WebPermission.nonDeprecatedValues(),
         };
     }
 
@@ -215,7 +215,7 @@ public class LocaleSystem implements SubSystem {
         }
     }
 
-    private Optional<Locale> loadSettingLocale() {
+    public Optional<Locale> loadSettingLocale() {
         try {
             String setting = config.get(PluginSettings.LOCALE);
             if ("write-all".equalsIgnoreCase(setting)) {

Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java

@@ -219,6 +219,8 @@ public enum HtmlLang implements Lang {
     LABEL_TITLE_SERVER_CALENDAR("html.label.serverCalendar", "Server Calendar"),
     LABEL_TITLE_NETWORK_CALENDAR("html.label.networkCalendar", "Network Calendar"),
     LABEL_LABEL_JOIN_ADDRESS("html.label.joinAddress", "Join Address"),
+    LABEL_ADD_JOIN_ADDRESS_GROUP("html.label.addJoinAddressGroup", "Add address group"),
+    LABEL_ADDRESS_GROUP("html.label.addressGroup", "Address group {{n}}"),
     LABEL_LABEL_SESSION_MEDIAN("html.label.medianSessionLength", "Median Session Length"),
     LABEL_LABEL_KDR("html.label.kdr", "KDR"),
     LABEL_TITLE_INSIGHTS("html.label.insights", "Insights"),
@@ -285,6 +287,15 @@ public enum HtmlLang implements Lang {
     LABEL_TABLE_SHOW_PER_PAGE("html.label.table.showPerPage", "Show per page"),
     LABEL_EXPORT("html.label.export", "Export"),
 
+    LABEL_ALLOWLIST("html.label.allowlist", "Allowlist"),
+    LABEL_ALLOWLIST_BOUNCES("html.label.allowlistBounces", "Allowlist Bounces"),
+    LABEL_ATTEMPTS("html.label.attempts", "Attempts"),
+    LABEL_LAST_KNOWN_ATTEMPT("html.label.lastKnownAttempt", "Last Known Attempt"),
+    LABEL_PREVIOUS_ATTEMPT("html.label.lastBlocked", "Last Blocked"),
+    LABEL_LAST_ALLOWED_LOGIN("html.label.lastAllowed", "Last Allowed"),
+    LABEL_BLOCKED("html.label.blocked", "Blocked"),
+    LABEL_ALLOWED("html.label.allowed", "Allowed"),
+
     LOGIN_LOGIN("html.login.login", "Login"),
     LOGIN_LOGOUT("html.login.logout", "Logout"),
     LOGIN_USERNAME("html.login.username", "Username"),
@@ -327,6 +338,7 @@ public enum HtmlLang implements Lang {
     QUERY_SERVERS_TWO("html.query.label.servers.two", "using data of 2 servers"),
     QUERY_SERVERS_MANY("html.query.label.servers.many", "using data of {number} servers"),
     QUERY_SHOW_FULL_QUERY("html.query.label.showFullQuery", "Show Full Query"),
+    QUERY_EDIT_QUERY("html.query.label.editQuery", "Edit Query"),
 
     HELP_TEST_RESULT("html.label.help.testResult", "Test result"),
     HELP_TEST_IT_OUT("html.label.help.testPrompt", "Test it out:"),

Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java

@@ -84,6 +84,7 @@ public abstract class SQLDB extends AbstractDatabase {
 
     private Supplier<ExecutorService> transactionExecutorServiceProvider;
     private ExecutorService transactionExecutor;
+    private static final ThreadLocal<StackTraceElement[]> TRANSACTION_ORIGIN = new ThreadLocal<>();
 
     private final AtomicInteger transactionQueueSize = new AtomicInteger(0);
     private final AtomicBoolean dropUnimportantTransactions = new AtomicBoolean(false);
@@ -146,9 +147,13 @@ public abstract class SQLDB extends AbstractDatabase {
         }
     }
 
+    public static ThreadLocal<StackTraceElement[]> getTransactionOrigin() {
+        return TRANSACTION_ORIGIN;
+    }
+
     @Override
     public void init() {
-        List<Runnable> unfinishedTransactions = closeTransactionExecutor(transactionExecutor);
+        List<Runnable> unfinishedTransactions = forceCloseTransactionExecutor();
         this.transactionExecutor = transactionExecutorServiceProvider.get();
 
         setState(State.PATCHING);
@@ -167,9 +172,9 @@ public abstract class SQLDB extends AbstractDatabase {
         }
     }
 
-    private List<Runnable> closeTransactionExecutor(ExecutorService transactionExecutor) {
+    protected boolean attemptToCloseTransactionExecutor() {
         if (transactionExecutor == null || transactionExecutor.isShutdown() || transactionExecutor.isTerminated()) {
-            return Collections.emptyList();
+            return true;
         }
         transactionExecutor.shutdown();
         try {
@@ -179,20 +184,11 @@ public abstract class SQLDB extends AbstractDatabase {
                 logger.warn(TimeSettings.DB_TRANSACTION_FINISH_WAIT_DELAY.getPath() + " was set to over 5 minutes, using 5 min instead.");
                 waitMs = TimeUnit.MINUTES.toMillis(5L);
             }
-            if (!transactionExecutor.awaitTermination(waitMs, TimeUnit.MILLISECONDS)) {
+            return transactionExecutor.awaitTermination(waitMs, TimeUnit.MILLISECONDS);
-                List<Runnable> unfinished = transactionExecutor.shutdownNow();
-                int unfinishedCount = unfinished.size();
-                if (unfinishedCount > 0) {
-                    logger.warn(unfinishedCount + " unfinished database transactions were not executed.");
-                }
-                return unfinished;
-            }
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
-        } finally {
-            logger.info(locale.getString(PluginLang.DISABLED_WAITING_TRANSACTIONS_COMPLETE));
         }
-        return Collections.emptyList();
+        return true;
     }
 
     Patch[] patches() {
@@ -305,19 +301,33 @@ public abstract class SQLDB extends AbstractDatabase {
      */
     public abstract void setupDataSource();
 
-    @Override
+    protected List<Runnable> forceCloseTransactionExecutor() {
-    public void close() {
+        if (transactionExecutor == null || transactionExecutor.isShutdown() || transactionExecutor.isTerminated()) {
-        if (getState() == State.OPEN) setState(State.CLOSING);
+            return Collections.emptyList();
-        closeTransactionExecutor(transactionExecutor);
+        }
-        unloadDriverClassloader();
+        try {
-        setState(State.CLOSED);
+            List<Runnable> unfinished = transactionExecutor.shutdownNow();
+            int unfinishedCount = unfinished.size();
+            if (unfinishedCount > 0) {
+                logger.warn(unfinishedCount + " unfinished database transactions were not executed.");
+            }
+            return unfinished;
+        } finally {
+            logger.info(locale.getString(PluginLang.DISABLED_WAITING_TRANSACTIONS_COMPLETE));
+        }
     }
 
-    private void unloadDriverClassloader() {
+    @Override
-        // Unloading class loader using close() causes issues when reloading.
+    public void close() {
-        // It is better to leak this memory than crash the plugin on reload.
+        // SQLiteDB Overrides this, so any additions to this should also be reflected there.
-
+        if (getState() == State.OPEN) setState(State.CLOSING);
-        driverClassLoader = null;
+        if (attemptToCloseTransactionExecutor()) {
+            logger.info(locale.getString(PluginLang.DISABLED_WAITING_TRANSACTIONS_COMPLETE));
+        } else {
+            forceCloseTransactionExecutor();
+        }
+        unloadDriverClassloader();
+        setState(State.CLOSED);
     }
 
     public abstract Connection getConnection() throws SQLException;
@@ -333,13 +343,20 @@ public abstract class SQLDB extends AbstractDatabase {
         return accessLock.performDatabaseOperation(() -> query.executeQuery(this), transaction);
     }
 
+    protected void unloadDriverClassloader() {
+        // Unloading class loader using close() causes issues when reloading.
+        // It is better to leak this memory than crash the plugin on reload.
+
+        driverClassLoader = null;
+    }
+
     @Override
     public CompletableFuture<?> executeTransaction(Transaction transaction) {
         if (getState() == State.CLOSED) {
             throw new DBClosedException("Transaction tried to execute although database is closed.");
         }
 
-        Exception origin = new Exception();
+        StackTraceElement[] origin = Thread.currentThread().getStackTrace();
 
         if (determineIfShouldDropUnimportantTransactions(transactionQueueSize.incrementAndGet())
                 && transaction instanceof ThrowawayTransaction) {
@@ -349,17 +366,24 @@ public abstract class SQLDB extends AbstractDatabase {
 
         return CompletableFuture.supplyAsync(() -> {
             try {
+                TRANSACTION_ORIGIN.set(origin);
+                if (getState() == State.CLOSED) return CompletableFuture.completedFuture(null);
+
                 accessLock.performDatabaseOperation(() -> {
                     if (!ranIntoFatalError.get()) {transaction.executeTransaction(this);}
                 }, transaction);
                 return CompletableFuture.completedFuture(null);
             } finally {
                 transactionQueueSize.decrementAndGet();
+                TRANSACTION_ORIGIN.remove();
             }
         }, getTransactionExecutor()).exceptionally(errorHandler(transaction, origin));
     }
 
     private boolean determineIfShouldDropUnimportantTransactions(int queueSize) {
+        if (getState() == State.CLOSING) {
+            return true;
+        }
         boolean dropTransactions = dropUnimportantTransactions.get();
         if (queueSize >= 500 && !dropTransactions) {
             logger.warn("Database queue size: " + queueSize + ", dropping some unimportant transactions. If this keeps happening disable some extensions or optimize MySQL.");
@@ -372,7 +396,7 @@ public abstract class SQLDB extends AbstractDatabase {
         return dropTransactions;
     }
 
-    private Function<Throwable, CompletableFuture<Object>> errorHandler(Transaction transaction, Exception origin) {
+    private Function<Throwable, CompletableFuture<Object>> errorHandler(Transaction transaction, StackTraceElement[] origin) {
         return throwable -> {
             if (throwable == null) {
                 return CompletableFuture.completedFuture(null);

Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLiteDB.java

@@ -59,7 +59,7 @@ public class SQLiteDB extends SQLDB {
      * one thread closing the connection while another is executing a statement as
      * that might lead to a SIGSEGV signal JVM crash.
      */
-    private final SemaphoreAccessCounter connectionLock = new SemaphoreAccessCounter();
+    private final SemaphoreAccessCounter connectionLock;
 
     private Constructor<?> connectionConstructor;
 
@@ -76,6 +76,7 @@ public class SQLiteDB extends SQLDB {
         super(() -> serverInfo.get().getServerUUID(), locale, config, files, runnableFactory, logger, errorLogger);
         dbName = databaseFile.getName();
         this.databaseFile = databaseFile;
+        connectionLock = new SemaphoreAccessCounter();
     }
 
     @Override
@@ -200,11 +201,21 @@ public class SQLiteDB extends SQLDB {
 
     @Override
     public void close() {
-        super.close();
+        if (getState() == State.OPEN) setState(State.CLOSING);
+        boolean transactionQueueClosed = attemptToCloseTransactionExecutor();
+        if (transactionQueueClosed) logger.info(locale.getString(PluginLang.DISABLED_WAITING_TRANSACTIONS_COMPLETE));
+
+        unloadDriverClassloader();
+        setState(State.CLOSED);
+
         stopConnectionPingTask();
 
         logger.info(locale.getString(PluginLang.DISABLED_WAITING_SQLITE));
         connectionLock.waitUntilNothingAccessing();
+
+        // Transaction queue can't be force-closed before all connections have terminated.
+        if (!transactionQueueClosed) forceCloseTransactionExecutor();
+
         if (connection != null) {
             MiscUtils.close(connection);
         }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/PlayerCountQueries.java

@@ -225,6 +225,26 @@ public class PlayerCountQueries {
         };
     }
 
+    public static Query<Integer> averageUniquePlayerCount(long after, long before, long timeZoneOffset) {
+        return database -> {
+            Sql sql = database.getSql();
+            String selectUniquePlayersPerDay = SELECT +
+                    sql.dateToEpochSecond(sql.dateToDayStamp(sql.epochSecondToDate('(' + SessionsTable.SESSION_START + "+?)/1000"))) +
+                    "*1000 as date," +
+                    "COUNT(DISTINCT " + SessionsTable.USER_ID + ") as " + PLAYER_COUNT +
+                    FROM + SessionsTable.TABLE_NAME +
+                    WHERE + SessionsTable.SESSION_END + "<=?" +
+                    AND + SessionsTable.SESSION_START + ">=?" +
+                    GROUP_BY + "date";
+            String selectAverage = SELECT + "AVG(" + PLAYER_COUNT + ") as average" + FROM + '(' + selectUniquePlayersPerDay + ") q1";
+
+            return database.queryOptional(selectAverage,
+                            set -> (int) set.getDouble("average"),
+                            timeZoneOffset, before, after)
+                    .orElse(0);
+        };
+    }
+
     public static Query<Integer> newPlayerCount(long after, long before, ServerUUID serverUUID) {
         String sql = SELECT + "COUNT(1) as " + PLAYER_COUNT +
                 FROM + UserInfoTable.TABLE_NAME +

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/analysis/TopListQueries.java

@@ -40,7 +40,7 @@ public class TopListQueries {
                 "SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + ") as playtime" +
                 FROM + SessionsTable.TABLE_NAME + " s" +
                 INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.ID + "=s." + SessionsTable.USER_ID +
-                WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                WHERE + "(? IS NULL OR " + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + ')' +
                 AND + SessionsTable.SESSION_START + ">?" +
                 AND + SessionsTable.SESSION_END + "<?" +
                 GROUP_BY + UsersTable.USER_NAME +
@@ -49,7 +49,7 @@ public class TopListQueries {
                 OFFSET + "?";
 
         return db -> db.queryOptional(sql, set -> new TopListEntry<>(set.getString(UsersTable.USER_NAME), set.getLong("playtime")),
-                serverUUID, after, before, n);
+                serverUUID, serverUUID, after, before, n);
     }
 
     public static Query<Optional<TopListEntry<Long>>> fetchNthTop10ActivePlaytimePlayerOn(ServerUUID serverUUID, int n, long after, long before) {
@@ -58,7 +58,7 @@ public class TopListQueries {
                 "SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + '-' + SessionsTable.AFK_TIME + ") as active_playtime" +
                 FROM + SessionsTable.TABLE_NAME + " s" +
                 INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.ID + "=s." + SessionsTable.USER_ID +
-                WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                WHERE + "(? IS NULL OR " + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID + ')' +
                 AND + SessionsTable.SESSION_START + ">?" +
                 AND + SessionsTable.SESSION_END + "<?" +
                 GROUP_BY + UsersTable.USER_NAME +
@@ -67,7 +67,7 @@ public class TopListQueries {
                 OFFSET + "?";
 
         return db -> db.queryOptional(sql, set -> new TopListEntry<>(set.getString(UsersTable.USER_NAME), set.getLong("active_playtime")),
-                serverUUID, after, before, n);
+                serverUUID, serverUUID, after, before, n);
     }
 
     public static Query<Optional<TopListEntry<Long>>> fetchNthTop10PlayerKillCountOn(ServerUUID serverUUID, int n, long after, long before) {

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/AllowlistQueries.java

@@ -0,0 +1,63 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.storage.database.queries.objects;
+
+import com.djrapitops.plan.delivery.domain.datatransfer.AllowlistBounce;
+import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.queries.Query;
+import com.djrapitops.plan.storage.database.sql.tables.AllowlistBounceTable;
+import com.djrapitops.plan.storage.database.sql.tables.ServerTable;
+import org.intellij.lang.annotations.Language;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import static com.djrapitops.plan.storage.database.sql.building.Sql.*;
+
+/**
+ * Query against {@link AllowlistBounceTable}.
+ *
+ * @author AuroraLS3
+ */
+public class AllowlistQueries {
+
+    private AllowlistQueries() {
+        /* Static method class */
+    }
+
+    public static Query<List<AllowlistBounce>> getBounces(ServerUUID serverUUID) {
+        @Language("SQL") String sql = SELECT +
+                AllowlistBounceTable.UUID + ',' +
+                AllowlistBounceTable.USER_NAME + ',' +
+                AllowlistBounceTable.TIMES + ',' +
+                AllowlistBounceTable.LAST_BOUNCE +
+                FROM + AllowlistBounceTable.TABLE_NAME +
+                WHERE + AllowlistBounceTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID;
+        return db -> db.queryList(sql, AllowlistQueries::extract, serverUUID);
+    }
+
+    private static AllowlistBounce extract(ResultSet set) throws SQLException {
+        return new AllowlistBounce(
+                UUID.fromString(set.getString(AllowlistBounceTable.UUID)),
+                set.getString(AllowlistBounceTable.USER_NAME),
+                set.getInt(AllowlistBounceTable.TIMES),
+                set.getLong(AllowlistBounceTable.LAST_BOUNCE)
+        );
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/JoinAddressQueries.java

@@ -28,6 +28,8 @@ import com.djrapitops.plan.storage.database.sql.tables.ServerTable;
 import com.djrapitops.plan.storage.database.sql.tables.SessionsTable;
 import com.djrapitops.plan.storage.database.sql.tables.UsersTable;
 import com.djrapitops.plan.utilities.dev.Untrusted;
+import org.apache.commons.text.TextStringBuilder;
+import org.jetbrains.annotations.VisibleForTesting;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -43,6 +45,7 @@ public class JoinAddressQueries {
         /* Static method class */
     }
 
+    @VisibleForTesting
     public static Query<Map<String, Integer>> latestJoinAddresses() {
         String selectLatestJoinAddresses = SELECT +
                 "COUNT(1) as total," +
@@ -66,6 +69,7 @@ public class JoinAddressQueries {
         joinAddresses.put(UUID.fromString(set.getString(UsersTable.USER_UUID)), set.getString(JoinAddressTable.JOIN_ADDRESS));
     }
 
+    @VisibleForTesting
     public static Query<Map<String, Integer>> latestJoinAddresses(ServerUUID serverUUID) {
         String selectLatestSessionStarts = SELECT + SessionsTable.USER_ID + ",MAX(" + SessionsTable.SESSION_START + ") as max_start" +
                 FROM + SessionsTable.TABLE_NAME + " max_s" +
@@ -141,6 +145,28 @@ public class JoinAddressQueries {
         };
     }
 
+    public static QueryStatement<List<String>> allJoinAddresses(ServerUUID serverUUID) {
+        String sql = SELECT + DISTINCT + JoinAddressTable.JOIN_ADDRESS +
+                FROM + JoinAddressTable.TABLE_NAME + " j" +
+                INNER_JOIN + SessionsTable.TABLE_NAME + " s ON s." + SessionsTable.JOIN_ADDRESS_ID + "=j." + JoinAddressTable.ID +
+                WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                ORDER_BY + JoinAddressTable.JOIN_ADDRESS + " ASC";
+
+        return new QueryStatement<>(sql, 100) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setString(1, serverUUID.toString());
+            }
+
+            @Override
+            public List<String> processResults(ResultSet set) throws SQLException {
+                List<String> joinAddresses = new ArrayList<>();
+                while (set.next()) joinAddresses.add(set.getString(JoinAddressTable.JOIN_ADDRESS));
+                return joinAddresses;
+            }
+        };
+    }
+
     public static Query<List<String>> uniqueJoinAddresses() {
         return db -> {
             List<String> addresses = db.query(allJoinAddresses());
@@ -151,6 +177,16 @@ public class JoinAddressQueries {
         };
     }
 
+    public static Query<List<String>> uniqueJoinAddresses(ServerUUID serverUUID) {
+        return db -> {
+            List<String> addresses = db.query(allJoinAddresses(serverUUID));
+            if (!addresses.contains(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP)) {
+                addresses.add(JoinAddressTable.DEFAULT_VALUE_FOR_LOOKUP);
+            }
+            return addresses;
+        };
+    }
+
     public static Query<Set<Integer>> userIdsOfPlayersWithJoinAddresses(@Untrusted List<String> joinAddresses) {
         String sql = SELECT + DISTINCT + SessionsTable.USER_ID +
                 FROM + JoinAddressTable.TABLE_NAME + " j" +
@@ -162,21 +198,27 @@ public class JoinAddressQueries {
         return db -> db.querySet(sql, RowExtractors.getInt(SessionsTable.USER_ID), joinAddresses.toArray());
     }
 
-    public static Query<List<DateObj<Map<String, Integer>>>> joinAddressesPerDay(ServerUUID serverUUID, long timezoneOffset, long after, long before) {
+    public static Query<List<DateObj<Map<String, Integer>>>> joinAddressesPerDay(ServerUUID serverUUID, long timezoneOffset, long after, long before, @Untrusted List<String> addressFilter) {
         return db -> {
             Sql sql = db.getSql();
 
+            List<Integer> ids = db.query(joinAddressIds(addressFilter));
+            if (ids != null && ids.isEmpty()) return List.of();
+
             String selectAddresses = SELECT +
                     sql.dateToEpochSecond(sql.dateToDayStamp(sql.epochSecondToDate('(' + SessionsTable.SESSION_START + "+?)/1000"))) +
                     "*1000 as date," +
-                    JoinAddressTable.JOIN_ADDRESS +
+                    JoinAddressTable.JOIN_ADDRESS + ',' +
+                    SessionsTable.USER_ID +
                     ", COUNT(1) as count" +
                     FROM + SessionsTable.TABLE_NAME + " s" +
                     LEFT_JOIN + JoinAddressTable.TABLE_NAME + " j on s." + SessionsTable.JOIN_ADDRESS_ID + "=j." + JoinAddressTable.ID +
                     WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
                     AND + SessionsTable.SESSION_START + ">?" +
                     AND + SessionsTable.SESSION_START + "<=?" +
-                    GROUP_BY + "date,j." + JoinAddressTable.JOIN_ADDRESS;
+                    (ids == null ? "" : AND + "j." + JoinAddressTable.ID +
+                            " IN (" + new TextStringBuilder().appendWithSeparators(ids, ",").build() + ")") +
+                    GROUP_BY + "date,j." + JoinAddressTable.JOIN_ADDRESS + ',' + SessionsTable.USER_ID;
 
             return db.query(new QueryStatement<>(selectAddresses, 1000) {
                 @Override
@@ -193,9 +235,9 @@ public class JoinAddressQueries {
                     while (set.next()) {
                         long date = set.getLong("date");
                         String joinAddress = set.getString(JoinAddressTable.JOIN_ADDRESS);
-                        int count = set.getInt("count");
                         Map<String, Integer> joinAddresses = addressesByDate.computeIfAbsent(date, k -> new TreeMap<>());
-                        joinAddresses.put(joinAddress, count);
+                        // We ignore the count and get the number of players instead of sessions
+                        joinAddresses.compute(joinAddress, (key, oldValue) -> oldValue != null ? oldValue + 1 : 1);
                     }
 
                     return addressesByDate.entrySet()
@@ -206,20 +248,37 @@ public class JoinAddressQueries {
         };
     }
 
-    public static Query<List<DateObj<Map<String, Integer>>>> joinAddressesPerDay(long timezoneOffset, long after, long before) {
+    public static Query<List<Integer>> joinAddressIds(@Untrusted List<String> addresses) {
+        return db -> {
+            if (addresses.isEmpty()) return null;
+
+            String selectJoinAddressIds = SELECT + JoinAddressTable.ID +
+                    FROM + JoinAddressTable.TABLE_NAME +
+                    WHERE + JoinAddressTable.JOIN_ADDRESS + " IN (" + Sql.nParameters(addresses.size()) + ")";
+            return db.queryList(selectJoinAddressIds, set -> set.getInt(JoinAddressTable.ID), addresses);
+        };
+    }
+
+    public static Query<List<DateObj<Map<String, Integer>>>> joinAddressesPerDay(long timezoneOffset, long after, long before, @Untrusted List<String> addressFilter) {
         return db -> {
             Sql sql = db.getSql();
 
+            List<Integer> ids = db.query(joinAddressIds(addressFilter));
+            if (ids != null && ids.isEmpty()) return List.of();
+
             String selectAddresses = SELECT +
                     sql.dateToEpochSecond(sql.dateToDayStamp(sql.epochSecondToDate('(' + SessionsTable.SESSION_START + "+?)/1000"))) +
                     "*1000 as date," +
-                    JoinAddressTable.JOIN_ADDRESS +
+                    JoinAddressTable.JOIN_ADDRESS + ',' +
+                    SessionsTable.USER_ID +
                     ", COUNT(1) as count" +
                     FROM + SessionsTable.TABLE_NAME + " s" +
                     LEFT_JOIN + JoinAddressTable.TABLE_NAME + " j on s." + SessionsTable.JOIN_ADDRESS_ID + "=j." + JoinAddressTable.ID +
                     WHERE + SessionsTable.SESSION_START + ">?" +
                     AND + SessionsTable.SESSION_START + "<=?" +
-                    GROUP_BY + "date,j." + JoinAddressTable.JOIN_ADDRESS;
+                    (ids == null ? "" : AND + "j." + JoinAddressTable.ID +
+                            " IN (" + new TextStringBuilder().appendWithSeparators(ids, ",").build() + ")") +
+                    GROUP_BY + "date,j." + JoinAddressTable.JOIN_ADDRESS + ',' + SessionsTable.USER_ID;
 
             return db.query(new QueryStatement<>(selectAddresses, 1000) {
                 @Override
@@ -235,9 +294,9 @@ public class JoinAddressQueries {
                     while (set.next()) {
                         long date = set.getLong("date");
                         String joinAddress = set.getString(JoinAddressTable.JOIN_ADDRESS);
-                        int count = set.getInt("count");
                         Map<String, Integer> joinAddresses = addressesByDate.computeIfAbsent(date, k -> new TreeMap<>());
-                        joinAddresses.put(joinAddress, count);
+                        // We ignore the count and get the number of players instead of sessions
+                        joinAddresses.compute(joinAddress, (key, oldValue) -> oldValue != null ? oldValue + 1 : 1);
                     }
 
                     return addressesByDate.entrySet()

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/PingQueries.java

@@ -260,4 +260,12 @@ public class PingQueries {
             }
         };
     }
+
+    public static Query<Double> averagePing(long after, long before) {
+        String sql = SELECT + "AVG(" + PingTable.AVG_PING + ") as average" + FROM + PingTable.TABLE_NAME +
+                WHERE + PingTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                AND + PingTable.DATE + ">=?" +
+                AND + PingTable.DATE + "<=?";
+        return db -> db.queryOptional(sql, set -> set.getDouble("average"), after, before).orElse(-1.0);
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java

@@ -917,6 +917,16 @@ public class SessionQueries {
         };
     }
 
+    public static Query<Long> activePlaytime(long after, long before) {
+        String sql = SELECT + "SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + '-' + SessionsTable.AFK_TIME +
+                ") as playtime" +
+                FROM + SessionsTable.TABLE_NAME +
+                WHERE + SessionsTable.SESSION_END + ">=?" +
+                AND + SessionsTable.SESSION_START + "<=?";
+        return db -> db.queryOptional(sql, set -> set.getLong("playtime"), after, before)
+                .orElse(0L);
+    }
+
     public static Query<Set<Integer>> userIdsOfPlayedBetween(long after, long before, List<ServerUUID> serverUUIDs) {
         String selectServerIds = SELECT + ServerTable.ID +
                 FROM + ServerTable.TABLE_NAME +
@@ -1004,4 +1014,16 @@ public class SessionQueries {
             }
         };
     }
+
+    public static Query<Map<UUID, Long>> lastSeen(ServerUUID serverUUID) {
+        String sql = SELECT + UsersTable.USER_UUID + ", MAX(" + SessionsTable.SESSION_END + ") as last_seen" +
+                FROM + SessionsTable.TABLE_NAME + " s" +
+                INNER_JOIN + UsersTable.TABLE_NAME + " u ON u." + UsersTable.ID + "=s." + SessionsTable.USER_ID +
+                WHERE + SessionsTable.SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID +
+                GROUP_BY + UsersTable.USER_UUID;
+        return db -> db.queryMap(sql, (set, to) -> to.put(
+                UUID.fromString(set.getString(UsersTable.USER_UUID)),
+                set.getLong("last_seen")
+        ), serverUUID);
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/playertable/QueryTablePlayersQuery.java

@@ -107,6 +107,8 @@ public class QueryTablePlayersQuery implements Query<List<TablePlayer>> {
                 "MIN(p." + PingTable.MIN_PING + ") as " + PingTable.MIN_PING +
                 FROM + PingTable.TABLE_NAME + " p" +
                 WHERE + "p." + PingTable.USER_ID + userIdsInSet +
+                AND + "p." + PingTable.DATE + ">=" + afterDate +
+                AND + "p." + PingTable.DATE + "<=" + beforeDate +
                 (serverUUIDs.isEmpty() ? "" : AND + "p." + PingTable.SERVER_ID + " IN (" + selectServerIds + ")") +
                 GROUP_BY + "p." + PingTable.USER_ID;
 

Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/building/Sql.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.storage.database.sql.building;
 
+import com.djrapitops.plan.storage.database.DBType;
 import org.apache.commons.text.TextStringBuilder;
 
 import java.sql.PreparedStatement;
@@ -96,6 +97,15 @@ public abstract class Sql {
         }
     }
 
+    public static String concat(DBType dbType, String one, String two) {
+        if (dbType == DBType.MYSQL) {
+            return "CONCAT(" + one + ',' + two + ")";
+        } else if (dbType == DBType.SQLITE) {
+            return one + " || " + two;
+        }
+        return one + two;
+    }
+
     public abstract String epochSecondToDate(String sql);
 
     public abstract String dateToEpochSecond(String sql);
@@ -108,6 +118,8 @@ public abstract class Sql {
 
     public abstract String dateToHour(String sql);
 
+    public abstract String insertOrIgnore();
+
     // https://dev.mysql.com/doc/refman/5.7/en/date-and-time-functions.html
     public static class MySQL extends Sql {
 
@@ -140,6 +152,11 @@ public abstract class Sql {
         public String dateToHour(String sql) {
             return "HOUR(" + sql + ") % 24";
         }
+
+        @Override
+        public String insertOrIgnore() {
+            return "INSERT IGNORE INTO ";
+        }
     }
 
     // https://sqlite.org/lang_datefunc.html
@@ -174,5 +191,10 @@ public abstract class Sql {
         public String dateToHour(String sql) {
             return "strftime('%H'," + sql + ')';
         }
+
+        @Override
+        public String insertOrIgnore() {
+            return "INSERT OR IGNORE INTO ";
+        }
     }
 }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/AllowlistBounceTable.java

@@ -0,0 +1,70 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.storage.database.sql.tables;
+
+import com.djrapitops.plan.storage.database.DBType;
+import com.djrapitops.plan.storage.database.sql.building.CreateTableBuilder;
+import com.djrapitops.plan.storage.database.sql.building.Sql;
+import org.intellij.lang.annotations.Language;
+
+/**
+ * Represents plan_allowlist_bounce table.
+ *
+ * @author AuroraLS3
+ */
+public class AllowlistBounceTable {
+
+    public static final String TABLE_NAME = "plan_allowlist_bounce";
+
+    public static final String ID = "id";
+    public static final String UUID = "uuid";
+    public static final String USER_NAME = "name";
+    public static final String SERVER_ID = "server_id";
+    public static final String TIMES = "times";
+    public static final String LAST_BOUNCE = "last_bounce";
+
+    @Language("SQL")
+    public static final String INSERT_STATEMENT = "INSERT INTO " + TABLE_NAME + " (" +
+            UUID + ',' +
+            USER_NAME + ',' +
+            SERVER_ID + ',' +
+            TIMES + ',' +
+            LAST_BOUNCE +
+            ") VALUES (?,?," + ServerTable.SELECT_SERVER_ID + ",?,?)";
+
+    @Language("SQL")
+    public static final String INCREMENT_TIMES_STATEMENT = "UPDATE " + TABLE_NAME +
+            " SET " + TIMES + "=" + TIMES + "+1, " + LAST_BOUNCE + "=?" +
+            " WHERE " + UUID + "=?" +
+            " AND " + SERVER_ID + "=" + ServerTable.SELECT_SERVER_ID;
+
+    private AllowlistBounceTable() {
+        /* Static information class */
+    }
+
+    public static String createTableSQL(DBType dbType) {
+        return CreateTableBuilder.create(TABLE_NAME, dbType)
+                .column(ID, Sql.INT).primaryKey()
+                .column(UUID, Sql.varchar(36)).notNull().unique()
+                .column(USER_NAME, Sql.varchar(36)).notNull()
+                .column(SERVER_ID, Sql.INT).notNull()
+                .column(TIMES, Sql.INT).notNull().defaultValue("0")
+                .column(LAST_BOUNCE, Sql.LONG).notNull()
+                .foreignKey(SERVER_ID, ServerTable.TABLE_NAME, ServerTable.ID)
+                .toString();
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/ServerTable.java

@@ -24,6 +24,7 @@ import com.djrapitops.plan.storage.database.sql.building.Insert;
 import com.djrapitops.plan.storage.database.sql.building.Sql;
 import com.djrapitops.plan.storage.database.sql.building.Update;
 import org.apache.commons.text.TextStringBuilder;
+import org.intellij.lang.annotations.Language;
 
 import java.util.Collection;
 
@@ -61,6 +62,7 @@ public class ServerTable {
             .where(SERVER_UUID + "=?")
             .toString();
 
+    @Language("SQL")
     public static final String SELECT_SERVER_ID =
             '(' + SELECT + TABLE_NAME + '.' + ID +
                     FROM + TABLE_NAME +

Plan/common/src/main/java/com/djrapitops/plan/storage/database/sql/tables/webuser/WebPermissionTable.java

@@ -41,6 +41,10 @@ public class WebPermissionTable {
         /* Static information class */
     }
 
+    public static String safeInsertSQL(DBType dbType) {
+        return dbType.getSql().insertOrIgnore() + TABLE_NAME + " (" + PERMISSION + ") VALUES (?)";
+    }
+
     public static String createTableSQL(DBType dbType) {
         return CreateTableBuilder.create(TABLE_NAME, dbType)
                 .column(ID, Sql.INT).primaryKey()

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveEverythingTransaction.java

@@ -43,6 +43,7 @@ public class RemoveEverythingTransaction extends Patch {
         clearTable(WorldTimesTable.TABLE_NAME);
         clearTable(SessionsTable.TABLE_NAME);
         clearTable(JoinAddressTable.TABLE_NAME);
+        clearTable(AllowlistBounceTable.TABLE_NAME);
         clearTable(WorldTable.TABLE_NAME);
         clearTable(PingTable.TABLE_NAME);
         clearTable(UserInfoTable.TABLE_NAME);

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/commands/RemoveWebGroupsTransaction.java

@@ -0,0 +1,43 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.storage.database.transactions.commands;
+
+import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable;
+import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable;
+import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupToPermissionTable;
+import com.djrapitops.plan.storage.database.sql.tables.webuser.WebUserPreferencesTable;
+import com.djrapitops.plan.storage.database.transactions.Transaction;
+
+/**
+ * Transaction that removes all web groups from the database.
+ *
+ * @author AuroraLS3
+ */
+public class RemoveWebGroupsTransaction extends Transaction {
+
+    @Override
+    protected void performOperations() {
+        clearTable(WebUserPreferencesTable.TABLE_NAME);
+        clearTable(SecurityTable.TABLE_NAME);
+        clearTable(WebGroupToPermissionTable.TABLE_NAME);
+        clearTable(WebGroupTable.TABLE_NAME);
+    }
+
+    private void clearTable(String tableName) {
+        execute("DELETE FROM " + tableName);
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/StoreAllowlistBounceTransaction.java

@@ -0,0 +1,72 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.storage.database.transactions.events;
+
+import com.djrapitops.plan.identification.ServerUUID;
+import com.djrapitops.plan.storage.database.sql.tables.AllowlistBounceTable;
+import com.djrapitops.plan.storage.database.transactions.ExecStatement;
+import com.djrapitops.plan.storage.database.transactions.Transaction;
+import com.djrapitops.plan.utilities.dev.Untrusted;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.UUID;
+
+/**
+ * Stores a bounced allowlist login.
+ *
+ * @author AuroraLS3
+ */
+public class StoreAllowlistBounceTransaction extends Transaction {
+
+    private final UUID playerUUID;
+    @Untrusted
+    private final String playerName;
+    private final ServerUUID serverUUID;
+    private final long time;
+
+    public StoreAllowlistBounceTransaction(UUID playerUUID, @Untrusted String playerName, ServerUUID serverUUID, long time) {
+        this.playerUUID = playerUUID;
+        this.playerName = playerName;
+        this.serverUUID = serverUUID;
+        this.time = time;
+    }
+
+    @Override
+    protected void performOperations() {
+        boolean updated = execute(new ExecStatement(AllowlistBounceTable.INCREMENT_TIMES_STATEMENT) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setLong(1, time);
+                statement.setString(2, playerUUID.toString());
+                statement.setString(3, serverUUID.toString());
+            }
+        });
+        if (!updated) {
+            execute(new ExecStatement(AllowlistBounceTable.INSERT_STATEMENT) {
+                @Override
+                public void prepare(PreparedStatement statement) throws SQLException {
+                    statement.setString(1, playerUUID.toString());
+                    statement.setString(2, playerName);
+                    statement.setString(3, serverUUID.toString());
+                    statement.setInt(4, 1);
+                    statement.setLong(5, time);
+                }
+            });
+        }
+    }
+}

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/StoreRequestTransaction.java

@@ -16,49 +16,33 @@
  */
 package com.djrapitops.plan.storage.database.transactions.events;
 
-import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
-import com.djrapitops.plan.delivery.webserver.configuration.WebserverConfiguration;
 import com.djrapitops.plan.delivery.webserver.http.InternalRequest;
 import com.djrapitops.plan.storage.database.sql.tables.AccessLogTable;
 import com.djrapitops.plan.storage.database.transactions.ExecStatement;
-import com.djrapitops.plan.storage.database.transactions.Transaction;
+import com.djrapitops.plan.storage.database.transactions.ThrowawayTransaction;
 import org.apache.commons.lang3.StringUtils;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-public class StoreRequestTransaction extends Transaction {
+public class StoreRequestTransaction extends ThrowawayTransaction {
 
-    private final WebserverConfiguration webserverConfiguration;
+    private final long timestamp;
+    private final String accessAddress;
+    private final String method;
+    private final String url;
+    private final int responseCode;
 
-    private final InternalRequest internalRequest;
+    public StoreRequestTransaction(long timestamp, String accessAddress, String method, String url, int responseCode) {
-    private final Request request; // can be null
+        this.timestamp = timestamp;
-    private final Response response;
+        this.accessAddress = accessAddress;
-
+        this.method = method;
-    public StoreRequestTransaction(WebserverConfiguration webserverConfiguration, InternalRequest internalRequest, Request request, Response response) {
+        this.url = url;
-        this.webserverConfiguration = webserverConfiguration;
+        this.responseCode = responseCode;
-        this.internalRequest = internalRequest;
-        this.request = request;
-        this.response = response;
     }
 
-    @Override
+    public static String getTruncatedURI(Request request, InternalRequest internalRequest) {
-    protected void performOperations() {
-        execute(new ExecStatement(AccessLogTable.INSERT_NO_USER) {
-            @Override
-            public void prepare(PreparedStatement statement) throws SQLException {
-                statement.setLong(1, internalRequest.getTimestamp());
-                statement.setString(2, internalRequest.getAccessAddress(webserverConfiguration));
-                String method = internalRequest.getMethod();
-                statement.setString(3, method != null ? method : "?");
-                statement.setString(4, getTruncatedURI());
-                statement.setInt(5, response.getCode());
-            }
-        });
-    }
-
-    private String getTruncatedURI() {
         String uri = request != null ? request.getPath().asString() + request.getQuery().asString()
                 : internalRequest.getRequestedURIString();
         if (uri == null) {
@@ -66,4 +50,18 @@ public class StoreRequestTransaction extends Transaction {
         }
         return StringUtils.truncate(uri, 65000);
     }
+
+    @Override
+    protected void performOperations() {
+        execute(new ExecStatement(AccessLogTable.INSERT_NO_USER) {
+            @Override
+            public void prepare(PreparedStatement statement) throws SQLException {
+                statement.setLong(1, timestamp);
+                statement.setString(2, StringUtils.truncate(accessAddress, 45));
+                statement.setString(3, method);
+                statement.setString(4, url);
+                statement.setInt(5, responseCode);
+            }
+        });
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/init/CreateTablesTransaction.java

@@ -59,6 +59,7 @@ public class CreateTablesTransaction extends OperationCriticalTransaction {
         executeOther(new SecurityTableIdPatch());
         execute(WebUserPreferencesTable.createTableSQL(dbType));
         execute(PluginVersionTable.createTableSQL(dbType));
+        execute(AllowlistBounceTable.createTableSQL(dbType));
 
         // DataExtension tables
         execute(ExtensionIconTable.createTableSQL(dbType));

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/CorrectWrongCharacterEncodingPatch.java

@@ -51,6 +51,8 @@ public class CorrectWrongCharacterEncodingPatch extends Patch {
         if (dbType != DBType.MYSQL) return true;
 
         correctionSqlQueries = query(getBadTableCorrectionQueries());
+        // Fix for MariaDB mysql.user table being a view
+        correctionSqlQueries.removeIf(sql -> sql.startsWith("ALTER TABLE `user`"));
         return correctionSqlQueries.isEmpty();
     }
 

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/SecurityTableGroupPatch.java

@@ -17,7 +17,7 @@
 package com.djrapitops.plan.storage.database.transactions.patches;
 
 import com.djrapitops.plan.exceptions.database.DBOpException;
-import com.djrapitops.plan.storage.database.DBType;
+import com.djrapitops.plan.storage.database.sql.building.Sql;
 import com.djrapitops.plan.storage.database.sql.tables.webuser.SecurityTable;
 import com.djrapitops.plan.storage.database.sql.tables.webuser.WebGroupTable;
 
@@ -71,7 +71,7 @@ public class SecurityTableGroupPatch extends Patch {
                     SecurityTable.USERNAME + ',' +
                     SecurityTable.LINKED_TO + ',' +
                     SecurityTable.SALT_PASSWORD_HASH + ',' +
-                    "(" + SELECT + WebGroupTable.ID + FROM + WebGroupTable.TABLE_NAME + WHERE + WebGroupTable.NAME + "=" + (dbType == DBType.SQLITE ? "'legacy_level_' || permission_level" : "CONCAT('legacy_level_', permission_level)") + ")" +
+                    "(" + SELECT + WebGroupTable.ID + FROM + WebGroupTable.TABLE_NAME + WHERE + WebGroupTable.NAME + "=" + Sql.concat(dbType, "'legacy_level_'", "permission_level") + ")" +
                     FROM + tempTableName
             );
 

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java

@@ -39,7 +39,7 @@ public class UpdateWebPermissionsPatch extends Patch {
 
     @Override
     public boolean hasBeenApplied() {
-        List<String> defaultPermissions = Arrays.stream(WebPermission.values())
+        List<String> defaultPermissions = Arrays.stream(WebPermission.nonDeprecatedValues())
                 .map(WebPermission::getPermission)
                 .collect(Collectors.toList());
         List<String> storedPermissions = query(WebUserQueries.fetchAvailablePermissions());
@@ -55,7 +55,11 @@ public class UpdateWebPermissionsPatch extends Patch {
 
     @Override
     protected void applyPatch() {
-        execute(new ExecBatchStatement(WebPermissionTable.INSERT_STATEMENT) {
+        storeMissing();
+    }
+
+    private void storeMissing() {
+        execute(new ExecBatchStatement(WebPermissionTable.safeInsertSQL(dbType)) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
                 for (String permission : missingPermissions) {

Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/webuser/StoreMissingWebPermissionsTransaction.java

@@ -50,7 +50,7 @@ public class StoreMissingWebPermissionsTransaction extends Transaction {
                 missingPermissions.add(permission);
             }
         }
-        execute(new ExecBatchStatement(WebPermissionTable.INSERT_STATEMENT) {
+        execute(new ExecBatchStatement(WebPermissionTable.safeInsertSQL(dbType)) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
                 for (String permission : missingPermissions) {

Plan/common/src/main/java/com/djrapitops/plan/storage/file/JarResource.java

@@ -16,7 +16,7 @@
  */
 package com.djrapitops.plan.storage.file;
 
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;

Plan/common/src/main/java/com/djrapitops/plan/storage/upkeep/DBCleanTask.java

@@ -18,8 +18,6 @@ package com.djrapitops.plan.storage.upkeep;
 
 import com.djrapitops.plan.TaskSystem;
 import com.djrapitops.plan.exceptions.database.DBOpException;
-import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveUnsatisfiedConditionalPlayerResultsTransaction;
-import com.djrapitops.plan.extension.implementation.storage.transactions.results.RemoveUnsatisfiedConditionalServerResultsTransaction;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.query.QuerySvc;
 import com.djrapitops.plan.settings.config.PlanConfig;
@@ -112,8 +110,6 @@ public class DBCleanTask extends TaskSystem.Task {
                         config.get(TimeSettings.DELETE_PING_DATA_AFTER)
                 ));
                 database.executeTransaction(new RemoveDuplicateUserInfoTransaction());
-                database.executeTransaction(new RemoveUnsatisfiedConditionalPlayerResultsTransaction());
-                database.executeTransaction(new RemoveUnsatisfiedConditionalServerResultsTransaction());
                 int removed = cleanOldPlayers(database);
                 if (removed > 0) {
                     logger.info(locale.getString(PluginLang.DB_NOTIFY_CLEAN, removed));

Plan/common/src/main/java/com/djrapitops/plan/utilities/SemaphoreAccessCounter.java

@@ -16,24 +16,59 @@
  */
 package com.djrapitops.plan.utilities;
 
+import com.djrapitops.plan.storage.database.SQLDB;
+import com.djrapitops.plan.utilities.java.ThrowableUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class SemaphoreAccessCounter {
 
     private final AtomicInteger accessCounter;
     private final Object lockObject;
+    private final Collection<String> holds = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
     public SemaphoreAccessCounter() {
         accessCounter = new AtomicInteger(0);
         lockObject = new Object();
     }
 
+    @NotNull
+    private static String getAccessingThing() {
+        boolean previousWasAccess = false;
+        List<StackTraceElement> accessors = new ArrayList<>();
+        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+        StackTraceElement[] origin = SQLDB.getTransactionOrigin().get();
+        StackTraceElement[] callSite = ThrowableUtils.combineStackTrace(origin, stackTrace);
+
+        for (StackTraceElement e : callSite) {
+            if (previousWasAccess) {
+                accessors.add(e);
+                previousWasAccess = false;
+            }
+            String call = e.getClassName() + "." + e.getMethodName();
+            if ("com.djrapitops.plan.storage.database.SQLDB.query".equals(call)
+                    || "com.djrapitops.plan.storage.database.SQLDB.executeTransaction".equals(call)) {
+                previousWasAccess = true;
+            }
+        }
+        if (accessors.isEmpty()) accessors.addAll(Arrays.asList(callSite));
+        return accessors.toString();
+    }
+
     public void enter() {
         accessCounter.incrementAndGet();
+        holds.add(getAccessingThing());
     }
 
     public void exit() {
         synchronized (lockObject) {
+            holds.remove(getAccessingThing());
+
             int value = accessCounter.decrementAndGet();
             if (value == 0) {
                 lockObject.notifyAll();
@@ -45,6 +80,7 @@ public class SemaphoreAccessCounter {
         while (accessCounter.get() > 0) {
             synchronized (lockObject) {
                 try {
+                    logAccess();
                     lockObject.wait();
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
@@ -52,4 +88,16 @@ public class SemaphoreAccessCounter {
             }
         }
     }
+
+    private void logAccess() {
+        Logger logger = Logger.getLogger("Plan");
+        if (logger == null) logger = Logger.getGlobal();
+
+        if (logger.isLoggable(Level.INFO) && !holds.isEmpty()) {
+            logger.log(Level.INFO, "Waiting for these connections to finish:");
+            for (String hold : holds) {
+                logger.log(Level.INFO, hold);
+            }
+        }
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/utilities/java/ThrowableUtils.java

@@ -16,6 +16,8 @@
  */
 package com.djrapitops.plan.utilities.java;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Arrays;
 import java.util.stream.Stream;
 
@@ -30,20 +32,29 @@ public class ThrowableUtils {
         /* Static method class */
     }
 
-    public static void appendEntryPointToCause(Throwable throwable, Throwable originPoint) {
+    public static void appendEntryPointToCause(Throwable throwable, StackTraceElement[] originPoint) {
         Throwable cause = throwable.getCause();
         while (cause.getCause() != null) {
             cause = cause.getCause();
         }
 
         cause.setStackTrace(
-                Stream.concat(
+                combineStackTrace(originPoint, cause.getStackTrace())
-                        Arrays.stream(cause.getStackTrace()),
-                        Arrays.stream(originPoint.getStackTrace())
-                ).toArray(StackTraceElement[]::new)
         );
     }
 
+    @NotNull
+    public static StackTraceElement[] combineStackTrace(StackTraceElement[] originPoint, StackTraceElement[] cause) {
+        if (originPoint == null && cause == null) return new StackTraceElement[0];
+        if (originPoint == null) return cause;
+        if (cause == null) return originPoint;
+
+        return Stream.concat(
+                Arrays.stream(cause),
+                Arrays.stream(originPoint)
+        ).toArray(StackTraceElement[]::new);
+    }
+
     public static String findCallerAfterClass(StackTraceElement[] stackTrace, Class<?> afterThis) {
         boolean found = false;
         for (StackTraceElement stackTraceElement : stackTrace) {

Plan/common/src/main/resources/assets/plan/bGljZW5zZV9rZXlz.txt

@@ -1 +0,0 @@
-45VvUnNtiDHKZ+hq3vqx204q+tmLRE/koVskJLaT2+ipY8G1ThqcLZjUMuF79lYLpRIqpAt4KcY=

Plan/common/src/main/resources/assets/plan/bGljZW5zZV9wYXNz.txt

@@ -1 +0,0 @@
-YEQ4eTdZPzUpUV4zcTp6NkE7XEw=

Plan/common/src/main/resources/assets/plan/bungeeconfig.yml

@@ -109,10 +109,19 @@ Data_gathering:
   # Please accept the EULA to download GeoLite2 IP-Country Database
   # https://www.maxmind.com/en/geolite2/eula
   Accept_GeoLite2_EULA: false
+  # This can be changed to your own MaxMind URL if you have license https://dev.maxmind.com/geoip/updating-databases?lang=en#directly-downloading-databases
+  # e.g. https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=YOUR_KEY&suffix=tar.gz
+  Geolocation_Download_URL: "https://geodb.playeranalytics.net/GeoLite2-Country.mmdb"
   Ping: true
   Disk_space: true
-  # Does not affect already gathered data
+  Join_addresses:
-  Preserve_join_address_case: false
+    Enabled: true
+    # Does not affect already gathered data
+    Preserve_case: false
+    Preserve_invalid: false
+    # Replaces these join addresses with unknown
+    Filter_out_from_data:
+      - "play.example.com"
 # -----------------------------------------------------
 # Supported time units: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
 # -----------------------------------------------------

Plan/common/src/main/resources/assets/plan/config.yml

@@ -110,13 +110,22 @@ Data_gathering:
   # Please accept the EULA to download GeoLite2 IP-Country Database
   # https://www.maxmind.com/en/geolite2/eula
   Accept_GeoLite2_EULA: false
+  # This can be changed to your own MaxMind URL if you have license https://dev.maxmind.com/geoip/updating-databases?lang=en#directly-downloading-databases
+  # e.g. https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=YOUR_KEY&suffix=tar.gz
+  Geolocation_Download_URL: "https://geodb.playeranalytics.net/GeoLite2-Country.mmdb"
   Ping: true
   Disk_space: true
   Commands:
     Log_unknown: false
     Log_aliases_as_main_command: true
-  # Does not affect already gathered data
+  Join_addresses:
-  Preserve_join_address_case: false
+    Enabled: true
+    # Does not affect already gathered data
+    Preserve_case: false
+    Preserve_invalid: false
+    # Replaces these join addresses with unknown
+    Filter_out_from_data:
+      - "play.example.com"
 # -----------------------------------------------------
 # Supported time units: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
 # -----------------------------------------------------

Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml

@@ -184,7 +184,7 @@ command:
             inDepth: "获得一个指向 /players page（全体玩家页面） 的链接，以查看玩家列表。"
         register:
             description: "注册一个网页用户"
-            inDepth: "直接使用会获得注册页面的链接。添加 --code[注册代码] 参数可以注册一个账户。"
+            inDepth: "直接使用会获得注册页面的链接。添加 --code [注册代码] 参数可以注册一个账户。"
         reload:
             description: "重启 Plan"
             inDepth: "禁用然后重新启用本插件，会重新加载配置中的设置。"
@@ -290,13 +290,19 @@ html:
         active: "活跃"
         activePlaytime: "活跃时间"
         activityIndex: "活跃指数"
+        addJoinAddressGroup: "添加地址组"
+        addressGroup: "地址组 {{n}}"
         afk: "挂机"
         afkTime: "挂机时间"
         all: "全部"
         allTime: "所有时间"
+        allowed: "允许"
+        allowlist: "白名单"
+        allowlistBounces: "白名单退回"
         alphabetical: "按字母顺序"
         apply: "应用"
         asNumbers: "数据"
+        attempts: "尝试"
         average: "平均"
         averageActivePlaytime: "平均活跃时间"
         averageAfkTime: "平均挂机时间"
@@ -317,6 +323,7 @@ html:
         banned: "已被封禁"
         bestPeak: "历史最高峰值"
         bestPing: "最低延迟"
+        blocked: "阻止"
         calendar: " 日历"
         comparing7days: "对比 7 天的情况"
         connectionInfo: "连接信息"
@@ -338,7 +345,7 @@ html:
         duringLowTps: "持续低 TPS 时间"
         entities: "实体"
         errors: "Plan 错误日志"
-        export: "Export"
+        export: "导出"
         exported: "数据导出时间"
         favoriteServer: "最喜欢的服务器"
         firstSession: "第一次会话"
@@ -430,7 +437,10 @@ html:
         last24hours: "过去 24 小时"
         last30days: "过去 30 天"
         last7days: "过去 7 天"
+        lastAllowed: "最后允许"
+        lastBlocked: "最后阻止"
         lastConnected: "最后连接时间"
+        lastKnownAttempt: "最后一次已知的尝试"
         lastPeak: "上次在线峰值"
         lastSeen: "最后在线时间"
         latestJoinAddresses: "上一次加入地址"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "查看按国家划分的Ping表"
                 page_network_join_addresses: "查看加入地址 - 选项卡"
                 page_network_join_addresses_graphs: "查看加入地址图表"
-                page_network_join_addresses_graphs_pie: "查看最新加入地址图表"
                 page_network_join_addresses_graphs_time: "查看加入地址随时间变化的图表"
                 page_network_overview: "查看网络总览 - 选项卡"
                 page_network_overview_graphs: "查看网络总览图表"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "查看玩家会话 - 选项卡"
                 page_player_versus: "查看PvP和PvE - 选项卡"
                 page_server: "查看所有服务器页面"
+                page_server_allowlist_bounce: "查看游戏白名单退回列表"
                 page_server_geolocations: "查看服务器地理位置 - 选项卡"
                 page_server_geolocations_map: "查看服务器地理位置地图"
                 page_server_geolocations_ping_per_country: "查看按国家划分的延迟表"
                 page_server_join_addresses: "查看服务器加入地址 - 选项卡"
                 page_server_join_addresses_graphs: "查看服务器加入地址图表"
-                page_server_join_addresses_graphs_pie: "查看最新加入地址图表"
                 page_server_join_addresses_graphs_time: "查看服务器加入地址随时间变化的图表"
                 page_server_online_activity: "查看在线活动 - 选项卡"
                 page_server_online_activity_graphs: "查看在线活动图表"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "`是`"
         label:
+            editQuery: "修改查询"
             from: ">从 </label>"
             makeAnother: "进行另一个查询"
             servers:
@@ -897,7 +907,7 @@ plugin:
         no: "否"
         today: "'今天'"
         unavailable: "不可用"
-        unknown: "位置"
+        unknown: "未知"
         yes: "是"
         yesterday: "'昨天'"
     localeReloaded: "自定义 locale.yml 已被修改，因此已重新加载并且现在正在使用。"

Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml

@@ -290,13 +290,19 @@ html:
         active: "Aktivní"
         activePlaytime: "Aktivní herní čas"
         activityIndex: "Index aktivity"
+        addJoinAddressGroup: "Add address group"
+        addressGroup: "Address group {{n}}"
         afk: "AFK"
         afkTime: "AFK čas"
         all: "Vše"
         allTime: "Celkově"
+        allowed: "Allowed"
+        allowlist: "Allowlist"
+        allowlistBounces: "Allowlist Bounces"
         alphabetical: "Abecední řazení"
         apply: "Apply"
         asNumbers: "statistiky"
+        attempts: "Attempts"
         average: "Průměrná délka prvního připojení"
         averageActivePlaytime: "Průměrná herní aktivita"
         averageAfkTime: "Průměrný AFK čas"
@@ -317,6 +323,7 @@ html:
         banned: "Zabanován"
         bestPeak: "Nejvíce hráčů"
         bestPing: "Nejlepší ping"
+        blocked: "Blocked"
         calendar: " Kalendář"
         comparing7days: "Srovnání posledních 7 dní"
         connectionInfo: "Informace o připojení"
@@ -430,7 +437,10 @@ html:
         last24hours: "Posledních 24 hodin"
         last30days: "Posledních 30 dní"
         last7days: "Posledních 7 dní"
+        lastAllowed: "Last Allowed"
+        lastBlocked: "Last Blocked"
         lastConnected: "Poslední připojení"
+        lastKnownAttempt: "Last Known Attempt"
         lastPeak: "Naposledy nejvíce hráčů"
         lastSeen: "Naposledy viděn"
         latestJoinAddresses: "Poslední adresy pro připojení"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "See Ping Per Country table"
                 page_network_join_addresses: "See Join Addresses -tab"
                 page_network_join_addresses_graphs: "See Join Address graphs"
-                page_network_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_network_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_network_overview: "See Network Overview -tab"
                 page_network_overview_graphs: "See Network Overview graphs"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "See Player Sessions -tab"
                 page_player_versus: "See PvP & PvE -tab"
                 page_server: "See all of server page"
+                page_server_allowlist_bounce: "See list of Game allowlist bounces"
                 page_server_geolocations: "See Geolocations tab"
                 page_server_geolocations_map: "See Geolocations Map"
                 page_server_geolocations_ping_per_country: "See Ping Per Country table"
                 page_server_join_addresses: "See Join Addresses -tab"
                 page_server_join_addresses_graphs: "See Join Address graphs"
-                page_server_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_server_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_server_online_activity: "See Online Activity -tab"
                 page_server_online_activity_graphs: "See Online Activity graphs"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "` jsou`"
         label:
+            editQuery: "Edit Query"
             from: ">od</label>"
             makeAnother: "Vytvořit další dotaz"
             servers:

Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml

@@ -290,13 +290,19 @@ html:
         active: "Aktiv"
         activePlaytime: "Aktive Spielzeit"
         activityIndex: "Aktivitätsindex"
+        addJoinAddressGroup: "Add address group"
+        addressGroup: "Address group {{n}}"
         afk: "AFK"
         afkTime: "AFK Zeit"
         all: "Gesamt"
         allTime: "Gesamte zeit"
+        allowed: "Allowed"
+        allowlist: "Allowlist"
+        allowlistBounces: "Allowlist Bounces"
         alphabetical: "Alphabetical"
         apply: "Apply"
         asNumbers: "als Zahlen"
+        attempts: "Attempts"
         average: "Average first session length"
         averageActivePlaytime: "Durchschnittliche aktive Spielzeit"
         averageAfkTime: "Durchschnittliche AFK Zeit"
@@ -317,6 +323,7 @@ html:
         banned: "Gebannt"
         bestPeak: "Rekord"
         bestPing: "Bester Ping"
+        blocked: "Blocked"
         calendar: " Kalender"
         comparing7days: "Vergleiche 7 Tage"
         connectionInfo: "Verbindungsinformationen"
@@ -430,7 +437,10 @@ html:
         last24hours: "Letzte 24 Stunden"
         last30days: "Letzte 30 Tage"
         last7days: "Letzte 7 Tage"
+        lastAllowed: "Last Allowed"
+        lastBlocked: "Last Blocked"
         lastConnected: "Letzte Verbindung"
+        lastKnownAttempt: "Last Known Attempt"
         lastPeak: "Letzter Höchststand"
         lastSeen: "Zuletzt gesehen"
         latestJoinAddresses: "Latest Join Addresses"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "See Ping Per Country table"
                 page_network_join_addresses: "See Join Addresses -tab"
                 page_network_join_addresses_graphs: "See Join Address graphs"
-                page_network_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_network_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_network_overview: "See Network Overview -tab"
                 page_network_overview_graphs: "See Network Overview graphs"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "See Player Sessions -tab"
                 page_player_versus: "See PvP & PvE -tab"
                 page_server: "See all of server page"
+                page_server_allowlist_bounce: "See list of Game allowlist bounces"
                 page_server_geolocations: "See Geolocations tab"
                 page_server_geolocations_map: "See Geolocations Map"
                 page_server_geolocations_ping_per_country: "See Ping Per Country table"
                 page_server_join_addresses: "See Join Addresses -tab"
                 page_server_join_addresses_graphs: "See Join Address graphs"
-                page_server_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_server_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_server_online_activity: "See Online Activity -tab"
                 page_server_online_activity_graphs: "See Online Activity graphs"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "`are`"
         label:
+            editQuery: "Edit Query"
             from: ">from</label>"
             makeAnother: "Make another query"
             servers:

Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml

@@ -290,13 +290,19 @@ html:
         active: "Active"
         activePlaytime: "Active Playtime"
         activityIndex: "Activity Index"
+        addJoinAddressGroup: "Add address group"
+        addressGroup: "Address group {{n}}"
         afk: "AFK"
         afkTime: "AFK Time"
         all: "All"
         allTime: "All Time"
+        allowed: "Allowed"
+        allowlist: "Allowlist"
+        allowlistBounces: "Allowlist Bounces"
         alphabetical: "Alphabetical"
         apply: "Apply"
         asNumbers: "as Numbers"
+        attempts: "Attempts"
         average: "Average first session length"
         averageActivePlaytime: "Average Active Playtime"
         averageAfkTime: "Average AFK Time"
@@ -317,6 +323,7 @@ html:
         banned: "Banned"
         bestPeak: "All Time Peak"
         bestPing: "Best Ping"
+        blocked: "Blocked"
         calendar: " Calendar"
         comparing7days: "Comparing 7 days"
         connectionInfo: "Connection Information"
@@ -430,7 +437,10 @@ html:
         last24hours: "Last 24 hours"
         last30days: "Last 30 days"
         last7days: "Last 7 days"
+        lastAllowed: "Last Allowed"
+        lastBlocked: "Last Blocked"
         lastConnected: "Last Connected"
+        lastKnownAttempt: "Last Known Attempt"
         lastPeak: "Last Peak"
         lastSeen: "Last Seen"
         latestJoinAddresses: "Latest Join Addresses"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "See Ping Per Country table"
                 page_network_join_addresses: "See Join Addresses -tab"
                 page_network_join_addresses_graphs: "See Join Address graphs"
-                page_network_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_network_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_network_overview: "See Network Overview -tab"
                 page_network_overview_graphs: "See Network Overview graphs"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "See Player Sessions -tab"
                 page_player_versus: "See PvP & PvE -tab"
                 page_server: "See all of server page"
+                page_server_allowlist_bounce: "See list of Game allowlist bounces"
                 page_server_geolocations: "See Geolocations tab"
                 page_server_geolocations_map: "See Geolocations Map"
                 page_server_geolocations_ping_per_country: "See Ping Per Country table"
                 page_server_join_addresses: "See Join Addresses -tab"
                 page_server_join_addresses_graphs: "See Join Address graphs"
-                page_server_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_server_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_server_online_activity: "See Online Activity -tab"
                 page_server_online_activity_graphs: "See Online Activity graphs"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "`are`"
         label:
+            editQuery: "Edit Query"
             from: ">from</label>"
             makeAnother: "Make another query"
             servers:

Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml

@@ -290,13 +290,19 @@ html:
         active: "Activo"
         activePlaytime: "Tiempo de juego activo"
         activityIndex: "Índice de actividad"
+        addJoinAddressGroup: "Add address group"
+        addressGroup: "Address group {{n}}"
         afk: "AFK"
         afkTime: "Tiempo AFK"
         all: "Todo"
         allTime: "Todo el tiempo"
+        allowed: "Allowed"
+        allowlist: "Allowlist"
+        allowlistBounces: "Allowlist Bounces"
         alphabetical: "Alphabetical"
         apply: "Apply"
         asNumbers: "como números"
+        attempts: "Attempts"
         average: "Average first session length"
         averageActivePlaytime: "Tiempo de juego activo promedio"
         averageAfkTime: "Tiempo AFK promedio"
@@ -317,6 +323,7 @@ html:
         banned: "Baneado"
         bestPeak: "Mejor pico"
         bestPing: "Mejor Ping"
+        blocked: "Blocked"
         calendar: " Calendario"
         comparing7days: "Comparando 7 dias"
         connectionInfo: "Información de conexión"
@@ -430,7 +437,10 @@ html:
         last24hours: "Últimas 24 horas"
         last30days: "Últimos 30 dias"
         last7days: "Últimos 7 días"
+        lastAllowed: "Last Allowed"
+        lastBlocked: "Last Blocked"
         lastConnected: "Última vez conectado"
+        lastKnownAttempt: "Last Known Attempt"
         lastPeak: "Último pico"
         lastSeen: "Última vez visto"
         latestJoinAddresses: "Latest Join Addresses"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "See Ping Per Country table"
                 page_network_join_addresses: "See Join Addresses -tab"
                 page_network_join_addresses_graphs: "See Join Address graphs"
-                page_network_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_network_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_network_overview: "See Network Overview -tab"
                 page_network_overview_graphs: "See Network Overview graphs"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "See Player Sessions -tab"
                 page_player_versus: "See PvP & PvE -tab"
                 page_server: "See all of server page"
+                page_server_allowlist_bounce: "See list of Game allowlist bounces"
                 page_server_geolocations: "See Geolocations tab"
                 page_server_geolocations_map: "See Geolocations Map"
                 page_server_geolocations_ping_per_country: "See Ping Per Country table"
                 page_server_join_addresses: "See Join Addresses -tab"
                 page_server_join_addresses_graphs: "See Join Address graphs"
-                page_server_join_addresses_graphs_pie: "See Latest Join Addresses graph"
                 page_server_join_addresses_graphs_time: "See Join Addresses over time graph"
                 page_server_online_activity: "See Online Activity -tab"
                 page_server_online_activity_graphs: "See Online Activity graphs"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "`are`"
         label:
+            editQuery: "Edit Query"
             from: ">de</label>"
             makeAnother: "Realiza otra consulta"
             servers:

Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml

@@ -290,13 +290,19 @@ html:
         active: "Aktiivinen"
         activePlaytime: "Aktiivinen peliaika"
         activityIndex: "Aktiivisuus Indeksi"
+        addJoinAddressGroup: "Add address group"
+        addressGroup: "Address group {{n}}"
         afk: "AFK"
         afkTime: "Aika AFK:ina"
         all: "Kaikki"
         allTime: "Kaikkien aikojen"
+        allowed: "Allowed"
+        allowlist: "Allowlist"
+        allowlistBounces: "Allowlist Bounces"
         alphabetical: "Aakkosjärjestys"
         apply: "Käytä"
         asNumbers: "Numeroina"
+        attempts: "Attempts"
         average: "Keskimäräinen"
         averageActivePlaytime: "Keskimäräinen Aktiivinen peliaika"
         averageAfkTime: "Keskimäräinen AFK aika"
@@ -317,6 +323,7 @@ html:
         banned: "Pannassa"
         bestPeak: "Paras Huippu"
         bestPing: "Paras Vasteaika"
+        blocked: "Blocked"
         calendar: " Kalenteri"
         comparing7days: "Verrataan 7 päivää"
         connectionInfo: "Yhteyksien tiedot"
@@ -430,7 +437,10 @@ html:
         last24hours: "Viimeiset 24 tuntia"
         last30days: "Viimeiset 30 päivää"
         last7days: "Viimeiset 7 päivää"
+        lastAllowed: "Last Allowed"
+        lastBlocked: "Last Blocked"
         lastConnected: "Viimeisin yhteys"
+        lastKnownAttempt: "Last Known Attempt"
         lastPeak: "Viimeisin huippu"
         lastSeen: "Nähty Viimeksi"
         latestJoinAddresses: "Viimeisimmät Liittymisosoitteet"
@@ -656,7 +666,6 @@ html:
                 page_network_geolocations_ping_per_country: "Näkee Viive per Maa -taulun"
                 page_network_join_addresses: "Näkee Liittymäosoitteet osion"
                 page_network_join_addresses_graphs: "Näkee Liittymisosoite kaaviot"
-                page_network_join_addresses_graphs_pie: "Näkee kaavion Viimeisimmistä liittymisosoitteista"
                 page_network_join_addresses_graphs_time: "Näkee kaavion Liittymisosoitteista ajan yli"
                 page_network_overview: "Näkee Verkoston katsaus osion"
                 page_network_overview_graphs: "Näkee Verkoston katsaus kaaviot"
@@ -686,12 +695,12 @@ html:
                 page_player_sessions: "Näkee Pelaajan Istunnot osion"
                 page_player_versus: "Näkee PvP & PvE osion"
                 page_server: "Näkee koko palvelin sivun"
+                page_server_allowlist_bounce: "See list of Game allowlist bounces"
                 page_server_geolocations: "Näkee Geolokaatio osion"
                 page_server_geolocations_map: "Näkee Geolokaatio kartan"
                 page_server_geolocations_ping_per_country: "Näkee Viive per Maa -taulun"
                 page_server_join_addresses: "Näkee Liittymäosoitteet osion"
                 page_server_join_addresses_graphs: "Näkee Liittymisosoite kaaviot"
-                page_server_join_addresses_graphs_pie: "Näkee kaavion Viimeisimmistä liittymisosoitteista"
                 page_server_join_addresses_graphs_time: "Näkee kaavion Liittymisosoitteista ajan yli"
                 page_server_online_activity: "Näkee Online Aktiivisuus osion"
                 page_server_online_activity_graphs: "Näkee Online Aktiivisuus kaaviot"
@@ -785,6 +794,7 @@ html:
         generic:
             are: "`ovat`"
         label:
+            editQuery: "Edit Query"
             from: ">tästä</label>"
             makeAnother: "Tee toinen kysely"
             servers:

Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml

@@ -24,8 +24,8 @@ command:
             description: "Nom de la fonctionnalité à désactiver : ${0}"
             name: "fonctionnalité"
         group:
-            description: "Web Permission Group, case sensitive."
+            description: "Groupe de permissions Web, sensible à la casse."
-            name: "group"
+            name: "groupe"
         importKind: "type d'importation"
         nameOrUUID:
             description: "Nom ou UUID d'un joueur"
@@ -67,16 +67,16 @@ command:
             failSameServer: "Impossible de marquer ce serveur comme désinstallé (vous y êtes)."
             hotswap: "§eN'oubliez pas de passer à la nouvelle base de données (/plan db hotswap ${0}) & de recharger Plan."
             importers: "Importateurs :"
-            preparing: "Preparing.."
+            preparing: "Préparation..."
-            progress: "${0} / ${1} traité(s).."
+            progress: "${0} / ${1} traité(s)."
             start: "> §2Traitement des données..."
             success: "> §aSuccès !"
-        playerRemoval: "Suppression des données de ${0} depuis ${1}.."
+        playerRemoval: "Suppression des données de ${0} depuis ${1}."
-        removal: "Suppression des données de Plan depuis ${0}.."
+        removal: "Suppression des données de Plan depuis ${0}."
         serverUninstalled: "§aSi le serveur est toujours installé, il se définira automatiquement comme dans la base de données."
-        unregister: "Désenregistrement de '${0}'.."
+        unregister: "Désenregistrement de '${0}'."
-        warnDbNotOpen: "§eLa base de données est : ${0} - Cela pourrait prendre plus de temps que prévu..."
+        warnDbNotOpen: "§eLa base de données est : ${0} - Cela pourrait prendre plus de temps que prévu."
-        write: "Écriture à ${0}.."
+        write: "Écriture à ${0}."
     fail:
         emptyString: "La chaîne de recherche ne peut pas être vide"
         invalidArguments: "Accepte les éléments suivants comme ${0} : ${1}"
@@ -172,7 +172,7 @@ command:
             description: "Déconnecter les autres utilisateurs du panel"
             inDepth: "Donnez un nom d'utilisateur à déconnecter du panel, donnez * comme argument pour déconnecter tout le monde."
         migrateToOnlineUuids:
-            description: "Migrate offline uuid data to online uuids"
+            description: "Migrer les données des uuid hors ligne vers les uuids en ligne"
         network:
             description: "Visualiser la page du réseau"
             inDepth: "Obtient un lien vers la page /network, uniquement sur les réseaux."
@@ -189,7 +189,7 @@ command:
             description: "Recharger Plan"
             inDepth: "Désactive et active le plugin pour recharger tout changement dans la configuration."
         removejoinaddresses:
-            description: "Remove join addresses of a specified server"
+            description: "Supprimer les adresses de connexion d'un serveur spécifié"
         search:
             description: "Rechercher un joueur"
             inDepth: "Liste tous les noms de joueurs correspondant à une partie donnée d'un nom."
@@ -200,8 +200,8 @@ command:
             description: "Obtenir la liste des serveurs dans la base de données"
             inDepth: "Liste les ids, noms et uuids des serveurs de la base de données."
         setgroup:
-            description: "Change users web permission group."
+            description: "Changer le groupe de permissions des utilisateur du site web."
-            inDepth: "Allows you to change a users web permission group to an existing web group. Use /plan groups for list of available groups."
+            inDepth: "Permet de changer un groupe de permissions web d'un utilisateur par un groupe web existant. Utilisez /plan groups pour obtenir la liste des groupes disponibles."
         unregister:
             description: "Désenregistrer un utilisateur du site de Plan"
             inDepth: "Utilisez sans argument pour désenregistrer un utilisateur lié à un joueur, ou avec un nom d'utilisateur pour désenregistrer un autre utilisateur."
@@ -248,17 +248,17 @@ html:
         unique: "Unique :"
     description:
         newPlayerRetention: "Cette valeur est une prédiction basée sur les joueurs précédents."
-        noData24h: "Server has not sent data for over 24 hours."
+        noData24h: "Le serveur n'a pas envoyé de données depuis plus de 24 heures."
-        noData30d: "Server has not sent data for over 30 days."
+        noData30d: "Le serveur n'a pas envoyé de données depuis plus de 30 jours."
-        noData7d: "Server has not sent data for over 7 days."
+        noData7d: "Le serveur n'a pas envoyé de données depuis plus de 7 jours."
         noGameServers: "Certaines données nécessitent l'installation de Plan sur les serveurs de jeu."
         noGeolocations: "La collecte de la géolocalisation doit être activée dans la configuration (Accepter l'EULA de GeoLite2)."
         noServerOnlinActivity: "Aucun serveur pour afficher l'activité en ligne."
         noServers: "Il n'y a pas de serveur dans la base de données."
-        noServersLong: 'Il semblerait que Plan ne soit installé sur aucun des serveurs de jeu ou qu'il ne soit pas connecté à la même base de données. Voir <a href="https://github.com/plan-player-analytics/Plan/wiki">wiki</a> pour un tutoriel sur la mise en place d'un Réseau.'
+        noServersLong: 'Il semblerait que Plan ne soit installé sur aucun des serveurs de jeu ou qu''il ne soit pas connecté à la même base de données. Voir <a href="https://github.com/plan-player-analytics/Plan/wiki">wiki</a> pour un tutoriel sur la mise en place d''un Réseau.'
         noSpongeChunks: "Chunks indisponibles sur Sponge"
-        noUptimeCalculation: "Server is offline, or has never restarted with Plan installed."
+        noUptimeCalculation: "Le serveur est hors ligne ou n'a jamais redémarré avec Plan installé."
-        performanceNoGameServers: "TPS, Entity or Chunk data is not gathered from proxy servers since they don't have game tick loop."
+        performanceNoGameServers: "Les données TPS, Entité ou Chunk ne sont pas collectées à partir des serveurs proxy car ils n'ont pas de boucle de tick de jeu."
         predictedNewPlayerRetention: "Cette valeur est une prédiction basée sur les anciennes données du joueur."
     error:
         401Unauthorized: "Non autorisé."
@@ -275,165 +275,175 @@ html:
             groupNotFound: "Web Permission Group does not exist"
             loginFailed: "L'utilisateur et le mot de passe ne correspondent pas"
             noCookie: "Cookie de l'utilisateur non présent"
-            noPermissionGroup: "Registration failed, player did not have any 'plan.webgroup.{name}' permission"
+            noPermissionGroup: "L'enregistrement a échoué, le joueur n'avait pas la permission 'plan.webgroup.{name}'"
             registrationFailed: "Enregistrement échoué, veuillez réessayer (Le code expire au bout de 15 minutes)"
             userNotFound: "Cet utilisateur n'existe pas"
         authFailed: "Authentification échouée."
         authFailedTips: "- Assurez-vous d'avoir enregistré un utilisateur avec :<b>'/plan register'.</b><br>- Vérifiez que le nom d'utilisateur et le mot de passe soient corrects.<br>- Le nom d'utilisateur et le mot de passe sont sensibles au format majuscule/minuscule.<br><br>Si vous avez oublié votre mot de passe, demandez à un membre du staff de supprimer votre ancien utilisateur puis de vous réinscrire."
         noServersOnline: "Aucun serveur en ligne pour exécuter la demande."
         playerNotSeen: "Cet utilisateur ne s'est jamais connecté sur ce serveur."
-        serverNotExported: "Server doesn't exist, its data might not have been exported yet."
+        serverNotExported: "Le serveur n'existe pas, ses données n'ont peut-être pas encore été exportées."
-        serverNotSeen: "Server doesn't exist"
+        serverNotSeen: "Le serveur n'existe pas"
     generic:
         none: "Vide"
     label:
         active: "Actif"
         activePlaytime: "Temps Actif"
         activityIndex: "Indice d'Activité"
+        addJoinAddressGroup: "Ajouter un groupe d'adresses"
+        addressGroup: "Groupe d'adresses {{n}}"
         afk: "AFK"
         afkTime: "Temps AFK"
         all: "Tout"
         allTime: "Tout le Temps"
-        alphabetical: "Alphabetical"
+        allowed: "Autorisé"
-        apply: "Apply"
+        allowlist: "Liste d'autorisés"
+        allowlistBounces: "Rebonds de la liste d'autorisés"
+        alphabetical: "Alphabétique"
+        apply: "Appliquer"
         asNumbers: "en Chiffres"
-        average: "Average first session length"
+        attempts: "Tentatives"
+        average: "Durée moyenne de la première session"
         averageActivePlaytime: "Temps Actif moyen"
         averageAfkTime: "Temps AFK moyen"
         averageChunks: "Quantité moyenne de Chunks"
-        averageCpuUsage: "Average CPU Usage"
+        averageCpuUsage: "Utilisation moyenne du CPU"
         averageEntities: "Quantité moyenne d'Entités"
         averageKdr: "Ratio - Kills / Morts - moyen"
         averageMobKdr: "Ratio - Kills / Morts - de Mobs moyen"
         averagePing: "Latence moyenne"
-        averagePlayers: "Average Players"
+        averagePlayers: "Moyenne des joueurs"
         averagePlaytime: "Temps de Jeu moyen"
-        averageRamUsage: "Average RAM Usage"
+        averageRamUsage: "Utilisation moyenne de la RAM"
-        averageServerDowntime: "Average Downtime / Server"
+        averageServerDowntime: "Temps d'arrêt moyen par serveur"
         averageSessionLength: "Durée moyenne d'une Session"
         averageSessions: "Quantité moyenne de Sessions"
         averageTps: "TPS moyen"
-        averageTps7days: "Average TPS (7 days)"
+        averageTps7days: "TPS moyen (7 days)"
         banned: "Banni(e)"
         bestPeak: "Pic maximal de Joueurs en Ligne"
         bestPing: "Meilleure Latence"
+        blocked: "Bloqué"
         calendar: " Calendrier"
         comparing7days: "Comparaison des 7 derniers Jours"
         connectionInfo: "Renseignements sur la Connexion"
         country: "Pays"
         cpu: "CPU"
         cpuRam: "CPU & RAM"
-        cpuUsage: "CPU Usage"
+        cpuUsage: "Utilisation du CPU"
         currentPlayerbase: "Base de Joueurs actuelle"
-        currentUptime: "Current Uptime"
+        currentUptime: "Période d'activité actuelle"
-        currentlyInstalledPlugins: "Currently Installed Plugins"
+        currentlyInstalledPlugins: "Plugins actuellement installés"
         dayByDay: "Jour par Jour"
         dayOfweek: "Jour de la Semaine"
         deadliestWeapon: "1ère Arme de Combat (la plus mortelle)"
         deaths: "Morts"
         disk: "Espace Disque"
         diskSpace: "Espace Disque disponible"
-        docs: "Swagger Docs"
+        docs: "Docs Swagger"
         downtime: "Temps Hors-Ligne"
         duringLowTps: "Pendant les pics de TPS bas :"
         entities: "Entités"
-        errors: "Plan Error Logs"
+        errors: "Journaux d'erreurs de Plan"
-        export: "Export"
+        export: "Exportation"
-        exported: "Data export time"
+        exported: "Temps d'exportation des données"
         favoriteServer: "Serveur Favori"
         firstSession: "Première session"
         firstSessionLength:
-            average: "Average first session length"
+            average: "Durée moyenne de la première session"
-            median: "Median first session length"
+            median: "Durée médiane de la première session"
         geoProjection:
-            dropdown: "Select projection"
+            dropdown: "Sélectionner la projection"
             equalEarth: "Equal Earth"
             mercator: "Mercator"
             miller: "Miller"
-            ortographic: "Ortographic"
+            ortographic: "Ortographique"
         geolocations: "Géolocalisation"
-        groupPermissions: "Manage Groups"
+        groupPermissions: "Gérer les groupes"
-        groupUsers: "Manage Group Users"
+        groupUsers: "Gérer les utilisateurs d'un groupe"
         help:
-            activityIndexBasis: "Activity index is based on non-AFK playtime in the past 3 weeks (21 days). Each week is considered separately."
+            activityIndexBasis: "L'indice d'activité est basé sur le temps de jeu non-AFK au cours des 3 dernières semaines (21 jours). Chaque semaine est considérée séparément."
-            activityIndexExample1: "If someone plays as much as threshold every week, they are given activity index ~3."
+            activityIndexExample1: "Si une personne joue autant que le seuil fixé chaque semaine, elle se voit attribuer un indice d'activité de ~3."
-            activityIndexExample2: "Very active is ~2x the threshold (y ≥ 3.75)."
+            activityIndexExample2: "Très actif est ~2x le seuil (y ≥ 3,75)."
-            activityIndexExample3: "The index approaches 5 indefinitely."
+            activityIndexExample3: "L'indice se rapproche indéfiniment de 5."
-            activityIndexVisual: "Here is a visualization of the curve where y = activity index, and x = playtime per week / threshold."
+            activityIndexVisual: "Voici une visualisation de la courbe où y = indice d'activité, et x = temps de jeu par semaine / seuil."
-            activityIndexWeek: "Week {}"
+            activityIndexWeek: "Semaine {}"
-            examples: "Examples"
+            examples: "Exemples"
             graph:
-                labels: "You can hide/show a group by clicking on the label at the bottom."
+                labels: "Vous pouvez masquer/afficher un groupe en cliquant sur l'étiquette en bas de page."
-                title: "Graph"
+                title: "Graphique"
-                zoom: "You can Zoom in by click + dragging on the graph."
+                zoom: "Vous pouvez zoomer en cliquant sur le graphique et en le faisant glisser."
             manage:
                 groups:
-                    line-1: "This view allows you to modify web group permissions."
+                    line-1: "Cette vue vous permet de modifier les autorisations des groupes web."
-                    line-10: "<1>{{permission}}</> permissions determine what parts of the page are visible. These permissions also limit requests to the related data endpoints."
+                    line-10: "<1>{{permission}}</> déterminent quelles parties de la page sont visibles. Ces autorisations limitent également les requêtes vers les points d'accès aux données connexes."
-                    line-11: "<1>{{permission1}}</1> permissions are not required for data: <2>{{permission2}}</2> allows request to /v1/network/overview even without <3>{{permission3}}</3>."
+                    line-11: "<1>{{permission1}}</1> ne sont pas nécessaires pour les données: <2>{{permission2}}</2> permet de faire une requête à /v1/network/overview même sans <3>{{permission3}}</3>."
-                    line-12: "Saving changes"
+                    line-12: "Sauvegarder les modifications"
-                    line-13: "When you add a group or delete a group that action is saved immediately after confirm (no undo)."
+                    line-13: "Lorsque vous ajoutez ou supprimez un groupe, l'action est sauvegardée immédiatement après confirmation (pas d'annulation)."
-                    line-14: "When you modify permissions those changes need to be saved by pressing the Save-button"
+                    line-14: "Lorsque vous modifiez les autorisations, ces changements doivent être enregistrés en cliquant sur le bouton Enregistrer."
-                    line-15: "Documentation can be found from <1>{{link}}</1>"
+                    line-15: "La documentation est disponible à l'adresse suivante <1>{{link}}</1>"
-                    line-2: "User's web group is determined during <1>{{command}}</1> by checking if Player has <2>{{permission}}</2> permission."
+                    line-2: "Le groupe web de l'utilisateur est déterminé pendant <1>{{command}}</1> en vérifiant si le joueur a la permission <2>{{permission}}</2>."
-                    line-3: "You can use <1>{{command}}</1> to change permission group after registering."
+                    line-3: "Vous pouvez utiliser <1>{{command}}</1> pour changer de groupe d'autorisation après l'enregistrement."
-                    line-4: "<1>{{icon}}</1> If you ever accidentally delete all groups with <2>{{permission}}</2> permission just <3>{{command}}</3>."
+                    line-4: "<1>{{icon}}</1> Si vous supprimez accidentellement tous les groupes avec la permission <2>{{permission}}</2> utilisez juste <3>{{command}}</3>."
-                    line-5: "Permission inheritance"
+                    line-5: "Héritage de permissions"
-                    line-6: "Permissions follow inheritance model, where higher level permission grants all lower ones, eg. <1>{{permission1}}</1> also gives <2>{{permission2}}</2>, etc."
+                    line-6: "Les autorisations suivent le modèle de l'héritage, où l'autorisation de niveau supérieur accorde toutes les autorisations de niveau inférieur, par exemple. <1>{{permission1}}</1> donne également <2>{{permission2}}</2>, etc."
-                    line-7: "Access vs Page -permissions"
+                    line-7: "Accès vs. Permissions d'accès aux pages"
-                    line-8: "You need to assign both access and page permissions for users."
+                    line-8: "Vous devez attribuer des droits d'accès et des droits de page aux utilisateurs."
-                    line-9: "<1>{{permission1}}</1> permissions allow user make the request to specific address, eg. <2>{{permission2}}</2> allows request to /network."
+                    line-9: "<1>{{permission1}}</1> les autorisations permettent à l'utilisateur d'adresser une demande à une adresse spécifique, par exemple. <2>{{permission2}}</2> permet de faire une requête à /network."
-            playtimeUnit: "hours"
+            playtimeUnit: "heures"
             retention:
-                calculationStep1: "First the data is filtered using '<>' option. Any players with 'registerDate' outside the time range are ignored."
+                calculationStep1: "Les données sont d'abord filtrées à l'aide de l'option '<>'. Tous les joueurs avec 'registerDate' en dehors de l'intervalle de temps sont ignorés."
-                calculationStep2: "Then it is grouped into groups of players using '<0>' option, eg. With '<1>': All players who registered in January 2023, February 2023, etc"
+                calculationStep2: "Il est ensuite réparti en groupes de joueurs à l'aide de l'option '<0>', par exemple. Avec '<1>': Tous les joueurs qui se sont inscrits en janvier 2023, février 2023, etc."
-                calculationStep3: "Then the '<0>' and '<1>' options select which visualization to render."
+                calculationStep3: "Les options '<0>' et '<1>' permettent ensuite de sélectionner la visualisation à restituer."
-                calculationStep4: "'<>' controls how many points the graph has, eg. 'Days' has one point per day."
+                calculationStep4: "'<>' détermine le nombre de points du graphique, par exemple 'Jours' correspond à un point par jour."
-                calculationStep5: "On each calculated point all players are checked for the condition."
+                calculationStep5: "A chaque point calculé, tous les joueurs sont contrôlés pour la condition."
-                calculationStep6: "Select X Axis below to see conditions."
+                calculationStep6: "Sélectionnez l'axe X ci-dessous pour voir les conditions."
-                calculationStepDate: "This visualization shows the different groups of players that are still playing on your server. The visualization uses lastSeen date. If x < lastSeenDate, the player is visible on the graph."
+                calculationStepDate: "Cette visualisation montre les différents groupes de joueurs qui jouent encore sur votre serveur. La visualisation utilise la date lastSeen. Si x < lastSeenDate, le joueur est visible sur le graphique."
-                calculationStepDeltas: "This visualization is most effective using Player Count as the Y Axis. The visualization shows net gain of players (How many players joined minus players who stopped playing). The visualization uses both registered and lastSeen dates. If registerDate < x < lastSeenDate, the player is visible on the graph."
+                calculationStepDeltas: "Cette visualisation est plus efficace si l'on utilise le nombre de joueurs comme axe des ordonnées. La visualisation montre le gain net de joueurs (combien de joueurs se sont inscrits moins les joueurs qui ont arrêté de jouer). La visualisation utilise les dates d'inscription et de dernière visite. Si registerDate < x < lastSeenDate, le joueur est visible sur le graphique."
-                calculationStepPlaytime: "This visualization tells how long the gameplay loop keeps players engaged on your server. The visualization uses playtime. If x < playtime, the player is visible on the graph."
+                calculationStepPlaytime: "Cette visualisation indique combien de temps la boucle de gameplay maintient l'attention des joueurs sur votre serveur. La visualisation utilise le temps de jeu. Si x < temps de jeu, le joueur est visible sur le graphique."
-                calculationStepTime: "This visualization tells how long people keep coming back to play on the server after they join the first time. The visualization uses timeDifference. If x < timeDifference, the player is visible on the graph."
+                calculationStepTime: "Cette visualisation indique combien de temps les gens reviennent jouer sur le serveur après leur première inscription. La visualisation utilise timeDifference. Si x < timeDifference, le joueur est visible sur le graphique."
-                compareJoinAddress: "Grouping by join address allows measuring advertising campaigns on different sites."
+                compareJoinAddress: "Le regroupement par adresse de jointure permet de mesurer les campagnes publicitaires sur différents sites."
-                compareMonths: "You can compare different months by changing the '<0>' option to '<1>'"
+                compareMonths: "Vous pouvez comparer plusieurs mois en remplaçant l'option '<0>' par '<1>'"
                 examples:
-                    adCampaign: "Comparing player gain of different ad campaigns using different Join Addresses (anonymized)"
+                    adCampaign: "Comparaison des gains de joueurs de différentes campagnes publicitaires utilisant différentes adresses de jointure (anonymisées)"
-                    deltas: "<> shows net gain of players."
+                    deltas: "<> indique le gain net de joueurs."
-                    pattern: "A general pattern emerges when all players start leaving the server at the same time"
+                    pattern: "Un schéma général se dessine lorsque tous les joueurs commencent à quitter le serveur en même temps"
-                    plateau: "Comparing player gain of different months. Plateaus suggest there were players Plan doesn't know about. In this example Plan was installed in January 2022."
+                    plateau: "Comparaison des gains de joueurs au cours des différents mois. Les plateaux suggèrent qu'il y a des joueurs dont Plan n'a pas connaissance. Dans cet exemple, Plan a été installé en janvier 2022."
-                    playtime: "Playtime tells how long the gameplay loop keeps players engaged on your server."
+                    playtime: "Le temps de jeu indique combien de temps la boucle de gameplay maintient l'attention des joueurs sur votre serveur."
-                    stack: "Cumulative player gain can be checked with stacked player count as Y axis"
+                    stack: "Le gain cumulatif de joueurs peut être vérifié en utilisant le nombre de joueurs empilés comme axe Y."
-                howIsItCalculated: "How it is calculated"
+                howIsItCalculated: "Mode de calcul"
-                howIsItCalculatedData: "The graph is generated from player data:"
+                howIsItCalculatedData: "Le graphique est généré à partir des données des joueurs:"
-                options: "Select the options to analyze different aspects of Player Retention."
+                options: "Sélectionnez les options pour analyser les différents aspects de la fidélisation des joueurs."
-            retentionBasis: "New player retention is calculated based on session data. If a registered player has played within latter half of the timespan, they are considered retained."
+            retentionBasis: "La fidélisation des nouveaux joueurs est calculée sur la base des données de session. Si un joueur enregistré a joué dans la seconde moitié de la période, il est considéré comme fidélisé."
-            testPrompt: "Test it out:"
+            testPrompt: "Testez-le:"
-            testResult: "Test result"
+            testResult: "Résultat du test"
-            threshold: "Threshold"
+            threshold: "Seuil"
-            thresholdUnit: "hours / week"
+            thresholdUnit: "heures / semaine"
-            tips: "Tips"
+            tips: "Conseils"
-            usingTheGraph: "Using the Graph"
+            usingTheGraph: "Utilisation du graphique"
         hourByHour: "Heure par Heure"
         inactive: "Inactif(ve)"
         indexInactive: "Inactif"
         indexRegular: "Régulier"
         information: "INFORMATIONS"
-        insights: "Insights"
+        insights: "Perspectives"
         insights30days: "Perspectives sur 30 jours"
-        installed: "Installed"
+        installed: "Installé"
         irregular: "Irrégulier"
-        joinAddress: "Join Address"
+        joinAddress: "Adresse de Connexion"
         joinAddresses: "Adresses de Connexion"
         kdr: "KDR"
         killed: "Tué(e)"
         last24hours: "24 Dernières heures"
         last30days: "30 Derniers jours"
         last7days: "7 Derniers jours"
-        lastConnected: "Dernier Connecté"
+        lastAllowed: "Dernier autorisé"
+        lastBlocked: "Dernier bloqué"
+        lastConnected: "Dernier connecté"
+        lastKnownAttempt: "Dernière tentative connue"
         lastPeak: "Dernier pic de Joueurs en Ligne"
         lastSeen: "Dernière Connexion"
-        latestJoinAddresses: "Latest Join Addresses"
+        latestJoinAddresses: "Dernières adresses d'adhésion"
         length: " Longueur"
         links: "LIENS"
         loadedChunks: "Chunks Chargés"
@@ -442,53 +452,53 @@ html:
         loneNewbieJoins: "Connexions de Débutants Seuls"
         longestSession: "Session la plus Longue"
         lowTpsSpikes: "Pics de TPS bas"
-        lowTpsSpikes7days: "Low TPS Spikes (7 days)"
+        lowTpsSpikes7days: "Pics de TPS bas (7 jours)"
-        manage: "Manage"
+        manage: "Gérer"
         managePage:
             addGroup:
-                header: "Add group"
+                header: "Ajouter un groupe"
-                invalidName: "Group name can be 100 characters maximum."
+                invalidName: "Le nom du groupe peut comporter 100 caractères au maximum."
-                name: "Name of the group"
+                name: "Nom du groupe"
             alert:
-                groupAddFail: "Failed to add group: {{error}}"
+                groupAddFail: "Échec de l'ajout d'un groupe: {{error}}"
-                groupAddSuccess: "Added group '{{groupName}}'"
+                groupAddSuccess: "Groupe ajouté '{{groupName}}'"
-                groupDeleteFail: "Failed to delete group: {{error}}"
+                groupDeleteFail: "Échec de la suppression du groupe: {{error}}"
-                groupDeleteSuccess: "Deleted group '{{groupName}}'"
+                groupDeleteSuccess: "Groupe supprimé '{{groupName}}'"
-                saveFail: "Failed to save changes: {{error}}"
+                saveFail: "Échec de l'enregistrement des modifications: {{error}}"
-                saveSuccess: "Changes saved successfully!"
+                saveSuccess: "Les modifications ont été enregistrées avec succès!"
             changes:
-                discard: "Discard Changes"
+                discard: "Rejeter les modifications"
-                save: "Save"
+                save: "Sauvegarder"
-                unsaved: "Unsaved changes"
+                unsaved: "Modifications non sauvegardées"
             deleteGroup:
-                confirm: "Confirm & Delete {{groupName}}"
+                confirm: "Confirmer et supprimer {{groupName}}"
-                confirmDescription: "This will move all users of '{{groupName}}' to group '{{moveTo}}'. There is no undo!"
+                confirmDescription: "Cette action déplacera tous les utilisateurs de '{{nomdugroupe}}' vers le groupe '{{moveTo}}'. Il n'y a pas d'annulation possible !"
-                header: "Delete '{{groupName}}'"
+                header: "Supprimer '{{groupName}}'"
-                moveToSelect: "Move remaining users to group"
+                moveToSelect: "Déplacer les utilisateurs restants vers le groupe"
-            groupHeader: "Manage Group Permissions"
+            groupHeader: "Gérer les permissions du groupe"
-            groupPermissions: "Permissions of {{groupName}}"
+            groupPermissions: "Permissions de {{groupName}}"
         maxFreeDisk: "Espace Disque MAX disponible"
-        medianSessionLength: "Median Session Length"
+        medianSessionLength: "Durée médiane de la session"
         minFreeDisk: "Espace Disque MIN disponible"
         mobDeaths: "Morts causées par un Mob"
         mobKdr: "Ratio - Kills / Morts de Mobs -"
-        mobKills: "Kills de Mobs"
+        mobKills: "Mobs Tués"
-        modified: "Modified"
+        modified: "Modifié"
         mostActiveGamemode: "Mode de Jeu le plus utilisé"
         mostPlayedWorld: "Monde le plus Fréquenté"
         name: "Nom"
         network: "Réseau"
         networkAsNumbers: "Réseau en Chiffres"
-        networkCalendar: "Network Calendar"
+        networkCalendar: "Calendrier du réseau"
         networkOnlineActivity: "Activité en Ligne du Réseau"
         networkOverview: "Aperçu du Réseau"
         networkPage: "Page du Réseau"
         new: "Nouveau(elle)"
         newPlayerRetention: "Rétention des nouveaux Joueurs"
         newPlayers: "Nouveaux Joueurs"
-        newPlayers7days: "New Players (7 days)"
+        newPlayers7days: "Nouveaux joueurs (7 jours)"
         nickname: "Surnom"
-        noDataToDisplay: "No Data to Display"
+        noDataToDisplay: "Pas de données à afficher"
         now: "Maintenant"
         onlineActivity: "Activité en ligne"
         onlineActivityAsNumbers: "Activité en ligne en Chiffres"
@@ -504,23 +514,23 @@ html:
         player: "Joueur"
         playerDeaths: "Décès causés par le Joueur"
         playerKills: "Kills de Joueurs"
-        playerKillsVictimIndicator: "Player was killed within 24h of first time they were seen (Time since registered: <>)."
+        playerKillsVictimIndicator: "Le joueur a été tué dans les 24 heures suivant sa première apparition (Temps écoulé depuis l'enregistrement : <>)."
         playerList: "Liste des Joueurs"
         playerOverview: "Aperçu des Joueurs"
         playerPage: "Page du Joueur"
-        playerRetention: "Player Retention"
+        playerRetention: "Fidélisation des joueurs"
         playerbase: "Base de Joueurs"
         playerbaseDevelopment: "Évolution de la base de Joueurs"
-        playerbaseOverview: "Playerbase Overview"
+        playerbaseOverview: "Aperçu de la base de joueurs"
         players: "Joueurs"
         playersOnline: "Joueurs en Ligne"
-        playersOnlineNow: "Players Online (Now)"
+        playersOnlineNow: "Joueurs en ligne (maintenant)"
         playersOnlineOverview: "Aperçu de l'Activité en Ligne"
         playtime: "Temps de Jeu"
-        pluginHistory: "Plugin History"
+        pluginHistory: "Historique des plugins"
-        pluginVersionHistory: "Plugin Version History"
+        pluginVersionHistory: "Historique de la version du plugin"
         plugins: "Plugins"
-        pluginsOverview: "Plugins Overview"
+        pluginsOverview: "Aperçu des plugins"
         punchcard: "Carte Perforée"
         punchcard30days: "Carte perforée sur 30 jours"
         pvpPve: "PvP & PvE"
@@ -539,19 +549,19 @@ html:
         regularPlayers: "Joueurs Réguliers"
         relativeJoinActivity: "Activité de Connexion relative"
         retention:
-            groupByNone: "No grouping"
+            groupByNone: "Pas de regroupement"
-            groupByTime: "Group registered by"
+            groupByTime: "Groupe enregistré par"
-            inAnytime: "any time"
+            inAnytime: "à tout moment"
-            inLast180d: "in the last 6 months"
+            inLast180d: "au cours des 6 derniers mois"
-            inLast30d: "in the last 30 days"
+            inLast30d: "au cours des 30 derniers jours"
-            inLast365d: "in the last 12 months"
+            inLast365d: "au cours des 12 derniers mois"
-            inLast730d: "in the last 24 months"
+            inLast730d: "au cours des 24 derniers mois"
-            inLast7d: "in the last 7 days"
+            inLast7d: "au cours des 7 derniers jours"
-            inLast90d: "in the last 3 months"
+            inLast90d: "au cours des 3 derniers mois"
-            playersRegisteredInTime: "Players who registered"
+            playersRegisteredInTime: "Joueurs inscrits"
-            retainedPlayersPercentage: "Retained Players %"
+            retainedPlayersPercentage: "Joueurs retenus %"
-            timeSinceRegistered: "Time since register date"
+            timeSinceRegistered: "Temps écoulé depuis la date d'enregistrement"
-            timeStep: "Time step"
+            timeStep: "Pas de temps"
         secondDeadliestWeapon: "2ᵉ Arme de Combat"
         seenNicknames: "Surnoms vus"
         server: "Serveur"
@@ -574,26 +584,26 @@ html:
         sessionMedian: "Session Médiane"
         sessionStart: "Début de la Session"
         sessions: "Sessions"
-        sortBy: "Sort By"
+        sortBy: "Trier par"
-        stacked: "Stacked"
+        stacked: "Empilés"
         table:
-            showNofM: "Showing {{n}} of {{m}} entries"
+            showNofM: "Afficher {{n}} de {{m}} entrées"
-            showPerPage: "Show per page"
+            showPerPage: "Afficher par page"
-            visibleColumns: "Visible columns"
+            visibleColumns: "Colonnes visibles"
         themeSelect: "Sélection du Thème"
         thirdDeadliestWeapon: "3ᵉ Arme de Combat"
         thirtyDays: "30 jours"
         thirtyDaysAgo: "Il y a 30 jours"
         time:
             date: "Date"
-            day: "Day"
+            day: "Jour"
-            days: "Days"
+            days: "Jours"
-            hours: "Hours"
+            hours: "Heures"
-            month: "Month"
+            month: "Mois"
-            months: "Months"
+            months: "Mois"
-            week: "Week"
+            week: "Semaine"
-            weeks: "Weeks"
+            weeks: "Seamines"
-            year: "Year"
+            year: "Année"
         timesKicked: "Nombre d'Éjections"
         toMainPage: "Retour à la page principale"
         total: "Total"
@@ -602,17 +612,17 @@ html:
         totalPlayers: "Joueurs Totaux"
         totalPlayersOld: "Joueurs Totaux"
         totalPlaytime: "Temps de Jeu Total"
-        totalServerDowntime: "Total Server Downtime"
+        totalServerDowntime: "Temps d'arrêt total du serveur"
         tps: "TPS"
         trend: "Tendances"
         trends30days: "Tendances sur 30 Jours"
-        uninstalled: "Uninstalled"
+        uninstalled: "Désinstallé"
         uniquePlayers: "Joueurs Uniques"
-        uniquePlayers7days: "Unique Players (7 days)"
+        uniquePlayers7days: "Joueurs uniques (7 jours)"
         unit:
-            percentage: "Percentage"
+            percentage: "Pourcentage"
-            playerCount: "Player Count"
+            playerCount: "Nombre de joueurs"
-        users: "Manage Users"
+        users: "Gérer les utilisateurs"
         version: "Version"
         veryActive: "Très Actif"
         weekComparison: "Comparaison Hebdomadaire"
@@ -637,89 +647,88 @@ html:
     manage:
         permission:
             description:
-                access: "Controls access to pages"
+                access: "Contrôle de l'accès aux pages"
-                access_docs: "Allows accessing /docs page"
+                access_docs: "Permet d'accéder à la page /docs"
-                access_errors: "Allows accessing /errors page"
+                access_errors: "Permet d'accéder à la page /erreurs"
-                access_network: "Allows accessing /network page"
+                access_network: "Permet d'accéder à la page /réseau"
-                access_player: "Allows accessing any /player pages"
+                access_player: "Permet d'accéder à toutes les pages /player"
-                access_player_self: "Allows accessing own /player page"
+                access_player_self: "Permet d'accéder à sa propre page /joueur"
-                access_players: "Allows accessing /players page"
+                access_players: "Permet d'accéder à la page /joueurs"
-                access_query: "Allows accessing /query and Query results pages"
+                access_query: "Permet d'accéder aux pages /query et Query results"
-                access_raw_player_data: "Allows accessing /player/{uuid}/raw json data. Follows 'access.player' permissions."
+                access_raw_player_data: "Permet d'accéder aux données json brutes de /player/{uuid}. Suit les permissions 'access.player'."
-                access_server: "Allows accessing all /server pages"
+                access_server: "Permet d'accéder à toutes les pages /server"
-                manage_groups: "Allows modifying group permissions & Access to /manage/groups page"
+                manage_groups: "Permet de modifier les permissions des groupes et d'accéder à la page /manage/groups"
-                manage_users: "Allows modifying what users belong to what group"
+                manage_users: "Permet de modifier quels utilisateurs appartiennent à quel groupe"
-                page: "Controls what is visible on pages"
+                page: "Contrôle ce qui est visible sur les pages"
-                page_network: "See all of network page"
+                page_network: "Voir toute la page du réseau"
-                page_network_geolocations: "See Geolocations tab"
+                page_network_geolocations: "Voir l'onglet Géolocalisations"
-                page_network_geolocations_map: "See Geolocations Map"
+                page_network_geolocations_map: "Voir la carte des géolocalisations"
-                page_network_geolocations_ping_per_country: "See Ping Per Country table"
+                page_network_geolocations_ping_per_country: "Voir le tableau Ping par pays"
-                page_network_join_addresses: "See Join Addresses -tab"
+                page_network_join_addresses: "Voir les adresses de jointure -tab"
-                page_network_join_addresses_graphs: "See Join Address graphs"
+                page_network_join_addresses_graphs: "Voir les graphiques des adresses de connexion"
-                page_network_join_addresses_graphs_pie: "See Latest Join Addresses graph"
+                page_network_join_addresses_graphs_time: "Voir le graphique des adresses de connexion dans le temps"
-                page_network_join_addresses_graphs_time: "See Join Addresses over time graph"
+                page_network_overview: "Voir Aperçu du réseau -tab"
-                page_network_overview: "See Network Overview -tab"
+                page_network_overview_graphs: "Voir les graphiques de l'aperçu du réseau"
-                page_network_overview_graphs: "See Network Overview graphs"
+                page_network_overview_graphs_calendar: "Voir le calendrier du réseau"
-                page_network_overview_graphs_calendar: "See Network calendar"
+                page_network_overview_graphs_day_by_day: "Voir le graphique jour par jour"
-                page_network_overview_graphs_day_by_day: "See Day by Day graph"
+                page_network_overview_graphs_hour_by_hour: "Voir le graphique heure par heure"
-                page_network_overview_graphs_hour_by_hour: "See Hour by Hour graph"
+                page_network_overview_graphs_online: "Voir le graphique des joueurs en ligne"
-                page_network_overview_graphs_online: "See Players Online graph"
+                page_network_overview_numbers: "Voir les numéros de l'aperçu du réseau"
-                page_network_overview_numbers: "See Network Overview numbers"
+                page_network_performance: "Voir l'onglet Performances du réseau"
-                page_network_performance: "See network Performance tab"
+                page_network_playerbase: "Voir l'onglet Aperçu de la base de joueurs"
-                page_network_playerbase: "See Playerbase Overview -tab"
+                page_network_playerbase_graphs: "Voir les graphiques de la base de joueurs"
-                page_network_playerbase_graphs: "See Playerbase Overview graphs"
+                page_network_playerbase_overview: "Voir les chiffres de l'aperçu de la base de joueurs"
-                page_network_playerbase_overview: "See Playerbase Overview numbers"
+                page_network_players: "Voir la liste des lecteurs -tab"
-                page_network_players: "See Player list -tab"
+                page_network_plugin_history: "Voir l'historique des plugins sur le réseau"
-                page_network_plugin_history: "See Plugin History across the network"
+                page_network_plugins: "Voir l'onglet Plugins de Proxy"
-                page_network_plugins: "See Plugins tab of Proxy"
+                page_network_retention: "Voir l'onglet Rétention des joueurs"
-                page_network_retention: "See Player Retention -tab"
+                page_network_server_list: "Voir la liste des serveurs"
-                page_network_server_list: "See list of servers"
+                page_network_sessions: "Voir l'onglet Sessions"
-                page_network_sessions: "See Sessions tab"
+                page_network_sessions_list: "Voir la liste des sessions"
-                page_network_sessions_list: "See list of sessions"
+                page_network_sessions_overview: "Voir les perspectives de la session"
-                page_network_sessions_overview: "See Session insights"
+                page_network_sessions_server_pie: "Voir le graphique à secteurs du serveur"
-                page_network_sessions_server_pie: "See Server Pie graph"
+                page_network_sessions_world_pie: "Voir le graphique de la carte du monde"
-                page_network_sessions_world_pie: "See World Pie graph"
+                page_player: "Voir toute la page du joueur"
-                page_player: "See all of player page"
+                page_player_overview: "Voir l'aperçu des joueurs -tab"
-                page_player_overview: "See Player Overview -tab"
+                page_player_plugins: "Voir les plugins -tabs"
-                page_player_plugins: "See Plugins -tabs"
+                page_player_servers: "Voir les serveurs -tab"
-                page_player_servers: "See Servers -tab"
+                page_player_sessions: "Voir les sessions des joueurs -tab"
-                page_player_sessions: "See Player Sessions -tab"
+                page_player_versus: "Voir PvP & PvE -tab"
-                page_player_versus: "See PvP & PvE -tab"
+                page_server: "Voir toute la page du serveur"
-                page_server: "See all of server page"
+                page_server_allowlist_bounce: "Voir la liste des rebonds de Game allowlist"
-                page_server_geolocations: "See Geolocations tab"
+                page_server_geolocations: "Voir l'onglet Géolocalisations"
-                page_server_geolocations_map: "See Geolocations Map"
+                page_server_geolocations_map: "Voir la carte des géolocalisations"
-                page_server_geolocations_ping_per_country: "See Ping Per Country table"
+                page_server_geolocations_ping_per_country: "Voir le tableau Ping par pays"
-                page_server_join_addresses: "See Join Addresses -tab"
+                page_server_join_addresses: "Voir les adresses de jointure -tab"
-                page_server_join_addresses_graphs: "See Join Address graphs"
+                page_server_join_addresses_graphs: "Voir les graphiques des adresses de connexion"
-                page_server_join_addresses_graphs_pie: "See Latest Join Addresses graph"
+                page_server_join_addresses_graphs_time: "Voir le graphique des adresses de connexion dans le temps"
-                page_server_join_addresses_graphs_time: "See Join Addresses over time graph"
+                page_server_online_activity: "Voir l'activité en ligne -tab"
-                page_server_online_activity: "See Online Activity -tab"
+                page_server_online_activity_graphs: "Voir les graphiques de l'activité en ligne"
-                page_server_online_activity_graphs: "See Online Activity graphs"
+                page_server_online_activity_graphs_calendar: "Voir Calendrier des serveurs"
-                page_server_online_activity_graphs_calendar: "See Server calendar"
+                page_server_online_activity_graphs_day_by_day: "Voir le graphique jour par jour"
-                page_server_online_activity_graphs_day_by_day: "See Day by Day graph"
+                page_server_online_activity_graphs_hour_by_hour: "Voir le graphique heure par heure"
-                page_server_online_activity_graphs_hour_by_hour: "See Hour by Hour graph"
+                page_server_online_activity_graphs_punchcard: "Voir graphique Punchcard"
-                page_server_online_activity_graphs_punchcard: "See Punchcard graph"
+                page_server_online_activity_overview: "Voir les numéros d'activité en ligne"
-                page_server_online_activity_overview: "See Online Activity numbers"
+                page_server_overview: "Voir l'aperçu du serveur -tab"
-                page_server_overview: "See Server Overview -tab"
+                page_server_overview_numbers: "Voir les numéros de la vue d'ensemble du serveur"
-                page_server_overview_numbers: "See Server Overview numbers"
+                page_server_overview_players_online_graph: "Voir le graphique des joueurs en ligne"
-                page_server_overview_players_online_graph: "See Players Online graph"
+                page_server_performance: "Voir l'onglet Performance"
-                page_server_performance: "See Performance tab"
+                page_server_performance_graphs: "Voir les graphiques de performance"
-                page_server_performance_graphs: "See Performance graphs"
+                page_server_performance_overview: "Voir les chiffres de performance"
-                page_server_performance_overview: "See Performance numbers"
+                page_server_player_versus: "Voir PvP & PvE -tab"
-                page_server_player_versus: "See PvP & PvE -tab"
+                page_server_player_versus_kill_list: "Voir Liste des joueurs tués ou morts"
-                page_server_player_versus_kill_list: "See Player kill and death lists"
+                page_server_player_versus_overview: "Voir les chiffres de PvP & PvE"
-                page_server_player_versus_overview: "See PvP & PvE numbers"
+                page_server_playerbase: "Voir l'aperçu de la base de joueurs -tab"
-                page_server_playerbase: "See Playerbase Overview -tab"
+                page_server_playerbase_graphs: "Voir les graphiques de la base de joueurs"
-                page_server_playerbase_graphs: "See Playerbase Overview graphs"
+                page_server_playerbase_overview: "Voir les chiffres de l'aperçu de la base de joueurs"
-                page_server_playerbase_overview: "See Playerbase Overview numbers"
+                page_server_players: "Voir la liste des joueurs -tab"
-                page_server_players: "See Player list -tab"
+                page_server_plugin_history: "Voir l'historique du plugin"
-                page_server_plugin_history: "See Plugin History"
+                page_server_plugins: "Voir les onglets Plugins des serveurs"
-                page_server_plugins: "See Plugins -tabs of servers"
+                page_server_retention: "Voir l'onglet Rétention des joueurs"
-                page_server_retention: "See Player Retention -tab"
+                page_server_sessions: "Voir l'onglet Sessions"
-                page_server_sessions: "See Sessions tab"
+                page_server_sessions_list: "Voir la liste des sessions"
-                page_server_sessions_list: "See list of sessions"
+                page_server_sessions_overview: "Voir les perspectives de la session"
-                page_server_sessions_overview: "See Session insights"
+                page_server_sessions_world_pie: "Voir le graphique de la carte du monde"
-                page_server_sessions_world_pie: "See World Pie graph"
     modal:
         info:
             bugs: "Rapport de bugs"
@@ -750,17 +759,17 @@ html:
                 name: "Statut de Bannissement"
             banned: "Banni(e)"
             country:
-                text: "have joined from country"
+                text: "a rejoint à partir du pays"
             generic:
                 allPlayers: "Tous les Joueurs"
                 and: "et"
                 start: "des Joueurs qui"
             hasPlayedOnServers:
-                name: "Has played on one of servers"
+                name: "A joué sur l'un des serveurs"
-                text: "have played on at least one of"
+                text: "A joué sur au moins un de"
             hasPluginBooleanValue:
-                name: "Has plugin boolean value"
+                name: "A la valeur booléenne du plugin"
-                text: "have Plugin boolean value"
+                text: "avoir une valeur booléenne de plugin"
             joinAddress:
                 text: "ont rejoint avec l'adresse"
             nonOperators: "Non Opérateur(trice)"
@@ -775,24 +784,25 @@ html:
                 text: "sont dans le groupe {group} de ${plugin}"
             registeredBetween:
                 text: "Enregistrés entre"
-            skipped: "Skipped"
+            skipped: "Sautée"
             title:
                 activityGroup: "Groupe d'Activité actuel"
             view: "  Vue :"
         filters:
-            add: "Ajouter un filtre.."
+            add: "Ajouter un filtre."
-            loading: "Chargement des Filtres.."
+            loading: "Chargement des Filtres."
         generic:
             are: "`sont`"
         label:
+            editQuery: "Modifier la requête"
             from: ">de</label>"
             makeAnother: "Faire une autre Requête"
             servers:
-                all: "using data of all servers"
+                all: "en utilisant les données de tous les serveurs"
-                many: "using data of {number} servers"
+                many: "en utilisant les données de {nombre} serveurs"
-                single: "using data of 1 server"
+                single: "en utilisant les données d'un serveur"
-                two: "using data of 2 servers"
+                two: "en utilisant les données de 2 serveurs"
-            showFullQuery: "Show Full Query"
+            showFullQuery: "Afficher la requête complète"
             to: ">à</label>"
             view: "Visualiser une vue"
         performQuery: "Exécuter la Requête !"
@@ -812,7 +822,7 @@ html:
         completion3: "Utilisez la commande suivante en jeu pour terminer l'enregistrement :"
         completion4: "Ou en utilisant la console :"
         createNewUser: "Créer un nouvel utilisateur"
-        disabled: "Registering new users has been disabled in the config."
+        disabled: "L'enregistrement de nouveaux utilisateurs a été désactivé dans la configuration."
         error:
             checkFailed: "La vérification de l'état de l'enregistrement a échoué : "
             failed: "Enregistrement échoué : "
@@ -822,11 +832,11 @@ html:
         login: "Vous avez déjà un compte ? Connectez-vous !"
         passwordTip: "Le Mot de Passe devrait comporter plus de 8 caractères, mais il n'y a aucune limite."
         register: "Enregistrer"
-        success: "Registered a new user successfully! You can now login."
+        success: "Enregistrement réussi d'un nouvel utilisateur ! Vous pouvez maintenant vous connecter."
         usernameTip: "Le Nom d'Utilisateur peut comporter jusqu'à 50 caractères."
     text:
-        click: "Click for more"
+        click: "Cliquez ici pour en savoir plus"
-        clickAndDrag: "Click and Drag for more"
+        clickAndDrag: "Cliquer et faire glisser pour en savoir plus"
         clickToExpand: "Cliquez pour agrandir"
         comparing15days: "Comparaison des 15 derniers Jours"
         comparing30daysAgo: "Comparaison des 60 derniers Jours"
@@ -857,11 +867,11 @@ plugin:
         database: "Traitement des tâches critiques inachevées... (${0})"
         disabled: "Plan a été désactivé."
         processingComplete: "Traitement complété."
-        savingSessions: "Sauvegarde des sessions inachevées..."
+        savingSessions: "Sauvegarde des sessions inachevées."
         savingSessionsTimeout: "Timeout atteint - stockage des sessions non terminées lors du prochain démarrage."
-        waitingDb: "En attente de la finalisation des requêtes pour éviter que SQLite ne plante la JVM.."
+        waitingDb: "En attente de la finalisation des requêtes pour éviter que SQLite ne plante la JVM."
         waitingDbComplete: "Connexion SQLite fermée."
-        waitingTransactions: "En attente des transactions non terminées pour éviter la perte de données.."
+        waitingTransactions: "En attente des transactions non terminées pour éviter la perte de données."
         waitingTransactionsComplete: "File d'attente des transactions fermée."
         webserver: "Le serveur Web a été désactivé."
     enable:
@@ -878,9 +888,9 @@ plugin:
             emptyIP: "L'adresse IP située dans le fichier 'server.properties' est vide et l'option 'Alternative_IP' n'est pas utilisée. Attention, des liens incorrects seront donnés !"
             geoDisabled: "La Géolocalisation n'est pas active. (Data.Geolocations: false)"
             geoInternetRequired: "Plan nécessite un accès à Internet lors de sa première utilisation pour télécharger la base de données 'GeoLite2 Geolocation'."
-            proxyAddress: "Proxy server detected in the database - Proxy Webserver address is '${0}'."
+            proxyAddress: "Serveur proxy détecté dans la base de données - L'adresse du serveur web proxy est '${0}'."
-            proxyDisabledWebserver: "Disabling Webserver on this server - You can override this behavior by setting '${0}' to false."
+            proxyDisabledWebserver: "Désactivation du serveur web sur ce serveur - Vous pouvez ignorer ce comportement en réglant '${0}' sur false."
-            settingChange: "Note: Set '${0}' to ${1}"
+            settingChange: "Note : Réglez '${0}' sur ${1}."
             storeSessions: "Stockage des sessions ayant été préservées lors de l'arrêt précédent."
             webserverDisabled: "Le serveur Web n'a pas été initialisé. (WebServer.DisableWebServer: true)"
         webserver: "Le serveur Web communique à travers le port ${0} ( ${1} )."
@@ -891,16 +901,16 @@ plugin:
         dbNotifySQLiteWAL: "Le mode WAL de SQLite n'est pas pris en charge sur cette version du serveur, en utilisant le mode par défaut. Cela peut possiblement affecter les performances."
         dbPatchesAlreadyApplied: "Tous les correctifs pour la base de données ont déjà été appliqués."
         dbPatchesApplied: "Tous les correctifs pour la base de données ont été appliqués avec succès."
-        dbSchemaPatch: "Database: Making sure schema is up to date.."
+        dbSchemaPatch: "Base de données : S'assurer que le schéma est à jour."
-        loadedServerInfo: "Server identifier loaded: ${0}"
+        loadedServerInfo: "Identifiant de serveur chargé : ${0}"
-        loadingServerInfo: "Loading server identifying information"
+        loadingServerInfo: "Chargement des informations d'identification du serveur"
         no: "Non"
         today: "'Aujourd''hui'"
         unavailable: "Indisponible"
         unknown: "Inconnu"
         yes: "Oui"
         yesterday: "'Hier'"
-    localeReloaded: "Custom locale.yml was modified so it was reloaded and is now in use."
+    localeReloaded: "Le fichier locale.yml personnalisé a été modifié, il a donc été rechargé et est maintenant utilisé."
     version:
         checkFail: "Impossible de vérifier le dernier numéro de la version"
         checkFailGithub: "Les informations de la version n'ont pas pu être chargées depuis Github/versions.txt"
@@ -917,10 +927,10 @@ plugin:
         notify:
             authDisabledConfig: "Serveur Web : Authentification d'utilisateur désactivée ! (dans la configuration)"
             authDisabledNoHTTPS: "Serveur Web : Authentification utilisateur désactivée ! (Non sécurisée avec HTTP)"
-            certificateExpiresOn: "Webserver: Loaded certificate is valid until ${0}."
+            certificateExpiresOn: "Webserver: Le certificat chargé est valable jusqu'à ${0}."
-            certificateExpiresPassed: "Webserver: Certificate has expired, consider renewing the certificate."
+            certificateExpiresPassed: "Webserver: Le certificat a expiré, pensez à renouveler le certificat."
-            certificateExpiresSoon: "Webserver: Certificate expires in ${0}, consider renewing the certificate."
+            certificateExpiresSoon: "Webserver: Le certificat expire dans ${0}, pensez à renouveler le certificat."
-            certificateNoSuchAlias: "Webserver: Certificate with alias '${0}' was not found inside the keystore file '${1}'."
+            certificateNoSuchAlias: "Webserver: Le certificat avec l'alias '${0}' n'a pas été trouvé dans le fichier keystore '${1}'."
             http: "Serveur Web : Aucun certificat -> Utilisation du serveur HTTP pour la visualisation."
             ipWhitelist: "Serveur Web : La liste blanche d'adresses IP n'est pas activée."
             ipWhitelistBlock: "Serveur Web : ${0} n'a pas pu accéder à '${1}'. (pas sur la liste blanche)"