Update locale_CN.yml (#3616)

- Added Data_gathering.Preserve_invalid_join_addresses to allow overriding this behavior.

Affects issues:
- Fixed #3545

.github/workflows/ci.yml

@@ -23,30 +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'
-      - name: 🚦 Setup Selenium Webdriver
-        uses: nanasess/setup-chromedriver@v1
-      - name: 🚦 Setup Selenium Webdriver settings
-        run: |
-          export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-      - name: 📶 Verify MariaDB connection 
-        env:
-          PORT: ${{ job.services.mariadb.ports[3306] }}
-        run: |
-          while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
-            sleep 1
-          done
+          java-version: '21'
       - name: 💼 Load Gradle Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -68,15 +54,29 @@ 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
+      - name: 🚦 Setup Selenium Webdriver
+        uses: nanasess/setup-chromedriver@v2
+      - name: 🚦 Setup Selenium Webdriver settings
+        run: |
+          export DISPLAY=:99
+          chromedriver --url-base=/wd/hub &
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+      - name: 📶 Verify MariaDB connection 
+        env:
+          PORT: ${{ job.services.mariadb.ports[3306] }}
+        run: |
+          while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
+            sleep 1
+          done
       - name: 🩺 Test 
         env:
           MYSQL_DB: test

Plan/api/build.gradle

@@ -8,7 +8,7 @@ compileJava {
     options.release = 8
 }
 
-ext.apiVersion = '5.5-R0.1'
+ext.apiVersion = '5.6-R0.1'
 
 publishing {
     repositories {

Plan/api/src/main/java/com/djrapitops/plan/capability/Capability.java

@@ -90,7 +90,11 @@ enum Capability {
      * {@link com.djrapitops.plan.delivery.web.ResourceService#addJavascriptToResource(String, String, ResourceService.Position, String, String)}
      * {@link com.djrapitops.plan.delivery.web.ResourceService#addStyleToResource(String, String, ResourceService.Position, String, String)}
      */
-    PAGE_EXTENSION_RESOURCES_REGISTER_DIRECT_CUSTOMIZATION;
+    PAGE_EXTENSION_RESOURCES_REGISTER_DIRECT_CUSTOMIZATION,
+    /**
+     * {@link  com.djrapitops.plan.delivery.web.ResolverService#registerPermissions(String...)}
+     */
+    PAGE_EXTENSION_USER_PERMISSIONS;
 
     static Optional<Capability> getByName(String name) {
         if (name == null) {

Plan/api/src/main/java/com/djrapitops/plan/capability/CapabilityService.java

@@ -64,6 +64,9 @@ public interface CapabilityService {
         return Capability.getByName(capabilityName).isPresent();
     }
 
+    /**
+     * Singleton holder for listeners.
+     */
     class ListHolder {
         static final AtomicReference<List<Consumer<Boolean>>> enableListeners = new AtomicReference<>(
                 new CopyOnWriteArrayList<>()

Plan/api/src/main/java/com/djrapitops/plan/component/ComponentService.java

@@ -89,7 +89,7 @@ public interface ComponentService {
      * Converts the given input into a {@link Component}.
      * Input example {@code §ctext}.
      *
-     * @param legacy the input legacy
+     * @param legacy    the input legacy
      * @param character the character to use as the color prefix, usually {@code §}.
      * @return a {@link Component}
      * @see #fromLegacy(String)
@@ -115,7 +115,7 @@ public interface ComponentService {
      * Input example: {@code &#rrggbbtext}.
      *
      * @param adventureLegacy the input adventure legacy
-     * @param character the character to use as the color prefix, usually {@code &}.
+     * @param character       the character to use as the color prefix, usually {@code &}.
      * @return a {@link Component}
      * @see #fromAdventureLegacy(String)
      * @see Component#SECTION
@@ -139,7 +139,7 @@ public interface ComponentService {
      * Input example: {@code §x§r§r§g§g§b§btext}.
      *
      * @param bungeeLegacy the input bungee legacy
-     * @param character the character to use as the color prefix, usually {@code §}.
+     * @param character    the character to use as the color prefix, usually {@code §}.
      * @return a {@link Component}
      * @see Component#SECTION
      * @see Component#AMPERSAND
@@ -164,6 +164,9 @@ public interface ComponentService {
      */
     Component fromJson(String json);
 
+    /**
+     * Singleton holder for ComponentService.
+     */
     class Holder {
         static final AtomicReference<ComponentService> service = new AtomicReference<>();
 

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResolverService.java

@@ -17,9 +17,11 @@
 package com.djrapitops.plan.delivery.web;
 
 import com.djrapitops.plan.delivery.web.resolver.Resolver;
+import com.djrapitops.plan.delivery.web.resolver.request.Request;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
@@ -63,6 +65,26 @@ public interface ResolverService {
      */
     void registerResolverForMatches(String pluginName, Pattern pattern, Resolver resolver);
 
+    /**
+     * Register a new permission that you are using in your {@link Resolver#canAccess(Request)} method.
+     * <p>
+     * The permissions are not given to any users by default, and need to be given by admin manually.
+     *
+     * @param webPermissions Permission strings, higher level permissions grant lower level automatically - eg. page.foo also grants page.foo.bar
+     * @return CompletableFuture that tells when the permissions have been stored.
+     */
+    CompletableFuture<Void> registerPermissions(String... webPermissions);
+
+    /**
+     * Register a new permission that you are using in your {@link Resolver#canAccess(Request)} method.
+     * <p>
+     * The permission is granted to any groups with {@code whenHasPermission} parameter.
+     *
+     * @param webPermission     Permission string, higher level permissions grant lower level automatically - eg. page.foo also grants page.foo.bar
+     * @param whenHasPermission Permission that a group already has that this permission should be granted to - eg. page.network.overview.numbers
+     */
+    void registerPermission(String webPermission, String whenHasPermission);
+
     /**
      * Obtain a {@link Resolver} for a target.
      * <p>

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/package-info.java

@@ -1,6 +1,5 @@
 /**
  * PageExtension API for extending the webserver and the website.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/CompositeResolver.java

@@ -46,6 +46,11 @@ public final class CompositeResolver implements Resolver {
         this.resolvers = new ArrayList<>();
     }
 
+    /**
+     * Create a new builder for a .
+     *
+     * @return a builder.
+     */
     public static CompositeResolver.Builder builder() {
         return new Builder();
     }
@@ -100,6 +105,9 @@ public final class CompositeResolver implements Resolver {
         return getResolver(forThis.getPath()).map(resolver -> resolver.requiresAuth(forThis)).orElse(true);
     }
 
+    /**
+     * Builder class for {@link CompositeResolver}.
+     */
     public static class Builder {
         private final CompositeResolver composite;
 
@@ -132,6 +140,11 @@ public final class CompositeResolver implements Resolver {
             return this;
         }
 
+        /**
+         * Build the final result after adding all resolvers.
+         *
+         * @return The {@link CompositeResolver}
+         */
         public CompositeResolver build() {
             return composite;
         }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/FunctionalResolverWrapper.java

@@ -22,11 +22,20 @@ import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+/**
+ * Utility class for constructing a {@link Resolver} with Functional Interfaces.
+ */
 public class FunctionalResolverWrapper implements Resolver {
 
     private final Function<Request, Optional<Response>> resolver;
     private final Predicate<Request> accessCheck;
 
+    /**
+     * Default constructor.
+     *
+     * @param resolver    Function that solves the {@link Request} into an Optional {@link Response}.
+     * @param accessCheck Predicate that checks if {@link Request} is allowed or if 403 Forbidden should be given.
+     */
     public FunctionalResolverWrapper(Function<Request, Optional<Response>> resolver, Predicate<Request> accessCheck) {
         this.resolver = resolver;
         this.accessCheck = accessCheck;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/Resolver.java

@@ -19,7 +19,9 @@ package com.djrapitops.plan.delivery.web.resolver;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
 import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
 
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Interface for resolving requests of Plan webserver.
@@ -40,6 +42,25 @@ public interface Resolver {
      */
     boolean canAccess(Request request);
 
+    /**
+     * Override this to tell Plan what web permissions this endpoint uses.
+     * <p>
+     * This allows:
+     * <ul>
+     *     <li>Plan to store these permissions in the permission list</li>
+     *     <li>Users can grant/deny the permission for a group</li>
+     *     <li>Plan can show what endpoints specific permission gives access to</li>
+     * </ul>
+     * <p>
+     * Requires PAGE_EXTENSION_USER_PERMISSIONS capability
+     *
+     * @return Set of permissions eg. [plugin.custom.permission, plugin.custom.permission.child.node]
+     * @see com.djrapitops.plan.capability.CapabilityService for Capability checks
+     */
+    default Set<String> usedWebPermissions() {
+        return new HashSet<>();
+    }
+
     /**
      * Implement request resolution.
      *
@@ -51,10 +72,21 @@ public interface Resolver {
      */
     Optional<Response> resolve(Request request);
 
+    /**
+     * Creates a new {@link ResponseBuilder} for a {@link Response}.
+     *
+     * @return a new builder.
+     */
     default ResponseBuilder newResponseBuilder() {
         return Response.builder();
     }
 
+    /**
+     * Used to check if the resolver requires authentication to be used.
+     *
+     * @param request Incoming request that you can use to figure out if authentication is required.
+     * @return true if you want 401 to be given when user has not logged in.
+     */
     default boolean requiresAuth(Request request) {
         return true;
     }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/ResponseBuilder.java

@@ -33,7 +33,7 @@ public class ResponseBuilder {
     /**
      * Set MIME Type of the Response.
      *
-     * @param mimeType MIME type of the Response https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types
+     * @param mimeType MIME type of the Response <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">Documentation</a>
      * @return this builder.
      * @see MimeType for common MIME types.
      */
@@ -46,7 +46,7 @@ public class ResponseBuilder {
      * <p>
      * Default status code is 200 (OK) if not set.
      *
-     * @param code 1xx, 2xx, 3xx, 4xx, 5xx, https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
+     * @param code 1xx, 2xx, 3xx, 4xx, 5xx, <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status">Documentation</a>
      * @return this builder.
      */
     public ResponseBuilder setStatus(int code) {
@@ -57,7 +57,7 @@ public class ResponseBuilder {
     /**
      * Set HTTP Response header.
      *
-     * @param header Key of the header. https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param header Key of the header. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @param value  Value for the header.
      * @return this builder.
      */
@@ -75,7 +75,7 @@ public class ResponseBuilder {
      * Utility method for building redirects.
      *
      * @param url URL to redirect the client to with 302 Found.
-     * @return https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Location
+     * @return <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Location">Documentation</a>
      */
     public ResponseBuilder redirectTo(String url) {
         return setStatus(302).setHeader("Location", url).setContent(new byte[0]);

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/exception/BadRequestException.java

@@ -26,6 +26,11 @@ package com.djrapitops.plan.delivery.web.resolver.exception;
  */
 public class BadRequestException extends IllegalArgumentException {
 
+    /**
+     * Default constructor.
+     *
+     * @param message Error message - avoid including any input incoming in the request to prevent XSS.
+     */
     public BadRequestException(String message) {
         super(message);
     }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Classes for implementing functionality with {@link com.djrapitops.plan.delivery.web.ResolverService}.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API#resolverservice">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web.resolver;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/request/Request.java

@@ -43,7 +43,7 @@ public final class Request {
      * @param path        Requested path /example/target
      * @param query       Request parameters ?param=value etc
      * @param user        Web user doing the request (if authenticated)
-     * @param headers     Request headers https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param headers     Request headers <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @param requestBody Raw body as bytes, if present
      */
     public Request(String method, URIPath path, URIQuery query, WebUser user, Map<String, String> headers, byte[] requestBody) {
@@ -57,6 +57,11 @@ public final class Request {
 
     /**
      * Special constructor that figures out URIPath and URIQuery from "/path/and?query=params" and has no request body.
+     *
+     * @param method  HTTP requst method
+     * @param target  The requested path and query, e.g. "/path/and?query=params"
+     * @param user    User that made the request
+     * @param headers HTTP request headers
      */
     public Request(String method, String target, WebUser user, Map<String, String> headers) {
         this.method = method;
@@ -121,7 +126,7 @@ public final class Request {
     /**
      * Get a header in the request.
      *
-     * @param key https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param key <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @return Value if it is present in the request.
      */
     public Optional<String> getHeader(String key) {

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/request/WebUser.java

@@ -17,6 +17,7 @@
 package com.djrapitops.plan.delivery.web.resolver.request;
 
 import java.util.*;
+import java.util.function.Supplier;
 
 public final class WebUser {
 
@@ -57,7 +58,16 @@ public final class WebUser {
     }
 
     public boolean hasPermission(String permission) {
-        return permissions.contains(permission);
+        for (String grant : permissions) {
+            String substitute = permission.replace(grant, "");
+            // Last character is . so it is a sub-permission of the parent, eg. page.player, page.player.thing -> .thing
+            if (substitute.isEmpty() || substitute.startsWith(".")) return true;
+        }
+        return false;
+    }
+
+    public boolean hasPermission(Supplier<String> permissionSupplier) {
+        return hasPermission(permissionSupplier.get());
     }
 
     public String getName() {

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resource/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Classes for implementing functionality with {@link com.djrapitops.plan.delivery.web.ResourceService}.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API#resourceservice">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web.resource;

Plan/api/src/main/java/com/djrapitops/plan/extension/DataExtension.java

@@ -113,6 +113,7 @@ public interface DataExtension {
      * <p>
      * Requires Capability DATA_EXTENSION_BUILDER_API
      *
+     * @param text Text that is displayed next to the value.
      * @return new builder.
      */
     default ValueBuilder valueBuilder(String text) {

Plan/api/src/main/java/com/djrapitops/plan/extension/ExtensionService.java

@@ -81,6 +81,9 @@ public interface ExtensionService {
      */
     void unregister(DataExtension extension);
 
+    /**
+     * Singleton holder for {@link ExtensionService}.
+     */
     class Holder {
         static final AtomicReference<ExtensionService> service = new AtomicReference<>();
 

Plan/api/src/main/java/com/djrapitops/plan/extension/FormatType.java

@@ -42,6 +42,12 @@ public enum FormatType {
      */
     NONE;
 
+    /**
+     * Get a format type by the enum name without exception.
+     *
+     * @param name FormatType#name()
+     * @return Optional if the format type is found by that name, empty if not found.
+     */
     public static Optional<FormatType> getByName(String name) {
         if (name == null) {
             return Optional.empty();
@@ -51,4 +57,5 @@ public enum FormatType {
         } catch (IllegalArgumentException e) {
             return Optional.empty();
         }
-    }}
+    }
+}

Plan/api/src/main/java/com/djrapitops/plan/extension/Group.java

@@ -30,6 +30,11 @@ package com.djrapitops.plan.extension;
  */
 public interface Group {
 
+    /**
+     * Get the name of the group.
+     *
+     * @return Name of the group given by a {@link com.djrapitops.plan.extension.annotation.GroupProvider}, e.g. "Miner"
+     */
     String getGroupName();
 
 }

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/BooleanProvider.java

@@ -89,7 +89,7 @@ public @interface BooleanProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -98,7 +98,7 @@ public @interface BooleanProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/ComponentProvider.java

@@ -76,7 +76,7 @@ public @interface ComponentProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -85,7 +85,7 @@ public @interface ComponentProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/DoubleProvider.java

@@ -67,7 +67,7 @@ public @interface DoubleProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -76,7 +76,7 @@ public @interface DoubleProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/GroupProvider.java

@@ -62,7 +62,7 @@ public @interface GroupProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -71,7 +71,7 @@ public @interface GroupProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/InvalidateMethod.java

@@ -39,10 +39,18 @@ public @interface InvalidateMethod {
      */
     String value();
 
+    /**
+     * Multiple {@link InvalidateMethod} annotations are supported per class.
+     */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
     @interface Multiple {
 
+        /**
+         * All the annotations.
+         *
+         * @return All InvalidateMethod annotations in the class.
+         */
         InvalidateMethod[] value();
 
     }

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/NumberProvider.java

@@ -79,7 +79,7 @@ public @interface NumberProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -88,7 +88,7 @@ public @interface NumberProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/PercentageProvider.java

@@ -70,7 +70,7 @@ public @interface PercentageProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -79,7 +79,7 @@ public @interface PercentageProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/PluginInfo.java

@@ -44,7 +44,7 @@ public @interface PluginInfo {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -53,7 +53,7 @@ public @interface PluginInfo {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/StringProvider.java

@@ -79,7 +79,7 @@ public @interface StringProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -88,7 +88,7 @@ public @interface StringProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/TabInfo.java

@@ -41,7 +41,7 @@ public @interface TabInfo {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -50,7 +50,7 @@ public @interface TabInfo {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java

@@ -18,7 +18,10 @@ package com.djrapitops.plan.extension.builder;
 
 import com.djrapitops.plan.component.Component;
 import com.djrapitops.plan.extension.FormatType;
-import com.djrapitops.plan.extension.annotation.*;
+import com.djrapitops.plan.extension.annotation.BooleanProvider;
+import com.djrapitops.plan.extension.annotation.Conditional;
+import com.djrapitops.plan.extension.annotation.StringProvider;
+import com.djrapitops.plan.extension.annotation.Tab;
 import com.djrapitops.plan.extension.extractor.ExtensionMethod;
 import com.djrapitops.plan.extension.icon.Color;
 import com.djrapitops.plan.extension.icon.Family;
@@ -64,7 +67,7 @@ public interface ValueBuilder {
     /**
      * Icon displayed next to the value.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons
      *
      * @param iconName   Name of the icon
      * @param iconFamily Family of the icon
@@ -78,7 +81,7 @@ public interface ValueBuilder {
     /**
      * Icon displayed next to the value.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons
      *
      * @param icon Icon built using the methods in {@link Icon}.
      * @return This builder.

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Color.java

@@ -47,6 +47,12 @@ public enum Color {
     BLACK,
     NONE;
 
+    /**
+     * Get a color by the enum name without exception.
+     *
+     * @param name Color#name()
+     * @return Optional if the color is found by that name, empty if not found.
+     */
     public static Optional<Color> getByName(String name) {
         if (name == null) {
             return Optional.empty();
@@ -56,4 +62,5 @@ public enum Color {
         } catch (IllegalArgumentException e) {
             return Optional.empty();
         }
-    }}
+    }
+}

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Family.java

@@ -37,6 +37,12 @@ public enum Family {
      */
     BRAND;
 
+    /**
+     * Get a family by the enum name without exception.
+     *
+     * @param name Family#name()
+     * @return Optional if the family is found by that name, empty if not found.
+     */
     public static Optional<Family> getByName(String name) {
         if (name == null) {
             return Optional.empty();

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Icon.java

@@ -16,10 +16,12 @@
  */
 package com.djrapitops.plan.extension.icon;
 
+import java.util.Objects;
+
 /**
  * Object that represents an icon on the website.
  * <p>
- * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+ * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
  *
  * @author AuroraLS3
  */
@@ -72,11 +74,27 @@ public class Icon {
         return this;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Icon icon = (Icon) o;
+        return type == icon.type && Objects.equals(getName(), icon.getName()) && getColor() == icon.getColor();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, type, getName(), getColor());
+    }
+
     @Override
     public String toString() {
         return "Icon{" + type.name() + ", '" + name + '\'' + ", " + color.name() + '}';
     }
 
+    /**
+     * Builder for an {@link Icon}.
+     */
     public static class Builder {
 
         private final Icon icon;

Plan/api/src/main/java/com/djrapitops/plan/extension/package-info.java

@@ -1,6 +1,5 @@
 /**
  * DataExtension API and related classes.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">Documentation</a>
  */
 package com.djrapitops.plan.extension;

Plan/api/src/main/java/com/djrapitops/plan/extension/table/Table.java

@@ -21,10 +21,8 @@ import com.djrapitops.plan.extension.icon.Color;
 import com.djrapitops.plan.extension.icon.Icon;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Object for giving Plan table data.
@@ -100,6 +98,52 @@ public final class Table {
         return tableColumnFormats;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Table table = (Table) o;
+        return Arrays.equals(getColumns(), table.getColumns())
+                && Arrays.equals(getIcons(), table.getIcons())
+                && Arrays.equals(getTableColumnFormats(), table.getTableColumnFormats())
+                && valuesEqual(table);
+    }
+
+    private boolean valuesEqual(Table other) {
+        List<Object[]> rows1 = getRows();
+        List<Object[]> rows2 = other.getRows();
+        if (rows1.size() != rows2.size()) return false;
+        for (int i = 0; i < rows1.size(); i++) {
+            Object[] values1 = rows1.get(i);
+            Object[] values2 = rows2.get(i);
+            for (int j = 0; j < getMaxColumnSize(); j++) {
+                if (!Objects.equals(Objects.toString(values1[0]), Objects.toString(values2[0]))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(getRows());
+        result = 31 * result + Arrays.hashCode(getColumns());
+        result = 31 * result + Arrays.hashCode(getIcons());
+        result = 31 * result + Arrays.hashCode(getTableColumnFormats());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Table{" +
+                "columns=" + Arrays.toString(columns) +
+                ", icons=" + Arrays.toString(icons) +
+                ", tableColumnFormats=" + Arrays.toString(tableColumnFormats) +
+                ", rows=" + rows.stream().map(Arrays::toString).collect(Collectors.toList()) +
+                '}';
+    }
+
     /**
      * Factory for creating new {@link Table} objects.
      */

Plan/api/src/main/java/com/djrapitops/plan/query/CommonQueries.java

@@ -62,14 +62,44 @@ public interface CommonQueries {
      */
     long fetchLastSeen(UUID playerUUID, UUID serverUUID);
 
+    /**
+     * Get the UUIDs of all servers Plan has registered.
+     *
+     * @return Set of Server UUIDs
+     */
     Set<UUID> fetchServerUUIDs();
 
+    /**
+     * Fetch UUID of a player by name.
+     *
+     * @param playerName Name of the player
+     * @return UUID if it is found by Plan or empty if not found.
+     */
     Optional<UUID> fetchUUIDOf(String playerName);
 
+    /**
+     * Fetch name of a player by UUID.
+     *
+     * @param playerUUID UUID of the player
+     * @return Name if it is known by Plan or empty if not.
+     */
     Optional<String> fetchNameOf(UUID playerUUID);
 
+    /**
+     * Check that schema has table you are using in your queries.
+     *
+     * @param table Name of the table, e.g. plan_users.
+     * @return true if table exists.
+     */
     boolean doesDBHaveTable(String table);
 
+    /**
+     * Check that schema table has a column you are using in your queries.
+     *
+     * @param table  Name of the table, e.g. plan_users.
+     * @param column Name of the column, e.g. id
+     * @return true if table and column exist.
+     */
     boolean doesDBHaveTableColumn(String table, String column);
 
     /**

Plan/api/src/main/java/com/djrapitops/plan/query/QueryService.java

@@ -126,7 +126,7 @@ public interface QueryService {
     CommonQueries getCommonQueries();
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface ThrowingConsumer<T> {
@@ -134,7 +134,7 @@ public interface QueryService {
     }
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface ThrowingFunction<T, R> {
@@ -142,7 +142,7 @@ public interface QueryService {
     }
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface VoidFunction {

Plan/api/src/main/java/com/djrapitops/plan/query/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Query API related classes.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-Query-API">Documentation</a>
  */
 package com.djrapitops.plan.query;

Plan/api/src/main/java/com/djrapitops/plan/settings/ListenerService.java

@@ -51,6 +51,9 @@ public interface ListenerService {
      */
     void registerListenerForPlan(Object listener);
 
+    /**
+     * Singleton holder for listeners.
+     */
     class Holder {
         static final AtomicReference<ListenerService> service = new AtomicReference<>();
 

Plan/build.gradle

@@ -11,13 +11,13 @@ buildscript {
 }
 
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2" apply false
+    id "com.github.johnrengelman.shadow" version "8.1.1" apply false
     id "java"
     id 'java-library'
     id "jacoco"
     id "checkstyle"
-    id "org.sonarqube" version "4.3.0.3225"
-    id 'fabric-loom' version '1.1-SNAPSHOT' apply false
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'fabric-loom' version '1.6-SNAPSHOT' apply false
 }
 
 apply plugin: 'nebula-aggregate-javadocs'
@@ -36,20 +36,22 @@ def buildVersion = determineBuildVersion()
 allprojects {
 
     group "com.djrapitops"
-    version "5.5-SNAPSHOT"
+    version "5.6-SNAPSHOT"
 
     ext.majorVersion = '5'
-    ext.minorVersion = '5'
+    ext.minorVersion = '6'
     ext.buildVersion = buildVersion
     ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + ' build ' + project.ext.buildVersion
+    ext.fullVersionFilename = project.ext.majorVersion + '.' + project.ext.minorVersion + '-build-' + project.ext.buildVersion
+    ext.fullVersionSemantic = project.ext.majorVersion + '.' + project.ext.minorVersion + '+build.' + project.ext.buildVersion
 
     // Fix for UTF-8 files showing with wrong encoding when compiled on Windows machines.
     compileJava { options.encoding = "UTF-8" }
-    tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+    tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
     javadoc { options.encoding = 'UTF-8' }
 }
 
-logger.lifecycle("Building artifact for version $fullVersion")
+logger.lifecycle("Building artifact for version $fullVersion / $fullVersionFilename / $fullVersionSemantic")
 
 subprojects {
     // Build plugins
@@ -67,7 +69,7 @@ subprojects {
     }
 
     ext {
-        daggerVersion = "2.47"
+        daggerVersion = "2.51.1"
 
         palVersion = "5.1.0"
 
@@ -81,31 +83,32 @@ subprojects {
         redisBungeeVersion = "0.3.8-SNAPSHOT"
         redisBungeeProxioDevVersion = "0.7.3"
 
-        commonsTextVersion = "1.10.0"
-        commonsCompressVersion = "1.23.0"
-        commonsCodecVersion = "1.16.0"
-        caffeineVersion = "3.1.6"
-        jettyVersion = "11.0.15"
+        commonsTextVersion = "1.12.0"
+        commonsCompressVersion = "1.26.1"
+        commonsCodecVersion = "1.16.1"
+        caffeineVersion = "3.1.8"
+        jettyVersion = "11.0.20"
         caffeineVersion = "2.9.2"
-        mysqlVersion = "8.1.0"
-        mariadbVersion = "3.1.4"
-        sqliteVersion = "3.41.2.1"
+        mysqlVersion = "8.3.0"
+        mariadbVersion = "3.3.3"
+        sqliteVersion = "3.42.0.1"
         adventureVersion = "4.14.0"
-        hikariVersion = "5.0.1"
-        slf4jVersion = "2.0.7"
-        geoIpVersion = "4.0.1"
+        hikariVersion = "5.1.0"
+        slf4jVersion = "2.0.13"
+        geoIpVersion = "4.2.0"
         gsonVersion = "2.10.1"
         dependencyDownloadVersion = "1.3.1"
-        ipAddressMatcherVersion = "5.4.0"
+        ipAddressMatcherVersion = "5.5.0"
+        jasyptVersion = "1.9.3"
 
         bstatsVersion = "3.0.2"
-        placeholderapiVersion = "2.11.3"
+        placeholderapiVersion = "2.11.5"
         nkPlaceholderapiVersion = "1.4-SNAPSHOT"
 
-        junitVersion = "5.9.3"
-        mockitoVersion = "5.4.0"
-        testContainersVersion = "1.18.3"
-        swaggerVersion = "2.2.15"
+        junitVersion = "5.10.2"
+        mockitoVersion = "5.11.0"
+        testContainersVersion = "1.19.7"
+        swaggerVersion = "2.2.21"
     }
 
     repositories {
@@ -127,6 +130,8 @@ subprojects {
         testImplementation "com.google.dagger:dagger:$daggerVersion"
         testAnnotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
 
+        compileOnly "io.swagger.core.v3:swagger-core-jakarta:$swaggerVersion"
+
         // Test Tooling Dependencies
         testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"      // JUnit 5
         testImplementation "org.mockito:mockito-core:$mockitoVersion"           // Mockito Core
@@ -148,7 +153,7 @@ subprojects {
         testImplementation.extendsFrom shadow // Include shadowed dependencies in test classpath
     }
     // Test classes available to other modules
-    task testJar(type: Jar) {
+    tasks.register('testJar', Jar) {
         archiveClassifier.set("test")
         from sourceSets.test.output
     }
@@ -176,8 +181,8 @@ subprojects {
         }
     }
 
-    plugins.withType(JacocoPlugin) {
-        tasks["test"].finalizedBy 'jacocoTestReport'
+    plugins.withType(JacocoPlugin).configureEach {
+        tasks.named("test").get().finalizedBy 'jacocoTestReport'
     }
 }
 

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

@@ -16,13 +16,16 @@
  */
 package com.djrapitops.plan.gathering;
 
+import com.djrapitops.plan.gathering.domain.PluginMetadata;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -129,4 +132,12 @@ public class BukkitSensor implements ServerSensor<World> {
                 .map(Player::getName)
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<PluginMetadata> getInstalledPlugins() {
+        return Arrays.stream(Bukkit.getPluginManager().getPlugins())
+                .map(Plugin::getDescription)
+                .map(description -> new PluginMetadata(description.getName(), description.getVersion()))
+                .collect(Collectors.toList());
+    }
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/importing/data/BukkitUserImportRefiner.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * UserImportRefiner attempts to find any crucial information that is missing.
- *
+ * <p>
  * - Finds UUIDs if only name is present.
  * - Finds Names if only UUID is present.
  * - Removes any importers that do not have any identifiers.

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,16 +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 (!address.isEmpty()) {
-                address = address.substring(0, address.lastIndexOf(':'));
-                if (address.contains("\u0000")) {
-                    address = address.substring(0, address.indexOf('\u0000'));
-                }
-                if (address.contains("fml")) {
-                    address = address.substring(0, address.lastIndexOf("fml"));
-                }
+            if (notWhitelisted) {
+                dbSystem.getDatabase().executeTransaction(new StoreAllowlistBounceTransaction(playerUUID, event.getPlayer().getName(), serverUUID, System.currentTimeMillis()));
+            }
+
+            @Untrusted String address = joinAddressValidator.sanitize(event.getHostname());
+            if (joinAddressValidator.isValid(address)) {
                 joinAddressCache.put(playerUUID, address);
             }
             dbSystem.getDatabase().executeTransaction(new BanStatusTransaction(playerUUID, serverUUID, banned));

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

@@ -53,7 +53,7 @@ import java.util.logging.Logger;
  * Task that handles player ping calculation on Bukkit based servers.
  * <p>
  * Modified PingManager from LagMonitor plugin.
- * https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/task/PingManager.java
+ * <a href="https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/task/PingManager.java">original</a>
  *
  * @author games647
  */
@@ -89,9 +89,9 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
         startRecording = new ConcurrentHashMap<>();
         playerHistory = new HashMap<>();
 
-        Optional<PingMethod> pingMethod = loadPingMethod();
-        if (pingMethod.isPresent()) {
-            this.pingMethod = pingMethod.get();
+        Optional<PingMethod> loaded = loadPingMethod();
+        if (loaded.isPresent()) {
+            this.pingMethod = loaded.get();
             pingMethodAvailable = true;
         } else {
             pingMethodAvailable = false;
@@ -100,6 +100,7 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
 
     private Optional<PingMethod> loadPingMethod() {
         PingMethod[] methods = new PingMethod[]{
+                new SpigotPingMethod(),
                 new PaperPingMethod(),
                 new ReflectiveLatencyFieldMethod(),
                 new ReflectivePingFieldMethod(),

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

@@ -0,0 +1,64 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2018
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.djrapitops.plan.gathering.timed;
+
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class SpigotPingMethod implements PingMethod {
+
+    private String reasonForUnavailability;
+
+    @Override
+    public boolean isAvailable() {
+        try {
+            //Only available in Paper
+            Class.forName("org.bukkit.entity.Player").getDeclaredMethod("getPing");
+            return true;
+        } catch (ClassNotFoundException | NoSuchMethodException noSuchMethodEx) {
+            reasonForUnavailability = noSuchMethodEx.toString();
+            return false;
+        }
+    }
+
+    @Override
+    public int getPing(Player player) {
+        if (reasonForUnavailability != null) return -1;
+
+        try {
+            Method getPing = player.getClass().getDeclaredMethod("getPing");
+            return (int) getPing.invoke(player);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            reasonForUnavailability = e.toString();
+            return -1;
+        }
+    }
+
+    @Override
+    public String getReasonForUnavailability() {
+        return reasonForUnavailability;
+    }
+}

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

@@ -19,7 +19,6 @@ package com.djrapitops.plan.modules.bukkit;
 import com.djrapitops.plan.TaskSystem;
 import com.djrapitops.plan.addons.placeholderapi.PlaceholderCacheRefreshTask;
 import com.djrapitops.plan.delivery.web.ResourceWriteTask;
-import com.djrapitops.plan.delivery.web.WebAssetVersionCheckTask;
 import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieExpiryCleanupTask;
 import com.djrapitops.plan.delivery.webserver.cache.JSONFileStorage;
 import com.djrapitops.plan.delivery.webserver.configuration.AddressAllowList;
@@ -27,6 +26,7 @@ import com.djrapitops.plan.extension.ExtensionServerDataUpdater;
 import com.djrapitops.plan.gathering.ShutdownDataPreservation;
 import com.djrapitops.plan.gathering.ShutdownHook;
 import com.djrapitops.plan.gathering.timed.BukkitPingCounter;
+import com.djrapitops.plan.gathering.timed.InstalledPluginGatheringTask;
 import com.djrapitops.plan.gathering.timed.ServerTPSCounter;
 import com.djrapitops.plan.gathering.timed.SystemUsageBuffer;
 import com.djrapitops.plan.settings.upkeep.ConfigStoreTask;
@@ -94,10 +94,6 @@ public interface BukkitTaskModule {
     @IntoSet
     TaskSystem.Task bindResourceWriteTask(ResourceWriteTask resourceWriteTask);
 
-    @Binds
-    @IntoSet
-    TaskSystem.Task bindWebAssetVersionCheckTask(WebAssetVersionCheckTask webAssetVersionCheckTask);
-
     @Binds
     @IntoSet
     TaskSystem.Task bindActiveCookieStoreExpiryTask(ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask);
@@ -113,4 +109,8 @@ public interface BukkitTaskModule {
     @Binds
     @IntoSet
     TaskSystem.Task bindAddressAllowListUpdateTask(AddressAllowList addressAllowList);
+
+    @Binds
+    @IntoSet
+    TaskSystem.Task bindInstalledPluginGatheringTask(InstalledPluginGatheringTask installedPluginGatheringTask);
 }

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

@@ -32,7 +32,7 @@ import java.lang.reflect.Field;
  * An utility class that simplifies reflection in Bukkit plugins.
  * <p>
  * Modified Reflection utility from LagMonitor plugin.
- * https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/traffic/Reflection.java
+ * <a href="https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/traffic/Reflection.java">original code</a>
  *
  * @author Kristian
  */

Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/BungeeSensor.java

@@ -17,9 +17,11 @@
 package com.djrapitops.plan.gathering;
 
 import com.djrapitops.plan.PlanBungee;
+import com.djrapitops.plan.gathering.domain.PluginMetadata;
 import com.djrapitops.plan.identification.properties.RedisCheck;
 import com.djrapitops.plan.identification.properties.RedisPlayersOnlineSupplier;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Plugin;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -35,11 +37,13 @@ public class BungeeSensor implements ServerSensor<Object> {
     private final IntSupplier onlinePlayerCountSupplier;
     private final IntSupplier onlinePlayerCountBungee;
     private final Supplier<Collection<ProxiedPlayer>> getPlayers;
+    private final Supplier<Collection<Plugin>> getPlugins;
 
     @Inject
     public BungeeSensor(PlanBungee plugin) {
         getPlayers = plugin.getProxy()::getPlayers;
         onlinePlayerCountBungee = plugin.getProxy()::getOnlineCount;
+        getPlugins = plugin.getProxy().getPluginManager()::getPlugins;
         onlinePlayerCountSupplier = RedisCheck.isClassAvailable() ? new RedisPlayersOnlineSupplier() : onlinePlayerCountBungee;
     }
 
@@ -63,4 +67,12 @@ public class BungeeSensor implements ServerSensor<Object> {
     public boolean usingRedisBungee() {
         return RedisCheck.isClassAvailable();
     }
+
+    @Override
+    public List<PluginMetadata> getInstalledPlugins() {
+        return getPlugins.get().stream()
+                .map(Plugin::getDescription)
+                .map(description -> new PluginMetadata(description.getName(), description.getVersion()))
+                .collect(Collectors.toList());
+    }
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java

@@ -40,5 +40,5 @@ public interface BungeeSuperClassBindingModule {
     ListenerSystem bindListenerSystem(BungeeListenerSystem listenerSystem);
 
     @Binds
-    ServerSensor<Object> bindServerSensor(BungeeSensor sensor);
+    ServerSensor<?> bindServerSensor(BungeeSensor sensor);
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeTaskModule.java

@@ -18,12 +18,12 @@ package com.djrapitops.plan.modules.bungee;
 
 import com.djrapitops.plan.TaskSystem;
 import com.djrapitops.plan.delivery.web.ResourceWriteTask;
-import com.djrapitops.plan.delivery.web.WebAssetVersionCheckTask;
 import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieExpiryCleanupTask;
 import com.djrapitops.plan.delivery.webserver.cache.JSONFileStorage;
 import com.djrapitops.plan.delivery.webserver.configuration.AddressAllowList;
 import com.djrapitops.plan.extension.ExtensionServerDataUpdater;
 import com.djrapitops.plan.gathering.timed.BungeePingCounter;
+import com.djrapitops.plan.gathering.timed.InstalledPluginGatheringTask;
 import com.djrapitops.plan.gathering.timed.ProxyTPSCounter;
 import com.djrapitops.plan.gathering.timed.SystemUsageBuffer;
 import com.djrapitops.plan.settings.upkeep.NetworkConfigStoreTask;
@@ -81,10 +81,6 @@ public interface BungeeTaskModule {
     @IntoSet
     TaskSystem.Task bindResourceWriteTask(ResourceWriteTask resourceWriteTask);
 
-    @Binds
-    @IntoSet
-    TaskSystem.Task bindWebAssetVersionCheckTask(WebAssetVersionCheckTask webAssetVersionCheckTask);
-
     @Binds
     @IntoSet
     TaskSystem.Task bindActiveCookieStoreExpiryTask(ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask);
@@ -92,4 +88,8 @@ public interface BungeeTaskModule {
     @Binds
     @IntoSet
     TaskSystem.Task bindAddressAllowListUpdateTask(AddressAllowList addressAllowList);
+
+    @Binds
+    @IntoSet
+    TaskSystem.Task bindInstalledPluginGatheringTask(InstalledPluginGatheringTask installedPluginGatheringTask);
 }

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 "5.0.0"
-    id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.15"
+    id "com.github.node-gradle.node" version "7.0.2"
+    id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.21"
 }
 
 configurations {
@@ -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"
@@ -82,6 +83,8 @@ dependencies {
         // json-simple has junit (a test dependency) compile scoped
         exclude group: "junit", module: "junit"
     }
+    implementation "org.jasypt:jasypt:$jasyptVersion:lite"
+
 
     // Swagger annotations
     implementation "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0"
@@ -92,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.10.0"
+    testImplementation "org.seleniumhq.selenium:selenium-java:4.19.1"
     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'
@@ -111,13 +123,14 @@ task updateVersion(type: Copy) {
 
 node {
     download = true
-    version = "16.14.2"
+    version = "20.9.0"
     nodeProjectDir = file("$rootDir/react/dashboard")
 }
 
 task yarnBundle(type: YarnTask) {
     inputs.files(fileTree("$rootDir/react/dashboard/src"))
     inputs.file("$rootDir/react/dashboard/package.json")
+    inputs.file("$rootDir/react/dashboard/vite.config.js")
 
     outputs.dir("$rootDir/react/dashboard/build")
 
@@ -136,6 +149,7 @@ task yarnStart(type: YarnTask) {
 task copyYarnBuildResults {
     inputs.files(fileTree("$rootDir/react/dashboard/build"))
     outputs.dir("$rootDir/common/build/resources/main/assets/plan/web")
+    outputs.dir("$rootDir/common/build/resources/test/assets/plan/web")
 
     dependsOn yarnBundle
     doLast {
@@ -144,6 +158,10 @@ task copyYarnBuildResults {
             from "$rootDir/react/dashboard/build"
             into "$rootDir/common/build/resources/main/assets/plan/web"
         }
+        copy {
+            into "$rootDir/common/build/resources/main/assets/plan/web"
+            into "$rootDir/common/build/resources/test/assets/plan/web"
+        }
     }
 }
 
@@ -224,8 +242,12 @@ artifacts {
 }
 
 processResources {
-    dependsOn copyYarnBuildResults
-    dependsOn determineAssetModifications
+    // Skips Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
+    // 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 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 ApiServices apiServices;
     private final PluginLogger logger;
     private final ErrorLogger errorLogger;
 
@@ -104,17 +89,10 @@ 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,
-            PlanAPI.PlanAPIHolder apiHolder
+            ApiServices apiServices, // API v5
+            @SuppressWarnings("deprecation") PlanAPI.PlanAPIHolder apiHolder // Deprecated PlanAPI, backwards compatibility
     ) {
         this.files = files;
         this.configSystem = configSystem;
@@ -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           ██▌");
@@ -149,14 +120,6 @@ public class PlanSystem implements SubSystem {
         logger.info("§2");
     }
 
-    /**
-     * @deprecated Use {@link com.djrapitops.plan.delivery.webserver.Addresses} instead.
-     */
-    @Deprecated(since = "Addresses.java")
-    public String getMainAddress() {
-        return webServerSystem.getAddresses().getMainAddress().orElse(webServerSystem.getAddresses().getFallbackLocalhostAddress());
-    }
-
     /**
      * Enables only the systems that are required for {@link com.djrapitops.plan.commands.PlanCommand}.
      *
@@ -170,22 +133,15 @@ public class PlanSystem implements SubSystem {
      * Enables the rest of the systems that are not enabled in {@link #enableForCommands()}.
      */
     public void enableOtherThanCommands() {
-        extensionService.register();
-        componentService.register();
-        resolverService.register();
-        resourceService.register();
-        listenerService.register();
-        settingsService.register();
-        schedulerService.register();
-        queryService.register();
+        apiServices.register();
 
         enableSystems(
+                processing,
                 files,
                 localeSystem,
                 versionChecker,
                 databaseSystem,
                 webServerSystem,
-                processing,
                 serverInfo,
                 importSystem,
                 exportSystem,
@@ -197,11 +153,11 @@ public class PlanSystem implements SubSystem {
         // Disables Webserver if Proxy is detected in the database
         if (serverInfo.getServer().isNotProxy()) {
             processing.submitNonCritical(new NonProxyWebserverDisableChecker(
-                    configSystem.getConfig(), webServerSystem.getAddresses(), webServerSystem, logger, errorLogger
+                    configSystem.getConfig(), localeSystem.getLocale(), webServerSystem.getAddresses(), webServerSystem, logger, errorLogger
             ));
         }
 
-        extensionService.registerExtensions();
+        apiServices.registerExtensions();
         enabled = true;
 
         String javaVersion = System.getProperty("java.specification.version");
@@ -231,7 +187,7 @@ public class PlanSystem implements SubSystem {
         enabled = false;
         Formatters.clearSingleton();
 
-        extensionService.disableUpdates();
+        apiServices.disableExtensionDataUpdates();
 
         disableSystems(
                 taskSystem,
@@ -324,12 +280,8 @@ public class PlanSystem implements SubSystem {
         return enabled;
     }
 
-    public ExtensionSvc getExtensionService() {
-        return extensionService;
-    }
-
-    public ComponentSvc getComponentService() {
-        return componentService;
+    public ApiServices getApiServices() {
+        return apiServices;
     }
 
     public static long getServerEnableTime() {

Plan/common/src/main/java/com/djrapitops/plan/api/CommonAPI.java

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  * PlanAPI extension for all implementations.
  *
  * @author AuroraLS3
- * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
+ * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (<a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5">wiki</a>).
  */
 @Singleton
 @Deprecated(forRemoval = true, since = "5.0")

Plan/common/src/main/java/com/djrapitops/plan/api/PlanAPI.java

@@ -35,7 +35,7 @@ import java.util.UUID;
  * Interface for PlanAPI methods.
  *
  * @author AuroraLS3
- * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
+ * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (<a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5">wiki</a>).
  */
 @Deprecated(since = "5.0")
 public interface PlanAPI {
@@ -65,7 +65,7 @@ public interface PlanAPI {
     }
 
     /**
-     * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+     * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
      */
     @Deprecated
     void addPluginDataSource(PluginData pluginData);

Plan/common/src/main/java/com/djrapitops/plan/api/data/PlayerContainer.java

@@ -29,7 +29,7 @@ import java.util.Optional;
  * The Keys might change in the future, but the Optional API should help dealing with those cases.
  *
  * @author AuroraLS3
- * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
+ * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (<a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5">wiki</a>).
  */
 @Deprecated(since = "5.0")
 public class PlayerContainer {

Plan/common/src/main/java/com/djrapitops/plan/api/data/ServerContainer.java

@@ -28,7 +28,7 @@ import java.util.Optional;
  * The Keys might change in the future, but the Optional API should help dealing with those cases.
  *
  * @author AuroraLS3
- * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (https://github.com/plan-player-analytics/Plan/wiki/APIv5).
+ * @deprecated Plan API v4 has been deprecated, use the APIv5 instead (<a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5">wiki</a>).
  */
 @Deprecated(forRemoval = true, since = "5.0")
 public class ServerContainer {

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

@@ -115,6 +115,8 @@ public class PlanCommand {
                 .subcommand(unregisterCommand())
                 .subcommand(logoutCommand())
                 .subcommand(webUsersCommand())
+                .subcommand(groups())
+                .subcommand(setGroup())
 
                 .subcommand(acceptCommand())
                 .subcommand(cancelCommand())
@@ -261,7 +263,7 @@ public class PlanCommand {
                 .requiredArgument(locale.getString(HelpLang.ARG_USERNAME), locale.getString(HelpLang.DESC_ARG_USERNAME))
                 .description(locale.getString(HelpLang.LOGOUT))
                 .inDepthDescription(locale.getString(DeepHelpLang.LOGOUT))
-                .onCommand(registrationCommands::onLogoutCommand)
+                .onArgsOnlyCommand(registrationCommands::onLogoutCommand)
                 .onTabComplete(this::webUserNames)
                 .build();
     }
@@ -514,4 +516,36 @@ public class PlanCommand {
                 .onTabComplete(this::playerNames)
                 .build();
     }
+
+    private Subcommand setGroup() {
+        return Subcommand.builder()
+                .aliases("setgroup")
+                .requirePermission(Permissions.SET_GROUP)
+                .requiredArgument(locale.getString(HelpLang.ARG_USERNAME), locale.getString(HelpLang.DESC_ARG_USERNAME))
+                .requiredArgument(locale.getString(HelpLang.ARG_GROUP), locale.getString(HelpLang.DESC_ARG_GROUP))
+                .description(locale.getString(HelpLang.SET_GROUP))
+                .inDepthDescription(locale.getString(DeepHelpLang.SET_GROUP))
+                .onCommand(registrationCommands::onChangePermissionGroup)
+                .onTabComplete(this::webGroupTabComplete)
+                .build();
+    }
+
+    private List<String> webGroupTabComplete(CMDSender sender, @Untrusted Arguments arguments) {
+        Optional<String> groupArgument = arguments.get(1);
+        if (groupArgument.isPresent()) {
+            return tabCompleteCache.getMatchingWebGroupNames(groupArgument.get());
+        }
+        String usernameArgument = arguments.get(0).orElse(null);
+        return tabCompleteCache.getMatchingUserIdentifiers(usernameArgument);
+    }
+
+    private Subcommand groups() {
+        return Subcommand.builder()
+                .aliases("groups")
+                .requirePermission(Permissions.SET_GROUP)
+                .description(locale.getString(HelpLang.GROUPS))
+                .inDepthDescription(locale.getString(DeepHelpLang.GROUPS))
+                .onCommand(registrationCommands::onListWebGroups)
+                .build();
+    }
 }

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

@@ -17,7 +17,6 @@
 package com.djrapitops.plan.commands;
 
 import com.djrapitops.plan.SubSystem;
-import com.djrapitops.plan.delivery.domain.auth.User;
 import com.djrapitops.plan.gathering.ServerSensor;
 import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.identification.ServerUUID;
@@ -52,6 +51,7 @@ public class TabCompleteCache implements SubSystem {
     private final Set<String> serverIdentifiers;
     private final Set<String> userIdentifiers;
     private final Set<String> backupFileNames;
+    private final Set<String> webGroupIdentifiers;
 
     @Inject
     public TabCompleteCache(
@@ -68,6 +68,7 @@ public class TabCompleteCache implements SubSystem {
         serverIdentifiers = new HashSet<>();
         userIdentifiers = new HashSet<>();
         backupFileNames = new HashSet<>();
+        webGroupIdentifiers = new HashSet<>();
     }
 
     @Override
@@ -77,9 +78,14 @@ public class TabCompleteCache implements SubSystem {
             refreshServerIdentifiers();
             refreshUserIdentifiers();
             refreshBackupFileNames();
+            refreshWebGroupIdentifiers();
         });
     }
 
+    private void refreshWebGroupIdentifiers() {
+        webGroupIdentifiers.addAll(dbSystem.getDatabase().query(WebUserQueries.fetchGroupNames()));
+    }
+
     private void refreshServerIdentifiers() {
         Map<ServerUUID, Server> serverNames = dbSystem.getDatabase().query(ServerQueries.fetchPlanServerInformation());
         for (Map.Entry<ServerUUID, Server> server : serverNames.entrySet()) {
@@ -94,9 +100,7 @@ public class TabCompleteCache implements SubSystem {
     }
 
     private void refreshUserIdentifiers() {
-        dbSystem.getDatabase().query(WebUserQueries.fetchAllUsers()).stream()
-                .map(User::getUsername)
-                .forEach(userIdentifiers::add);
+        userIdentifiers.addAll(dbSystem.getDatabase().query(WebUserQueries.fetchAllUsernames()));
     }
 
     private void refreshBackupFileNames() {
@@ -133,6 +137,10 @@ public class TabCompleteCache implements SubSystem {
         return findMatches(backupFileNames, searchFor);
     }
 
+    public List<String> getMatchingWebGroupNames(@Untrusted String searchFor) {
+        return findMatches(webGroupIdentifiers, searchFor);
+    }
+
     @NotNull
     List<String> findMatches(Collection<String> searchList, @Untrusted String searchFor) {
         List<String> filtered = searchList.stream()

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/commands/subcommands/LinkCommands.java

@@ -217,7 +217,7 @@ public class LinkCommands {
             sender.send(t + locale.getString(CommandLang.HEADER_WEB_USERS, 0));
         } else {
             String usersListed = users.stream().sorted()
-                    .map(user -> m + user.getUsername() + "::" + t + user.getLinkedTo() + "::" + s + user.getPermissionLevel() + "\n")
+                    .map(user -> m + user.getUsername() + "::" + t + user.getLinkedTo() + "::" + s + user.getPermissionGroup() + "\n")
                     .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append)
                     .toString();
             sender.buildMessage()

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

@@ -20,6 +20,7 @@ import com.djrapitops.plan.commands.use.Arguments;
 import com.djrapitops.plan.commands.use.CMDSender;
 import com.djrapitops.plan.commands.use.ColorScheme;
 import com.djrapitops.plan.delivery.domain.auth.User;
+import com.djrapitops.plan.delivery.domain.auth.WebPermission;
 import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieStore;
 import com.djrapitops.plan.delivery.webserver.auth.FailReason;
 import com.djrapitops.plan.delivery.webserver.auth.RegistrationBin;
@@ -33,7 +34,6 @@ import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries;
 import com.djrapitops.plan.storage.database.transactions.commands.RemoveWebUserTransaction;
 import com.djrapitops.plan.storage.database.transactions.commands.StoreWebUserTransaction;
-import com.djrapitops.plan.utilities.PassEncryptUtil;
 import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
@@ -41,7 +41,7 @@ import net.playeranalytics.plugin.server.PluginLogger;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
@@ -99,61 +99,41 @@ public class RegistrationCommands {
         } else {
             @Untrusted Optional<String> code = arguments.getAfter("--code");
             if (code.isPresent()) {
-                registerUsingCode(sender, code.get());
+                registerUsingCode(sender, code.get(), arguments);
             } else {
-                registerUsingLegacy(sender, arguments);
+                sender.send(locale.getString(CommandLang.FAIL_REQ_ARGS, "--code", "/plan register --code 81cc5b17"));
             }
         }
     }
 
-    public void registerUsingCode(CMDSender sender, @Untrusted String code) {
+    public void registerUsingCode(CMDSender sender, @Untrusted String code, @Untrusted Arguments arguments) {
         UUID linkedToUUID = sender.getUUID().orElse(null);
-        Optional<User> user = RegistrationBin.register(code, linkedToUUID);
-        if (user.isPresent()) {
-            registerUser(user.get(), sender, getPermissionLevel(sender));
-        } else {
-            throw new IllegalArgumentException(locale.getString(FailReason.USER_INFORMATION_NOT_FOUND));
-        }
+        User user = RegistrationBin.register(code, linkedToUUID)
+                .orElseThrow(() -> new IllegalArgumentException(locale.getString(FailReason.USER_INFORMATION_NOT_FOUND)));
+        String permissionGroup = getPermissionGroup(sender, arguments)
+                .orElseThrow(() -> new IllegalArgumentException(locale.getString(FailReason.NO_PERMISSION_GROUP)));
+        user.setPermissionGroup(permissionGroup);
+        registerUser(user, sender);
     }
 
-    public void registerUsingLegacy(CMDSender sender, @Untrusted Arguments arguments) {
-        @Untrusted String password = arguments.get(0)
-                .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ARGS, 1, "<password>")));
-        String passwordHash = PassEncryptUtil.createHash(password);
-        int permissionLevel = arguments.getInteger(2)
-                .filter(arg -> sender.hasPermission(Permissions.REGISTER_OTHER)) // argument only allowed with register other permission
-                .orElseGet(() -> getPermissionLevel(sender));
-
-        Optional<UUID> senderUUID = sender.getUUID();
-        Optional<String> senderName = sender.getPlayerName();
-        if (senderUUID.isPresent() && senderName.isPresent()) {
-            String playerName = senderName.get();
-            UUID linkedToUUID = senderUUID.get();
-            @Untrusted String username = arguments.get(1).orElse(playerName);
-            registerUser(new User(username, playerName, linkedToUUID, passwordHash, permissionLevel, Collections.emptyList()), sender, permissionLevel);
-        } else {
-            @Untrusted String username = arguments.get(1)
-                    .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ARGS, 3, "<password> <name> <level>")));
-            registerUser(new User(username, "console", null, passwordHash, permissionLevel, Collections.emptyList()), sender, permissionLevel);
+    private Optional<String> getPermissionGroup(CMDSender sender, @Untrusted Arguments arguments) {
+        List<String> groups = dbSystem.getDatabase().query(WebUserQueries.fetchGroupNames());
+        if (sender.isPlayer()) {
+            for (String group : groups) {
+                if (sender.hasPermission("plan.webgroup." + group)) {
+                    return Optional.of(group);
+                }
+            }
+        } else if (arguments.contains("superuser")) {
+            return dbSystem.getDatabase().query(WebUserQueries.fetchGroupNamesWithPermission(WebPermission.MANAGE_GROUPS.getPermission()))
+                    .stream().findFirst();
         }
+        return Optional.empty();
     }
 
-    private int getPermissionLevel(CMDSender sender) {
-        if (sender.hasPermission(Permissions.SERVER)) {
-            return 0;
-        }
-        if (sender.hasPermission(Permissions.PLAYER_OTHER)) {
-            return 1;
-        }
-        if (sender.hasPermission(Permissions.PLAYER_SELF)) {
-            return 2;
-        }
-        return 100;
-    }
-
-    private void registerUser(User user, CMDSender sender, int permissionLevel) {
+    private void registerUser(User user, CMDSender sender) {
         String username = user.getUsername();
-        user.setPermissionLevel(permissionLevel);
+
         try {
             Database database = dbSystem.getDatabase();
             boolean userExists = database.query(WebUserQueries.fetchUser(username)).isPresent();
@@ -163,11 +143,11 @@ public class RegistrationCommands {
                     .get(); // Wait for completion
 
             sender.send(locale.getString(CommandLang.WEB_USER_REGISTER_SUCCESS, username));
-            logger.info(locale.getString(CommandLang.WEB_USER_REGISTER_NOTIFY, username, permissionLevel));
+            logger.info(locale.getString(CommandLang.WEB_USER_REGISTER_NOTIFY, username, user.getPermissionGroup()));
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
         } catch (DBOpException | ExecutionException e) {
-            errorLogger.warn(e, ErrorContext.builder().related(sender, user, permissionLevel).build());
+            errorLogger.warn(e, ErrorContext.builder().related(sender, user).build());
         }
     }
 
@@ -217,7 +197,7 @@ public class RegistrationCommands {
     }
 
 
-    public void onLogoutCommand(CMDSender sender, @Untrusted Arguments arguments) {
+    public void onLogoutCommand(@Untrusted Arguments arguments) {
         @Untrusted String loggingOut = arguments.get(0)
                 .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ONE_ARG, locale.getString(HelpLang.ARG_USERNAME) + "/*")));
 
@@ -227,4 +207,32 @@ public class RegistrationCommands {
             ActiveCookieStore.removeUserCookie(loggingOut);
         }
     }
+
+    public void onChangePermissionGroup(CMDSender sender, @Untrusted Arguments arguments) {
+        String username = arguments.get(0)
+                .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ARGS, locale.getString(HelpLang.ARG_USERNAME))));
+        String group = arguments.get(1)
+                .orElseThrow(() -> new IllegalArgumentException(locale.getString(CommandLang.FAIL_REQ_ARGS, locale.getString(HelpLang.ARG_GROUP))));
+
+        Database database = dbSystem.getDatabase();
+        User user = database.query(WebUserQueries.fetchUser(username))
+                .orElseThrow(() -> new IllegalArgumentException(locale.getString(FailReason.USER_DOES_NOT_EXIST)));
+
+        Optional<Integer> groupId = database.query(WebUserQueries.fetchGroupId(group));
+        if (groupId.isEmpty()) {
+            throw new IllegalArgumentException(locale.getString(FailReason.GROUP_DOES_NOT_EXIST));
+        }
+
+        user.setPermissionGroup(group);
+
+        database.executeTransaction(new StoreWebUserTransaction(user))
+                .thenRun(() -> sender.send(locale.getString(CommandLang.PROGRESS_SUCCESS)));
+    }
+
+    public void onListWebGroups(CMDSender sender) {
+        Database database = dbSystem.getDatabase();
+        List<String> groupNames = database.query(WebUserQueries.fetchGroupNames());
+
+        sender.send(String.join(", ", groupNames));
+    }
 }

Plan/common/src/main/java/com/djrapitops/plan/commands/use/SubcommandBuilder.java

@@ -54,6 +54,10 @@ public interface SubcommandBuilder {
         return onCommand((sender, arguments) -> executor.accept(sender));
     }
 
+    default SubcommandBuilder onArgsOnlyCommand(Consumer<Arguments> executor) {
+        return onCommand((sender, arguments) -> executor.accept(arguments));
+    }
+
     SubcommandBuilder onTabComplete(BiFunction<CMDSender, Arguments, List<String>> resolver);
 
     Subcommand build();

Plan/common/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java

@@ -27,7 +27,7 @@ import java.util.UUID;
  * @author AuroraLS3
  * @see TableContainer
  * @see InspectContainer
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated(since = "5.0")
 public final class AnalysisContainer extends InspectContainer {

Plan/common/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java

@@ -27,7 +27,7 @@ import java.util.TreeMap;
  *
  * @author AuroraLS3
  * @see TableContainer
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated(since = "5.0")
 public class InspectContainer {

Plan/common/src/main/java/com/djrapitops/plan/data/element/TableContainer.java

@@ -26,7 +26,7 @@ import java.util.List;
  * Container used for creating Html tables.
  *
  * @author AuroraLS3
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated(since = "5.0")
 public class TableContainer {

Plan/common/src/main/java/com/djrapitops/plan/data/plugin/BanData.java

@@ -23,7 +23,7 @@ import java.util.UUID;
  * Interface for PluginData objects that affect Ban state of players.
  *
  * @author AuroraLS3
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated(since = "5.0")
 public interface BanData {

Plan/common/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java

@@ -20,7 +20,7 @@ package com.djrapitops.plan.data.plugin;
  * Enum class for PluginData to estimate the required width of the contained items.
  *
  * @author AuroraLS3
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated
 public enum ContainerSize {

Plan/common/src/main/java/com/djrapitops/plan/data/plugin/PluginData.java

@@ -33,7 +33,7 @@ import java.util.UUID;
  * to register objects extending this class.
  *
  * @author AuroraLS3
- * @deprecated PluginData API has been deprecated - see https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API for new API.
+ * @deprecated PluginData API has been deprecated - see <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">wiki</a> for new API.
  */
 @Deprecated(since = "5.0")
 public abstract class PluginData {

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/PluginHistoryMetadata.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.domain;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Represents plugin version history.
+ * <p>
+ * If version is null the plugin was uninstalled at that time.
+ *
+ * @author AuroraLS3
+ */
+public class PluginHistoryMetadata {
+
+    private final String name;
+    @Nullable
+    private final String version;
+    private final long modified;
+
+    public PluginHistoryMetadata(String name, @Nullable String version, long modified) {
+        this.name = name;
+        this.version = version;
+        this.modified = modified;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Nullable
+    public String getVersion() {
+        return version;
+    }
+
+    public long getModified() {
+        return modified;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PluginHistoryMetadata that = (PluginHistoryMetadata) o;
+        return getModified() == that.getModified() && Objects.equals(getName(), that.getName()) && Objects.equals(getVersion(), that.getVersion());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName(), getVersion(), getModified());
+    }
+
+    @Override
+    public String toString() {
+        return "PluginHistoryMetadata{" +
+                "name='" + name + '\'' +
+                ", version='" + version + '\'' +
+                ", modified=" + modified +
+                '}';
+    }
+}

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

@@ -18,6 +18,7 @@ package com.djrapitops.plan.delivery.domain;
 
 import com.djrapitops.plan.delivery.domain.mutators.ActivityIndex;
 import com.djrapitops.plan.gathering.domain.BaseUser;
+import com.djrapitops.plan.gathering.domain.Ping;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -38,6 +39,7 @@ public class TablePlayer implements Comparable<TablePlayer> {
     private Long registered;
     private Long lastSeen;
     private String geolocation;
+    private Ping ping;
 
     private boolean banned = false;
 
@@ -87,6 +89,10 @@ public class TablePlayer implements Comparable<TablePlayer> {
         return Optional.ofNullable(geolocation);
     }
 
+    public Ping getPing() {
+        return ping;
+    }
+
     public boolean isBanned() {
         return banned;
     }
@@ -111,12 +117,13 @@ public class TablePlayer implements Comparable<TablePlayer> {
                 lastSeen.equals(that.lastSeen) &&
                 name.equals(that.name) &&
                 activityIndex.equals(that.activityIndex) &&
-                geolocation.equals(that.geolocation);
+                geolocation.equals(that.geolocation) &&
+                ping.equals(that.ping);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, activityIndex, activePlaytime, sessionCount, registered, lastSeen, geolocation);
+        return Objects.hash(name, activityIndex, activePlaytime, sessionCount, registered, lastSeen, geolocation, ping);
     }
 
     @Override
@@ -130,6 +137,7 @@ public class TablePlayer implements Comparable<TablePlayer> {
                 ", registered=" + registered +
                 ", lastSeen=" + lastSeen +
                 ", geolocation='" + geolocation + '\'' +
+                ", ping='" + ping + '\'' +
                 ", banned=" + banned +
                 '}';
     }
@@ -190,6 +198,11 @@ public class TablePlayer implements Comparable<TablePlayer> {
             return this;
         }
 
+        public Builder ping(Ping ping) {
+            player.ping = ping;
+            return this;
+        }
+
         public TablePlayer build() {
             return player;
         }

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

@@ -1,93 +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.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Object containing webserver security user information.
- *
- * @author AuroraLS3
- * @deprecated Use {@link com.djrapitops.plan.delivery.domain.auth.User} instead
- * TODO Rewrite Authentication stuff
- */
-@Deprecated(since = "2022-02-12, User.java")
-public class WebUser {
-
-    private final String username;
-    private final String saltedPassHash;
-    private final int permLevel;
-
-    public WebUser(String username, String saltedPassHash, int permLevel) {
-        this.username = username;
-        this.saltedPassHash = saltedPassHash;
-        this.permLevel = permLevel;
-    }
-
-    public static List<String> getPermissionsForLevel(int level) {
-        List<String> permissions = new ArrayList<>();
-        if (level <= 0) {
-            permissions.add("page.network");
-            permissions.add("page.server");
-            permissions.add("page.debug");
-            // TODO Add JSON Permissions
-        }
-        if (level <= 1) {
-            permissions.add("page.players");
-            permissions.add("page.player.other");
-        }
-        if (level <= 2) {
-            permissions.add("page.player.self");
-        }
-        return permissions;
-    }
-
-    public String getSaltedPassHash() {
-        return saltedPassHash;
-    }
-
-    public int getPermLevel() {
-        return permLevel;
-    }
-
-    public String getName() {
-        return username;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        WebUser webUser = (WebUser) o;
-        return permLevel == webUser.permLevel &&
-                Objects.equals(username, webUser.username) &&
-                Objects.equals(saltedPassHash, webUser.saltedPassHash);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(username, saltedPassHash, permLevel);
-    }
-
-    public com.djrapitops.plan.delivery.web.resolver.request.WebUser toNewWebUser() {
-        return new com.djrapitops.plan.delivery.web.resolver.request.WebUser(
-                username, getPermissionsForLevel(permLevel).toArray(new String[0])
-        );
-    }
-}

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

@@ -0,0 +1,59 @@
+/*
+ *  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.auth;
+
+import java.util.Objects;
+
+/**
+ * Represents Plan web permission group without permissions or users.
+ * <p>
+ * This object is used instead of a String in case more attributes are added in the future.
+ *
+ * @author AuroraLS3
+ */
+public class Group {
+
+    private final String name;
+
+    public Group(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Group group = (Group) o;
+        return Objects.equals(getName(), group.getName());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName());
+    }
+
+    @Override
+    public String toString() {
+        return "WebGroup{" +
+                "name='" + name + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,58 @@
+/*
+ *  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.auth;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Represents Plan web permission group listing without associated permissions.
+ *
+ * @author AuroraLS3
+ */
+public class GroupList {
+
+    private final List<Group> groups;
+
+    public GroupList(List<Group> groups) {
+        this.groups = groups;
+    }
+
+    public List<Group> getGroups() {
+        return groups;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GroupList that = (GroupList) o;
+        return Objects.equals(getGroups(), that.getGroups());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getGroups());
+    }
+
+    @Override
+    public String toString() {
+        return "WebGroupList{" +
+                "groups=" + groups +
+                '}';
+    }
+}

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

@@ -36,15 +36,15 @@ public class User implements Comparable<User> {
     private final String linkedTo;
     private final UUID linkedToUUID; // null for 'console'
     private final String passwordHash;
-    private int permissionLevel;
+    private String permissionGroup;
     private final Collection<String> permissions;
 
-    public User(@Untrusted String username, String linkedTo, UUID linkedToUUID, String passwordHash, int permissionLevel, Collection<String> permissions) {
+    public User(@Untrusted String username, String linkedTo, UUID linkedToUUID, String passwordHash, String permissionGroup, Collection<String> permissions) {
         this.username = username;
         this.linkedTo = linkedTo;
         this.linkedToUUID = linkedToUUID;
         this.passwordHash = passwordHash;
-        this.permissionLevel = permissionLevel;
+        this.permissionGroup = permissionGroup;
         this.permissions = permissions;
     }
 
@@ -73,20 +73,16 @@ public class User implements Comparable<User> {
         return passwordHash;
     }
 
-    /**
-     * @deprecated Permission list should be used instead.
-     */
-    @Deprecated(since = "2022-05-04", forRemoval = true)
-    public int getPermissionLevel() {
-        return permissionLevel;
+    public String getPermissionGroup() {
+        return permissionGroup;
     }
 
-    /**
-     * @deprecated Permission list should be used instead.
-     */
-    @Deprecated(since = "2022-05-04", forRemoval = true)
-    public void setPermissionLevel(int permissionLevel) {
-        this.permissionLevel = permissionLevel;
+    public void setPermissionGroup(String permissionGroup) {
+        this.permissionGroup = permissionGroup;
+    }
+
+    public Collection<String> getPermissions() {
+        return permissions;
     }
 
     @Override
@@ -96,7 +92,7 @@ public class User implements Comparable<User> {
                 ", linkedTo='" + linkedTo + '\'' +
                 ", linkedToUUID=" + linkedToUUID +
                 ", passwordHash='" + passwordHash + '\'' +
-                ", permissionLevel=" + permissionLevel +
+                ", permissionGroup=" + permissionGroup +
                 ", permissions=" + permissions +
                 '}';
     }
@@ -106,22 +102,22 @@ public class User implements Comparable<User> {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         User user = (User) o;
-        return permissionLevel == user.permissionLevel &&
-                Objects.equals(username, user.username) &&
+        return Objects.equals(username, user.username) &&
                 Objects.equals(linkedTo, user.linkedTo) &&
                 Objects.equals(linkedToUUID, user.linkedToUUID) &&
                 Objects.equals(passwordHash, user.passwordHash) &&
+                Objects.equals(permissionGroup, user.permissionGroup) &&
                 Objects.equals(permissions, user.permissions);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(username, linkedTo, linkedToUUID, passwordHash, permissionLevel, permissions);
+        return Objects.hash(username, linkedTo, linkedToUUID, passwordHash, permissionGroup, permissions);
     }
 
     @Override
     public int compareTo(User other) {
-        int comparison = Integer.compare(this.permissionLevel, other.permissionLevel);
+        int comparison = String.CASE_INSENSITIVE_ORDER.compare(this.permissionGroup, other.permissionGroup);
         if (comparison == 0) comparison = String.CASE_INSENSITIVE_ORDER.compare(this.username, other.username);
         return comparison;
     }

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

@@ -0,0 +1,183 @@
+/*
+ *  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.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;
+
+/**
+ * List of web permissions.
+ *
+ * @author AuroraLS3
+ */
+public enum WebPermission implements Supplier<String>, Lang {
+    PAGE("Controls what is visible on pages"),
+    PAGE_NETWORK("See all of network page"),
+    PAGE_NETWORK_OVERVIEW("See Network Overview -tab"),
+    PAGE_NETWORK_OVERVIEW_NUMBERS("See Network Overview numbers"),
+    PAGE_NETWORK_OVERVIEW_GRAPHS("See Network Overview graphs"),
+    PAGE_NETWORK_OVERVIEW_GRAPHS_ONLINE("See Players Online graph"),
+    PAGE_NETWORK_OVERVIEW_GRAPHS_DAY_BY_DAY("See Day by Day graph"),
+    PAGE_NETWORK_OVERVIEW_GRAPHS_HOUR_BY_HOUR("See Hour by Hour graph"),
+    PAGE_NETWORK_OVERVIEW_GRAPHS_CALENDAR("See Network calendar"),
+    PAGE_NETWORK_SERVER_LIST("See list of servers"),
+    PAGE_NETWORK_PLAYERBASE("See Playerbase Overview -tab"),
+    PAGE_NETWORK_PLAYERBASE_OVERVIEW("See Playerbase Overview numbers"),
+    PAGE_NETWORK_PLAYERBASE_GRAPHS("See Playerbase Overview graphs"),
+    PAGE_NETWORK_SESSIONS("See Sessions tab"),
+    PAGE_NETWORK_SESSIONS_OVERVIEW("See Session insights"),
+    PAGE_NETWORK_SESSIONS_WORLD_PIE("See World Pie graph"),
+    PAGE_NETWORK_SESSIONS_SERVER_PIE("See Server Pie graph"),
+    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"),
+    @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"),
+    PAGE_NETWORK_GEOLOCATIONS_MAP("See Geolocations Map"),
+    PAGE_NETWORK_GEOLOCATIONS_PING_PER_COUNTRY("See Ping Per Country table"),
+    PAGE_NETWORK_PLAYERS("See Player list -tab"),
+    PAGE_NETWORK_PERFORMANCE("See network Performance tab"),
+    PAGE_NETWORK_PLUGIN_HISTORY("See Plugin History across the network"),
+    PAGE_NETWORK_PLUGINS("See Plugins tab of Proxy"),
+
+    PAGE_SERVER("See all of server page"),
+    PAGE_SERVER_OVERVIEW("See Server Overview -tab"),
+    PAGE_SERVER_OVERVIEW_NUMBERS("See Server Overview numbers"),
+    PAGE_SERVER_OVERVIEW_PLAYERS_ONLINE_GRAPH("See Players Online graph"),
+    PAGE_SERVER_ONLINE_ACTIVITY("See Online Activity -tab"),
+    PAGE_SERVER_ONLINE_ACTIVITY_OVERVIEW("See Online Activity numbers"),
+    PAGE_SERVER_ONLINE_ACTIVITY_GRAPHS("See Online Activity graphs"),
+    PAGE_SERVER_ONLINE_ACTIVITY_GRAPHS_DAY_BY_DAY("See Day by Day graph"),
+    PAGE_SERVER_ONLINE_ACTIVITY_GRAPHS_HOUR_BY_HOUR("See Hour by Hour graph"),
+    PAGE_SERVER_ONLINE_ACTIVITY_GRAPHS_PUNCHCARD("See Punchcard graph"),
+    PAGE_SERVER_ONLINE_ACTIVITY_GRAPHS_CALENDAR("See Server calendar"),
+    PAGE_SERVER_PLAYERBASE("See Playerbase Overview -tab"),
+    PAGE_SERVER_PLAYERBASE_OVERVIEW("See Playerbase Overview numbers"),
+    PAGE_SERVER_PLAYERBASE_GRAPHS("See Playerbase Overview graphs"),
+    PAGE_SERVER_PLAYER_VERSUS("See PvP & PvE -tab"),
+    PAGE_SERVER_PLAYER_VERSUS_OVERVIEW("See PvP & PvE numbers"),
+    PAGE_SERVER_PLAYER_VERSUS_KILL_LIST("See Player kill and death lists"),
+    PAGE_SERVER_PLAYERS("See Player list -tab"),
+    PAGE_SERVER_SESSIONS("See Sessions tab"),
+    PAGE_SERVER_SESSIONS_OVERVIEW("See Session insights"),
+    PAGE_SERVER_SESSIONS_WORLD_PIE("See World Pie graph"),
+    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"),
+    @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"),
+    PAGE_SERVER_GEOLOCATIONS_MAP("See Geolocations Map"),
+    PAGE_SERVER_GEOLOCATIONS_PING_PER_COUNTRY("See Ping Per Country table"),
+    PAGE_SERVER_PERFORMANCE("See Performance tab"),
+    PAGE_SERVER_PERFORMANCE_GRAPHS("See Performance graphs"),
+    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"),
+    PAGE_PLAYER_SESSIONS("See Player Sessions -tab"),
+    PAGE_PLAYER_VERSUS("See PvP & PvE -tab"),
+    PAGE_PLAYER_SERVERS("See Servers -tab"),
+    PAGE_PLAYER_PLUGINS("See Plugins -tabs"),
+
+    ACCESS("Controls access to pages"),
+    ACCESS_PLAYER("Allows accessing any /player pages"),
+    ACCESS_PLAYER_SELF("Allows accessing own /player page"),
+    ACCESS_RAW_PLAYER_DATA("Allows accessing /player/{uuid}/raw json data. Follows 'access.player' permissions."),
+    // Restricting to specific servers: access.server.uuid
+    ACCESS_SERVER("Allows accessing all /server pages"),
+    ACCESS_NETWORK("Allows accessing /network page"),
+    ACCESS_PLAYERS("Allows accessing /players page"),
+    ACCESS_QUERY("Allows accessing /query and Query results pages"),
+    ACCESS_ERRORS("Allows accessing /errors page"),
+    ACCESS_DOCS("Allows accessing /docs page"),
+
+    MANAGE_GROUPS("Allows modifying group permissions & Access to /manage/groups page"),
+    MANAGE_USERS("Allows modifying what users belong to what group");
+
+    private final String description;
+    private final boolean deprecated;
+
+    WebPermission(String description) {
+        this(description, false);
+    }
+
+    WebPermission(String description, boolean deprecated) {
+        this.description = description;
+        this.deprecated = deprecated;
+    }
+
+    public String getPermission() {
+        return StringUtils.lowerCase(name()).replace('_', '.');
+    }
+
+    public boolean isDeprecated() {
+        return deprecated;
+    }
+
+    @Override
+    public String get() {
+        return getPermission();
+    }
+
+    @Override
+    public String getIdentifier() {
+        return "HTML - Permission " + name();
+    }
+
+    @Override
+    public String getKey() {
+        return "html.manage.permission.description." + name().toLowerCase();
+    }
+
+    @Override
+    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/auth/WebPermissionList.java

@@ -0,0 +1,58 @@
+/*
+ *  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.auth;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Represents a list of web permissions.
+ *
+ * @author AuroraLS3
+ */
+public class WebPermissionList {
+
+    private final List<String> permissions;
+
+    public WebPermissionList(List<String> permissions) {
+        this.permissions = permissions;
+    }
+
+    public List<String> getPermissions() {
+        return permissions;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        WebPermissionList that = (WebPermissionList) o;
+        return Objects.equals(getPermissions(), that.getPermissions());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getPermissions());
+    }
+
+    @Override
+    public String toString() {
+        return "PermissionList{" +
+                "permissions=" + permissions +
+                '}';
+    }
+}

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

@@ -139,7 +139,6 @@ public interface DataContainer {
 
     /**
      * Get formatted Value identified by the Key.
-     * <p>
      *
      * @param key       Key that identifies the Value
      * @param formatter Formatter for the Optional returned by {@link DataContainer#getValue(Key)}

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/PlayerListDto.java

@@ -0,0 +1,51 @@
+/*
+ *  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.delivery.domain.datatransfer.extension.ExtensionDescriptionDto;
+
+import java.util.List;
+
+/**
+ * @author AuroraLS3
+ */
+public class PlayerListDto {
+
+    private final List<TablePlayerDto> players;
+    private final List<ExtensionDescriptionDto> extensionDescriptors;
+
+    public PlayerListDto(List<TablePlayerDto> players, List<ExtensionDescriptionDto> extensionDescriptors) {
+        this.players = players;
+        this.extensionDescriptors = extensionDescriptors;
+    }
+
+    public List<TablePlayerDto> getPlayers() {
+        return players;
+    }
+
+    public List<ExtensionDescriptionDto> getExtensionDescriptors() {
+        return extensionDescriptors;
+    }
+
+    @Override
+    public String toString() {
+        return "PlayerListDto{" +
+                "players=" + players +
+                ", extensionDescriptors=" + extensionDescriptors +
+                '}';
+    }
+}

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

@@ -0,0 +1,60 @@
+/*
+ *  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.delivery.domain.PluginHistoryMetadata;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * History of plugin versions, sorted most recent first.
+ *
+ * @author AuroraLS3
+ */
+public class PluginHistoryDto {
+
+    private final List<PluginHistoryMetadata> history;
+
+    public PluginHistoryDto(List<PluginHistoryMetadata> history) {
+        this.history = history;
+    }
+
+    public List<PluginHistoryMetadata> getHistory() {
+        return history;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PluginHistoryDto that = (PluginHistoryDto) o;
+        return Objects.equals(getHistory(), that.getHistory());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getHistory());
+    }
+
+    @Override
+    public String toString() {
+        return "PluginHistoryDto{" +
+                "history=" + history +
+                '}';
+    }
+}

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

@@ -0,0 +1,211 @@
+/*
+ *  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.delivery.domain.datatransfer.extension.ExtensionValueDataDto;
+import com.djrapitops.plan.gathering.domain.Ping;
+
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Represents a row for players table.
+ *
+ * @author AuroraLS3
+ */
+public class TablePlayerDto {
+
+    private UUID playerUUID;
+    private String playerName;
+    private double activityIndex;
+    private Long playtimeActive;
+    private Long sessionCount;
+    private Long lastSeen;
+    private Long registered;
+    private String country;
+    private Double pingAverage;
+    private Integer pingMax;
+    private Integer pingMin;
+
+    private Map<String, ExtensionValueDataDto> extensionValues;
+
+    private TablePlayerDto() {
+        // Builder constructor
+    }
+
+    public static TablePlayerDtoBuilder builder() {
+        return new TablePlayerDtoBuilder();
+    }
+
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    private void setPlayerName(String playerName) {
+        this.playerName = playerName;
+    }
+
+    public double getActivityIndex() {
+        return activityIndex;
+    }
+
+    private void setActivityIndex(double activityIndex) {
+        this.activityIndex = activityIndex;
+    }
+
+    public Long getPlaytimeActive() {
+        return playtimeActive;
+    }
+
+    private void setPlaytimeActive(Long playtimeActive) {
+        this.playtimeActive = playtimeActive;
+    }
+
+    public Long getSessionCount() {
+        return sessionCount;
+    }
+
+    private void setSessionCount(Long sessionCount) {
+        this.sessionCount = sessionCount;
+    }
+
+    public Long getLastSeen() {
+        return lastSeen;
+    }
+
+    private void setLastSeen(Long lastSeen) {
+        this.lastSeen = lastSeen;
+    }
+
+    public Long getRegistered() {
+        return registered;
+    }
+
+    private void setRegistered(Long registered) {
+        this.registered = registered;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    private void setCountry(String country) {
+        this.country = country;
+    }
+
+    public Map<String, ExtensionValueDataDto> getExtensionValues() {
+        return extensionValues;
+    }
+
+    private void setExtensionValues(Map<String, ExtensionValueDataDto> extensionValues) {
+        this.extensionValues = extensionValues;
+    }
+
+    public UUID getPlayerUUID() {
+        return playerUUID;
+    }
+
+    public void setPlayerUUID(UUID playerUUID) {
+        this.playerUUID = playerUUID;
+    }
+
+    public Double getPingAverage() {
+        return pingAverage;
+    }
+
+    public void setPingAverage(Double pingAverage) {
+        this.pingAverage = pingAverage;
+    }
+
+    public Integer getPingMax() {
+        return pingMax;
+    }
+
+    public void setPingMax(Integer pingMax) {
+        this.pingMax = pingMax;
+    }
+
+    public Integer getPingMin() {
+        return pingMin;
+    }
+
+    public void setPingMin(Integer pingMin) {
+        this.pingMin = pingMin;
+    }
+
+    public static final class TablePlayerDtoBuilder {
+        private final TablePlayerDto tablePlayerDto;
+
+        private TablePlayerDtoBuilder() {tablePlayerDto = new TablePlayerDto();}
+
+        public TablePlayerDtoBuilder withUuid(UUID playerUUID) {
+            tablePlayerDto.setPlayerUUID(playerUUID);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withName(String name) {
+            tablePlayerDto.setPlayerName(name);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withActivityIndex(double activityIndex) {
+            tablePlayerDto.setActivityIndex(activityIndex);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withPlaytimeActive(Long playtimeActive) {
+            tablePlayerDto.setPlaytimeActive(playtimeActive);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withSessionCount(Long sessionCount) {
+            tablePlayerDto.setSessionCount(sessionCount);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withLastSeen(Long lastSeen) {
+            tablePlayerDto.setLastSeen(lastSeen);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withRegistered(Long registered) {
+            tablePlayerDto.setRegistered(registered);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withCountry(String country) {
+            tablePlayerDto.setCountry(country);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withExtensionValues(Map<String, ExtensionValueDataDto> extensionValues) {
+            tablePlayerDto.setExtensionValues(extensionValues);
+            return this;
+        }
+
+        public TablePlayerDtoBuilder withPing(Ping ping) {
+            if (ping != null) {
+                tablePlayerDto.setPingAverage(ping.getAverage());
+                tablePlayerDto.setPingMax(ping.getMax());
+                tablePlayerDto.setPingMin(ping.getMin());
+            }
+            return this;
+        }
+
+        public TablePlayerDto build() {return tablePlayerDto;}
+    }
+}

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

@@ -16,12 +16,14 @@
  */
 package com.djrapitops.plan.delivery.domain.datatransfer.extension;
 
-import com.djrapitops.plan.delivery.formatting.Formatter;
 import com.djrapitops.plan.delivery.formatting.Formatters;
 import com.djrapitops.plan.extension.FormatType;
 import com.djrapitops.plan.extension.implementation.results.ExtensionTabData;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class ExtensionTabDataDto {
@@ -36,25 +38,29 @@ public class ExtensionTabDataDto {
         tableData = extensionTabData.getTableData().stream().map(ExtensionTableDataDto::new).collect(Collectors.toList());
     }
 
-    private List<ExtensionValueDataDto> constructValues(List<String> order, ExtensionTabData tabData) {
+    public static Optional<ExtensionValueDataDto> mapToValue(ExtensionTabData tabData, String key) {
         Formatters formatters = Formatters.getInstance();
-        Formatter<Double> decimalFormatter = formatters.decimals();
-        Formatter<Double> percentageFormatter = formatters.percentage();
 
-        Map<FormatType, Formatter<Long>> numberFormatters = new EnumMap<>(FormatType.class);
-        numberFormatters.put(FormatType.DATE_SECOND, formatters.secondLong());
-        numberFormatters.put(FormatType.DATE_YEAR, formatters.yearLong());
-        numberFormatters.put(FormatType.TIME_MILLISECONDS, formatters.timeAmount());
-        numberFormatters.put(FormatType.NONE, Object::toString);
+        Optional<ExtensionValueDataDto> booleanValue = tabData.getBoolean(key).map(data -> new ExtensionValueDataDto(data.getDescription(), "BOOLEAN", data.getFormattedValue()));
+        if (booleanValue.isPresent()) return booleanValue;
+        Optional<ExtensionValueDataDto> doubleValue = tabData.getDouble(key).map(data -> new ExtensionValueDataDto(data.getDescription(), "DOUBLE", data.getFormattedValue(formatters.decimals())));
+        if (doubleValue.isPresent()) return doubleValue;
+        Optional<ExtensionValueDataDto> percentage = tabData.getPercentage(key).map(data -> new ExtensionValueDataDto(data.getDescription(), "PERCENTAGE", data.getFormattedValue(formatters.percentage())));
+        if (percentage.isPresent()) return percentage;
+        Optional<ExtensionValueDataDto> number = tabData.getNumber(key).map(data -> new ExtensionValueDataDto(data.getDescription(), data.getFormatType() == FormatType.NONE ? "NUMBER" : data.getFormatType().name(), data.getFormattedValue(formatters.getNumberFormatter(data.getFormatType()))));
+        if (number.isPresent()) return number;
+        Optional<ExtensionValueDataDto> string = tabData.getString(key).map(data -> new ExtensionValueDataDto(data.getDescription(), data.isPlayerName() ? "LINK" : "STRING", data.getFormattedValue()));
+        if (string.isPresent()) return string;
+
+        // If component is not found either return empty Optional.
+        return tabData.getComponent(key).map(data -> new ExtensionValueDataDto(data.getDescription(), "COMPONENT", data.getFormattedValue()));
+    }
+
+    private List<ExtensionValueDataDto> constructValues(List<String> order, ExtensionTabData tabData) {
 
         List<ExtensionValueDataDto> extensionValues = new ArrayList<>();
         for (String key : order) {
-            tabData.getBoolean(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), "BOOLEAN", data.getFormattedValue())));
-            tabData.getDouble(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), "DOUBLE", data.getFormattedValue(decimalFormatter))));
-            tabData.getPercentage(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), "PERCENTAGE", data.getFormattedValue(percentageFormatter))));
-            tabData.getNumber(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), data.getFormatType() == FormatType.NONE ? "NUMBER" : data.getFormatType().name(), data.getFormattedValue(numberFormatters.get(data.getFormatType())))));
-            tabData.getString(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), data.isPlayerName() ? "HTML" : "STRING", data.getFormattedValue())));
-            tabData.getComponent(key).ifPresent(data -> extensionValues.add(new ExtensionValueDataDto(data.getDescription(), "COMPONENT", data.getFormattedValue())));
+            mapToValue(tabData, key).ifPresent(extensionValues::add);
         }
         return extensionValues;
     }

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

@@ -16,8 +16,11 @@
  */
 package com.djrapitops.plan.delivery.domain.datatransfer.extension;
 
-import com.djrapitops.plan.delivery.rendering.html.structure.HtmlTable;
+import com.djrapitops.plan.delivery.formatting.Formatters;
+import com.djrapitops.plan.delivery.rendering.html.Html;
 import com.djrapitops.plan.extension.table.Table;
+import com.djrapitops.plan.extension.table.TableColumnFormat;
+import org.apache.commons.text.StringEscapeUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,11 +44,48 @@ public class TableDto {
                 .map(IconDto::new)
                 .collect(Collectors.toList());
 
-        rows = HtmlTable.mapToRows(table.getRows(), table.getTableColumnFormats()).stream()
+        rows = mapToRows(table.getRows(), table.getTableColumnFormats()).stream()
                 .map(row -> constructRow(columns, row))
                 .collect(Collectors.toList());
     }
 
+    public static List<TableCellDto[]> mapToRows(List<Object[]> rows, TableColumnFormat[] tableColumnFormats) {
+        return rows.stream()
+                .map(row -> {
+                    List<TableCellDto> mapped = new ArrayList<>(row.length);
+                    for (int i = 0; i < row.length; i++) {
+                        Object value = row[i];
+                        if (value == null) {
+                            mapped.add(null);
+                        } else {
+                            TableColumnFormat format = tableColumnFormats[i];
+                            mapped.add(new TableCellDto(applyFormat(format, value), value));
+                        }
+                    }
+                    return mapped.toArray(new TableCellDto[0]);
+                })
+                .collect(Collectors.toList());
+    }
+
+    public static String applyFormat(TableColumnFormat format, Object value) {
+        try {
+            switch (format) {
+                case TIME_MILLISECONDS:
+                    return Formatters.getInstance().timeAmount().apply(Long.parseLong(value.toString()));
+                case DATE_YEAR:
+                    return Formatters.getInstance().yearLong().apply(Long.parseLong(value.toString()));
+                case DATE_SECOND:
+                    return Formatters.getInstance().secondLong().apply(Long.parseLong(value.toString()));
+                case PLAYER_NAME:
+                    return Html.LINK.create("../player/" + Html.encodeToURL(value.toString()), StringEscapeUtils.escapeHtml4(value.toString()));
+                default:
+                    return value.toString();
+            }
+        } catch (Exception e) {
+            return Objects.toString(value);
+        }
+    }
+
     private List<TableCellDto> constructRow(List<String> columns, TableCellDto[] row) {
         List<TableCellDto> constructedRow = new ArrayList<>();
 

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/domain/datatransfer/preferences/GraphThresholds.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.delivery.domain.datatransfer.preferences;
+
+import java.util.Objects;
+
+/**
+ * @author AuroraLS3
+ */
+public class GraphThresholds {
+
+    private double highThreshold;
+    private double mediumThreshold;
+
+    public GraphThresholds(double highThreshold, double mediumThreshold) {
+        this.highThreshold = highThreshold;
+        this.mediumThreshold = mediumThreshold;
+    }
+
+    public double getHighThreshold() {
+        return highThreshold;
+    }
+
+    public void setHighThreshold(int highThreshold) {
+        this.highThreshold = highThreshold;
+    }
+
+    public double getMediumThreshold() {
+        return mediumThreshold;
+    }
+
+    public void setMediumThreshold(int mediumThreshold) {
+        this.mediumThreshold = mediumThreshold;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GraphThresholds that = (GraphThresholds) o;
+        return getHighThreshold() == that.getHighThreshold() && getMediumThreshold() == that.getMediumThreshold();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getHighThreshold(), getMediumThreshold());
+    }
+
+    @Override
+    public String toString() {
+        return "GraphThresholds{" +
+                "highThreshold=" + highThreshold +
+                ", mediumThreshold=" + mediumThreshold +
+                '}';
+    }
+}

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

@@ -0,0 +1,212 @@
+/*
+ *  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.preferences;
+
+import java.util.Objects;
+
+/**
+ * @author AuroraLS3
+ */
+public class Preferences {
+
+    private boolean recentDaysInDateFormat;
+    private String dateFormatFull;
+    private String dateFormatNoSeconds;
+    private String dateFormatClock;
+    private TimeFormat timeFormat;
+    private String decimalFormat;
+    private int firstDay;
+
+    private String playerHeadImageUrl;
+
+    private GraphThresholds tpsThresholds;
+    private GraphThresholds diskThresholds;
+
+    private Preferences() {
+    }
+
+    public static Builder builder() {
+        return new Preferences.Builder();
+    }
+
+    public boolean isRecentDaysInDateFormat() {
+        return recentDaysInDateFormat;
+    }
+
+    private void setRecentDaysInDateFormat(boolean recentDaysInDateFormat) {
+        this.recentDaysInDateFormat = recentDaysInDateFormat;
+    }
+
+    public String getDateFormatFull() {
+        return dateFormatFull;
+    }
+
+    private void setDateFormatFull(String dateFormatFull) {
+        this.dateFormatFull = dateFormatFull;
+    }
+
+    public String getDateFormatNoSeconds() {
+        return dateFormatNoSeconds;
+    }
+
+    private void setDateFormatNoSeconds(String dateFormatNoSeconds) {
+        this.dateFormatNoSeconds = dateFormatNoSeconds;
+    }
+
+    public String getDateFormatClock() {
+        return dateFormatClock;
+    }
+
+    private void setDateFormatClock(String dateFormatClock) {
+        this.dateFormatClock = dateFormatClock;
+    }
+
+    public TimeFormat getTimeFormat() {
+        return timeFormat;
+    }
+
+    private void setTimeFormat(TimeFormat timeFormat) {
+        this.timeFormat = timeFormat;
+    }
+
+    public String getDecimalFormat() {
+        return decimalFormat;
+    }
+
+    private void setDecimalFormat(String decimalFormat) {
+        this.decimalFormat = decimalFormat;
+    }
+
+    public int getFirstDay() {
+        return firstDay;
+    }
+
+    private void setFirstDay(int firstDay) {
+        this.firstDay = firstDay;
+    }
+
+    public String getPlayerHeadImageUrl() {
+        return playerHeadImageUrl;
+    }
+
+    private void setPlayerHeadImageUrl(String playerHeadImageUrl) {
+        this.playerHeadImageUrl = playerHeadImageUrl;
+    }
+
+    public GraphThresholds getTpsThresholds() {
+        return tpsThresholds;
+    }
+
+    private void setTpsThresholds(GraphThresholds tpsThresholds) {
+        this.tpsThresholds = tpsThresholds;
+    }
+
+    public GraphThresholds getDiskThresholds() {
+        return diskThresholds;
+    }
+
+    private void setDiskThresholds(GraphThresholds diskThresholds) {
+        this.diskThresholds = diskThresholds;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Preferences that = (Preferences) o;
+        return isRecentDaysInDateFormat() == that.isRecentDaysInDateFormat() && getFirstDay() == that.getFirstDay() && Objects.equals(getDateFormatFull(), that.getDateFormatFull()) && Objects.equals(getDateFormatNoSeconds(), that.getDateFormatNoSeconds()) && Objects.equals(getDateFormatClock(), that.getDateFormatClock()) && Objects.equals(getTimeFormat(), that.getTimeFormat()) && Objects.equals(getDecimalFormat(), that.getDecimalFormat()) && Objects.equals(getPlayerHeadImageUrl(), that.getPlayerHeadImageUrl()) && Objects.equals(getTpsThresholds(), that.getTpsThresholds()) && Objects.equals(getDiskThresholds(), that.getDiskThresholds());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(isRecentDaysInDateFormat(), getDateFormatFull(), getDateFormatNoSeconds(), getDateFormatClock(), getTimeFormat(), getDecimalFormat(), getFirstDay(), getPlayerHeadImageUrl(), getTpsThresholds(), getDiskThresholds());
+    }
+
+    @Override
+    public String toString() {
+        return "Preferences{" +
+                "recentDaysInDateFormat=" + recentDaysInDateFormat +
+                ", dateFormatFull='" + dateFormatFull + '\'' +
+                ", dateFormatNoSeconds='" + dateFormatNoSeconds + '\'' +
+                ", dateFormatClock='" + dateFormatClock + '\'' +
+                ", timeFormat=" + timeFormat +
+                ", decimalFormat='" + decimalFormat + '\'' +
+                ", firstDay=" + firstDay +
+                ", playerHeadImageUrl='" + playerHeadImageUrl + '\'' +
+                ", tpsThresholds=" + tpsThresholds +
+                ", diskThresholds=" + diskThresholds +
+                '}';
+    }
+
+    public static final class Builder {
+        private final Preferences preferences;
+
+        private Builder() {preferences = new Preferences();}
+
+        public Builder withRecentDaysInDateFormat(boolean recentDaysInDateFormat) {
+            preferences.setRecentDaysInDateFormat(recentDaysInDateFormat);
+            return this;
+        }
+
+        public Builder withDateFormatFull(String dateFormatFull) {
+            preferences.setDateFormatFull(dateFormatFull);
+            return this;
+        }
+
+        public Builder withDateFormatNoSeconds(String dateFormatNoSeconds) {
+            preferences.setDateFormatNoSeconds(dateFormatNoSeconds);
+            return this;
+        }
+
+        public Builder withDateFormatClock(String dateFormatClock) {
+            preferences.setDateFormatClock(dateFormatClock);
+            return this;
+        }
+
+        public Builder withTimeFormat(TimeFormat timeFormat) {
+            preferences.setTimeFormat(timeFormat);
+            return this;
+        }
+
+        public Builder withDecimalFormat(String decimalFormat) {
+            preferences.setDecimalFormat(decimalFormat);
+            return this;
+        }
+
+        public Builder withFirstDay(int firstDay) {
+            preferences.setFirstDay(firstDay);
+            return this;
+        }
+
+        public Builder withPlayerHeadImageUrl(String playerHeadImageUrl) {
+            preferences.setPlayerHeadImageUrl(playerHeadImageUrl);
+            return this;
+        }
+
+        public Builder withTpsThresholds(GraphThresholds tpsThresholds) {
+            preferences.setTpsThresholds(tpsThresholds);
+            return this;
+        }
+
+        public Builder withDiskThresholds(GraphThresholds diskThresholds) {
+            preferences.setDiskThresholds(diskThresholds);
+            return this;
+        }
+
+        public Preferences build() {return preferences;}
+    }
+}

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

@@ -0,0 +1,210 @@
+/*
+ *  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.preferences;
+
+import java.util.Objects;
+
+/**
+ * @author AuroraLS3
+ */
+public class TimeFormat {
+    private String year;
+    private String years;
+    private String month;
+    private String months;
+    private String day;
+    private String days;
+    private String hours;
+    private String minutes;
+    private String seconds;
+    private String zero;
+
+    private TimeFormat() {
+        // Constructor is private for builder
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    private void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getYears() {
+        return years;
+    }
+
+    private void setYears(String years) {
+        this.years = years;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    private void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getMonths() {
+        return months;
+    }
+
+    private void setMonths(String months) {
+        this.months = months;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    private void setDay(String day) {
+        this.day = day;
+    }
+
+    public String getDays() {
+        return days;
+    }
+
+    private void setDays(String days) {
+        this.days = days;
+    }
+
+    public String getHours() {
+        return hours;
+    }
+
+    private void setHours(String hours) {
+        this.hours = hours;
+    }
+
+    public String getMinutes() {
+        return minutes;
+    }
+
+    private void setMinutes(String minutes) {
+        this.minutes = minutes;
+    }
+
+    public String getSeconds() {
+        return seconds;
+    }
+
+    private void setSeconds(String seconds) {
+        this.seconds = seconds;
+    }
+
+    public String getZero() {
+        return zero;
+    }
+
+    private void setZero(String zero) {
+        this.zero = zero;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TimeFormat that = (TimeFormat) o;
+        return Objects.equals(getYear(), that.getYear()) && Objects.equals(getYears(), that.getYears()) && Objects.equals(getMonth(), that.getMonth()) && Objects.equals(getMonths(), that.getMonths()) && Objects.equals(getDay(), that.getDay()) && Objects.equals(getDays(), that.getDays()) && Objects.equals(getHours(), that.getHours()) && Objects.equals(getMinutes(), that.getMinutes()) && Objects.equals(getSeconds(), that.getSeconds()) && Objects.equals(getZero(), that.getZero());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getYear(), getYears(), getMonth(), getMonths(), getDay(), getDays(), getHours(), getMinutes(), getSeconds(), getZero());
+    }
+
+    @Override
+    public String toString() {
+        return "TimeFormat{" +
+                "year='" + year + '\'' +
+                ", years='" + years + '\'' +
+                ", month='" + month + '\'' +
+                ", months='" + months + '\'' +
+                ", day='" + day + '\'' +
+                ", days='" + days + '\'' +
+                ", hours='" + hours + '\'' +
+                ", minutes='" + minutes + '\'' +
+                ", seconds='" + seconds + '\'' +
+                ", zero='" + zero + '\'' +
+                '}';
+    }
+
+    public static final class Builder {
+        private final TimeFormat timeFormat;
+
+        private Builder() {timeFormat = new TimeFormat();}
+
+        public Builder withYear(String year) {
+            timeFormat.setYear(year);
+            return this;
+        }
+
+        public Builder withYears(String years) {
+            timeFormat.setYears(years);
+            return this;
+        }
+
+        public Builder withMonth(String month) {
+            timeFormat.setMonth(month);
+            return this;
+        }
+
+        public Builder withMonths(String months) {
+            timeFormat.setMonths(months);
+            return this;
+        }
+
+        public Builder withDay(String day) {
+            timeFormat.setDay(day);
+            return this;
+        }
+
+        public Builder withDays(String days) {
+            timeFormat.setDays(days);
+            return this;
+        }
+
+        public Builder withHours(String hours) {
+            timeFormat.setHours(hours);
+            return this;
+        }
+
+        public Builder withMinutes(String minutes) {
+            timeFormat.setMinutes(minutes);
+            return this;
+        }
+
+        public Builder withSeconds(String seconds) {
+            timeFormat.setSeconds(seconds);
+            return this;
+        }
+
+        public Builder withZero(String zero) {
+            timeFormat.setZero(zero);
+            return this;
+        }
+
+        public TimeFormat build() {return timeFormat;}
+    }
+}

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

@@ -38,15 +38,16 @@ import java.util.concurrent.TimeUnit;
  * <p>
  * Activity for a single week is calculated using {@code A(t) = (1 / (pi/2 * (t/T) + 1))}.
  * A(t) is based on function f(x) = 1 / (x + 1), which has property f(0) = 1, decreasing from there, but not in a straight line.
- * You can see the function plotted here https://www.wolframalpha.com/input/?i=1+%2F+(x%2B1)+from+-1+to+2
+ * You can see the function plotted <a href="https://www.wolframalpha.com/input/?i=1+%2F+(x%2B1)+from+-1+to+2">here</a>
  * <p>
  * To fine tune the curve pi/2 is used since it felt like a good curve.
  * <p>
  * Activity index A is calculated by using the formula:
  * {@code A = 5 - 5 * [A(t1) + A(t2) + A(t3)] / 3}
  * <p>
+ * <a href="https://www.wolframalpha.com/input/?i=plot+y+%3D+5+-+5+*+(1+%2F+(pi%2F2+*+x%2B1))+and+y+%3D1+and+y+%3D+2+and+y+%3D+3+and+y+%3D+3.75+from+-0.5+to+3">
  * Plot for A and limits
- * https://www.wolframalpha.com/input/?i=plot+y+%3D+5+-+5+*+(1+%2F+(pi%2F2+*+x%2B1))+and+y+%3D1+and+y+%3D+2+and+y+%3D+3+and+y+%3D+3.75+from+-0.5+to+3
+ * </a>
  * <p>
  * New Limits for A would thus be
  * {@code < 1: Inactive}
@@ -90,6 +91,16 @@ public class ActivityIndex {
         return getGroups(null);
     }
 
+    public static String[] getDefaultGroupLangKeys() {
+        return new String[]{
+                HtmlLang.INDEX_VERY_ACTIVE.getKey(),
+                HtmlLang.INDEX_ACTIVE.getKey(),
+                HtmlLang.INDEX_REGULAR.getKey(),
+                HtmlLang.INDEX_IRREGULAR.getKey(),
+                HtmlLang.INDEX_INACTIVE.getKey()
+        };
+    }
+
     public static String[] getGroups(Locale locale) {
         if (locale == null) {
             return new String[]{
@@ -158,24 +169,32 @@ public class ActivityIndex {
         return Math.abs(Math.log(other.value) - Math.log(value));
     }
 
-    public static String getGroup(double value) {
+    public static HtmlLang getGroupLang(double value) {
         if (value >= VERY_ACTIVE) {
-            return HtmlLang.INDEX_VERY_ACTIVE.getDefault();
+            return HtmlLang.INDEX_VERY_ACTIVE;
         } else if (value >= ACTIVE) {
-            return HtmlLang.INDEX_ACTIVE.getDefault();
+            return HtmlLang.INDEX_ACTIVE;
         } else if (value >= REGULAR) {
-            return HtmlLang.INDEX_REGULAR.getDefault();
+            return HtmlLang.INDEX_REGULAR;
         } else if (value >= IRREGULAR) {
-            return HtmlLang.INDEX_IRREGULAR.getDefault();
+            return HtmlLang.INDEX_IRREGULAR;
         } else {
-            return HtmlLang.INDEX_INACTIVE.getDefault();
+            return HtmlLang.INDEX_INACTIVE;
         }
     }
 
+    public static String getGroup(double value) {
+        return getGroupLang(value).getDefault();
+    }
+
     public String getGroup() {
         return getGroup(value);
     }
 
+    public String getGroupLang() {
+        return getGroupLang(value).getKey();
+    }
+
     public String getGroup(Locale locale) {
         if (value >= VERY_ACTIVE) {
             return locale.getString(HtmlLang.INDEX_VERY_ACTIVE);

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

@@ -20,7 +20,6 @@ import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.settings.config.PlanConfig;
 import com.djrapitops.plan.settings.config.paths.ExportSettings;
-import com.djrapitops.plan.settings.config.paths.PluginSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.objects.ServerQueries;
@@ -86,11 +85,6 @@ public class ExportScheduler extends PluginRunnable {
     }
 
     private void scheduleReactExport() {
-        if (config.isTrue(PluginSettings.LEGACY_FRONTEND) ||
-                config.isFalse(ExportSettings.SERVER_PAGE) &&
-                        config.isFalse(ExportSettings.PLAYER_PAGES) &&
-                        config.isFalse(ExportSettings.PLAYERS_PAGE)) {return;}
-
         runnableFactory.create(
                 new ExportTask(exporter, Exporter::exportReact, errorLogger)
         ).runTaskLaterAsynchronously(TimeAmount.toTicks(5, TimeUnit.SECONDS));

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

@@ -166,6 +166,12 @@ public class Exporter extends FileExporter {
     }
 
     public void exportReact() throws ExportException {
+        if (config.isFalse(ExportSettings.PLAYER_PAGES)
+                && config.isFalse(ExportSettings.SERVER_PAGE)
+                && config.isFalse(ExportSettings.PLAYERS_PAGE)) {
+            return;
+        }
+
         Path toDirectory = config.getPageExportPath();
 
         try {

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

@@ -16,23 +16,16 @@
  */
 package com.djrapitops.plan.delivery.export;
 
-import com.djrapitops.plan.delivery.rendering.pages.Page;
-import com.djrapitops.plan.delivery.rendering.pages.PageFactory;
-import com.djrapitops.plan.delivery.web.ResourceService;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.exception.NotFoundException;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
-import com.djrapitops.plan.delivery.web.resource.WebResource;
 import com.djrapitops.plan.delivery.webserver.resolver.json.RootJSONResolver;
 import com.djrapitops.plan.exceptions.WebUserAuthException;
 import com.djrapitops.plan.identification.Server;
 import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.PluginSettings;
-import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.file.PlanFiles;
-import com.djrapitops.plan.storage.file.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
@@ -54,25 +47,19 @@ public class NetworkPageExporter extends FileExporter {
     private final PlanFiles files;
     private final PlanConfig config;
     private final DBSystem dbSystem;
-    private final PageFactory pageFactory;
     private final RootJSONResolver jsonHandler;
-    private final Theme theme;
 
     @Inject
     public NetworkPageExporter(
             PlanFiles files,
             PlanConfig config,
             DBSystem dbSystem,
-            PageFactory pageFactory,
-            RootJSONResolver jsonHandler,
-            Theme theme
+            RootJSONResolver jsonHandler
     ) {
         this.files = files;
         this.config = config;
         this.dbSystem = dbSystem;
-        this.pageFactory = pageFactory;
         this.jsonHandler = jsonHandler;
-        this.theme = theme;
     }
 
     /**
@@ -89,35 +76,10 @@ public class NetworkPageExporter extends FileExporter {
 
         ExportPaths exportPaths = new ExportPaths();
         exportPaths.put("./players", toRelativePathFromRoot("players"));
-        exportRequiredResources(exportPaths, toDirectory);
         exportJSON(exportPaths, toDirectory, server);
-        exportHtml(exportPaths, toDirectory);
         exportReactRedirects(toDirectory);
     }
 
-    private void exportHtml(ExportPaths exportPaths, Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        Path to = toDirectory
-                .resolve("network")
-                .resolve("index.html");
-
-        Page page = pageFactory.networkPage();
-
-        // Fixes refreshingJsonRequest ignoring old data of export
-        String html = StringUtils.replaceEach(page.toHtml(),
-                new String[]{"loadPlayersOnlineGraph, 'network-overview', true);",
-                        "· Performance",
-                        "<head>"
-                },
-                new String[]{"loadPlayersOnlineGraph, 'network-overview');",
-                        "&middot; Performance (Unavailable with Export)",
-                        "<head><style>.refresh-element {display: none;}</style>"
-                });
-
-        export(to, exportPaths.resolveExportPaths(html));
-    }
-
     public static String[] getRedirections() {
         return new String[]{
                 "network",
@@ -134,8 +96,6 @@ public class NetworkPageExporter extends FileExporter {
     }
 
     private void exportReactRedirects(Path toDirectory) throws IOException {
-        if (config.isTrue(PluginSettings.LEGACY_FRONTEND)) return;
-
         exportReactRedirects(toDirectory, files, config, getRedirections());
     }
 
@@ -161,16 +121,17 @@ 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",
                 "graph?type=uniqueAndNew",
+                "graph?type=serverCalendar",
                 "network/pingTable",
                 "sessions",
                 "extensionData?server=" + serverUUID,
                 "retention",
-                "joinAddresses"
+                "joinAddresses",
+                "playersTable"
         );
     }
 
@@ -210,75 +171,6 @@ public class NetworkPageExporter extends FileExporter {
         }
     }
 
-    private void exportRequiredResources(ExportPaths exportPaths, Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        exportResources(exportPaths, toDirectory,
-                "./img/Flaticon_circle.png",
-                "./css/sb-admin-2.css",
-                "./css/style.css",
-                "./css/noauth.css",
-                "./vendor/datatables/datatables.min.js",
-                "./vendor/datatables/datatables.min.css",
-                "./vendor/highcharts/modules/map.js",
-                "./vendor/highcharts/mapdata/world.js",
-                "./vendor/highcharts/modules/drilldown.js",
-                "./vendor/highcharts/highcharts.js",
-                "./vendor/highcharts/modules/no-data-to-display.js",
-                "./vendor/masonry/masonry.pkgd.min.js",
-                "./vendor/fontawesome-free/css/all.min.css",
-                "./vendor/fontawesome-free/webfonts/fa-brands-400.eot",
-                "./vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
-                "./vendor/fontawesome-free/webfonts/fa-brands-400.woff",
-                "./vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
-                "./vendor/fontawesome-free/webfonts/fa-regular-400.eot",
-                "./vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
-                "./vendor/fontawesome-free/webfonts/fa-regular-400.woff",
-                "./vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
-                "./vendor/fontawesome-free/webfonts/fa-solid-900.eot",
-                "./vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
-                "./vendor/fontawesome-free/webfonts/fa-solid-900.woff",
-                "./vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
-                "./js/domUtils.js",
-                "./js/sb-admin-2.js",
-                "./js/xmlhttprequests.js",
-                "./js/color-selector.js",
-                "./js/sessionAccordion.js",
-                "./js/pingTable.js",
-                "./js/graphs.js",
-                "./js/network-values.js"
-        );
-    }
-
-    private void exportResources(ExportPaths exportPaths, Path toDirectory, String... resourceNames) throws IOException {
-        for (String resourceName : resourceNames) {
-            String nonRelativePath = toNonRelativePath(resourceName);
-            exportResource(toDirectory, nonRelativePath);
-            exportPaths.put(resourceName, toRelativePathFromRoot(nonRelativePath));
-        }
-    }
-
-    private void exportResource(Path toDirectory, String resourceName) throws IOException {
-        WebResource resource = ResourceService.getInstance().getResource("Plan", resourceName,
-                () -> files.getResourceFromJar("web/" + resourceName).asWebResource());
-        Path to = toDirectory.resolve(resourceName);
-
-        if (resourceName.endsWith(".css") || resourceName.endsWith("color-selector.js")) {
-            export(to, theme.replaceThemeColors(resource.asString()));
-        } else if ("js/network-values.js".equalsIgnoreCase(resourceName) || "js/sessionAccordion.js".equalsIgnoreCase(resourceName)) {
-            String relativePlayerLink = toRelativePathFromRoot("player");
-            String relativeServerLink = toRelativePathFromRoot("server/");
-            export(to, StringUtils.replaceEach(resource.asString(),
-                    new String[]{"../player", "./player", "./server/", "server/"},
-                    new String[]{relativePlayerLink, relativePlayerLink, relativeServerLink, relativeServerLink}
-            ));
-        } else if (Resource.isTextResource(resourceName)) {
-            export(to, resource.asString());
-        } else {
-            export(to, resource);
-        }
-    }
-
     private String toRelativePathFromRoot(String resourceName) {
         // Network html is exported at /network//index.html or /server/index.html
         return "../" + toNonRelativePath(resourceName);

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

@@ -16,25 +16,16 @@
  */
 package com.djrapitops.plan.delivery.export;
 
-import com.djrapitops.plan.delivery.domain.container.PlayerContainer;
-import com.djrapitops.plan.delivery.rendering.pages.Page;
-import com.djrapitops.plan.delivery.rendering.pages.PageFactory;
-import com.djrapitops.plan.delivery.web.ResourceService;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.exception.NotFoundException;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
-import com.djrapitops.plan.delivery.web.resource.WebResource;
 import com.djrapitops.plan.delivery.webserver.resolver.json.RootJSONResolver;
 import com.djrapitops.plan.exceptions.WebUserAuthException;
 import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.PluginSettings;
-import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.database.queries.PlayerFetchQueries;
-import com.djrapitops.plan.storage.database.queries.containers.ContainerFetchQueries;
 import com.djrapitops.plan.storage.file.PlanFiles;
-import com.djrapitops.plan.storage.file.Resource;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
@@ -56,25 +47,19 @@ public class PlayerPageExporter extends FileExporter {
     private final PlanFiles files;
     private final PlanConfig config;
     private final DBSystem dbSystem;
-    private final PageFactory pageFactory;
     private final RootJSONResolver jsonHandler;
-    private final Theme theme;
 
     @Inject
     public PlayerPageExporter(
             PlanFiles files,
             PlanConfig config,
             DBSystem dbSystem,
-            PageFactory pageFactory,
-            RootJSONResolver jsonHandler,
-            Theme theme
+            RootJSONResolver jsonHandler
     ) {
         this.files = files;
         this.config = config;
         this.dbSystem = dbSystem;
-        this.pageFactory = pageFactory;
         this.jsonHandler = jsonHandler;
-        this.theme = theme;
     }
 
     public static String[] getRedirections(UUID playerUUID) {
@@ -106,33 +91,14 @@ public class PlayerPageExporter extends FileExporter {
         ExportPaths exportPaths = new ExportPaths();
         exportPaths.put("../network", toRelativePathFromRoot("network"));
         exportPaths.put("../server/", toRelativePathFromRoot("server"));
-        exportRequiredResources(exportPaths, toDirectory);
 
         Path playerDirectory = toDirectory.resolve("player/" + toFileName(playerUUID.toString()));
         exportJSON(exportPaths, playerDirectory, playerUUID);
-        exportHtml(exportPaths, playerDirectory, playerUUID);
         exportReactRedirects(toDirectory, playerUUID);
         exportPaths.clear();
     }
 
-    private void exportHtml(ExportPaths exportPaths, Path playerDirectory, UUID playerUUID) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        Path to = playerDirectory.resolve("index.html");
-
-        try {
-            Database db = dbSystem.getDatabase();
-            PlayerContainer player = db.query(ContainerFetchQueries.fetchPlayerContainer(playerUUID));
-            Page page = pageFactory.playerPage(player);
-            export(to, exportPaths.resolveExportPaths(page.toHtml()));
-        } catch (IllegalStateException notFound) {
-            throw new NotFoundException(notFound.getMessage());
-        }
-    }
-
     private void exportReactRedirects(Path toDirectory, UUID playerUUID) throws IOException {
-        if (config.isTrue(PluginSettings.LEGACY_FRONTEND)) return;
-
         exportReactRedirects(toDirectory, files, config, getRedirections(playerUUID));
     }
 
@@ -163,70 +129,6 @@ public class PlayerPageExporter extends FileExporter {
         }
     }
 
-    private void exportRequiredResources(ExportPaths exportPaths, Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        // Style
-        exportResources(exportPaths, toDirectory,
-                "../img/Flaticon_circle.png",
-                "../css/sb-admin-2.css",
-                "../css/style.css",
-                "../css/noauth.css",
-                "../vendor/datatables/datatables.min.js",
-                "../vendor/datatables/datatables.min.css",
-                "../vendor/highcharts/modules/map.js",
-                "../vendor/highcharts/mapdata/world.js",
-                "../vendor/highcharts/modules/drilldown.js",
-                "../vendor/highcharts/highcharts.js",
-                "../vendor/highcharts/modules/no-data-to-display.js",
-                "../vendor/fullcalendar/fullcalendar.min.css",
-                "../vendor/momentjs/moment.js",
-                "../vendor/masonry/masonry.pkgd.min.js",
-                "../vendor/fullcalendar/fullcalendar.min.js",
-                "../vendor/fontawesome-free/css/all.min.css",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.eot",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.woff",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.eot",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.woff",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.eot",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.woff",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
-                "../js/sb-admin-2.js",
-                "../js/xmlhttprequests.js",
-                "../js/color-selector.js",
-                "../js/sessionAccordion.js",
-                "../js/graphs.js",
-                "../js/player-values.js"
-        );
-    }
-
-    private void exportResources(ExportPaths exportPaths, Path toDirectory, String... resourceNames) throws IOException {
-        for (String resourceName : resourceNames) {
-            String nonRelativePath = toNonRelativePath(resourceName);
-            exportResource(toDirectory, nonRelativePath);
-            exportPaths.put(resourceName, toRelativePathFromRoot(nonRelativePath));
-        }
-    }
-
-    private void exportResource(Path toDirectory, String resourceName) throws IOException {
-        WebResource resource = ResourceService.getInstance().getResource("Plan", resourceName,
-                () -> files.getResourceFromJar("web/" + resourceName).asWebResource());
-        Path to = toDirectory.resolve(resourceName);
-
-        if (resourceName.endsWith(".css") || resourceName.endsWith("color-selector.js")) {
-            export(to, theme.replaceThemeColors(resource.asString()));
-        } else if (Resource.isTextResource(resourceName)) {
-            export(to, resource.asString());
-        } else {
-            export(to, resource);
-        }
-    }
-
     private String toRelativePathFromRoot(String resourceName) {
         // Player html is exported at /player/<uuid>/index.html
         return "../../" + toNonRelativePath(resourceName);

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

@@ -16,23 +16,16 @@
  */
 package com.djrapitops.plan.delivery.export;
 
-import com.djrapitops.plan.delivery.rendering.pages.Page;
-import com.djrapitops.plan.delivery.rendering.pages.PageFactory;
-import com.djrapitops.plan.delivery.web.ResourceService;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.exception.NotFoundException;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
-import com.djrapitops.plan.delivery.web.resource.WebResource;
 import com.djrapitops.plan.delivery.webserver.resolver.json.RootJSONResolver;
 import com.djrapitops.plan.exceptions.WebUserAuthException;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.PluginSettings;
-import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.file.PlanFiles;
-import com.djrapitops.plan.storage.file.Resource;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
@@ -53,28 +46,23 @@ public class PlayersPageExporter extends FileExporter {
     private final PlanFiles files;
     private final PlanConfig config;
     private final DBSystem dbSystem;
-    private final PageFactory pageFactory;
     private final RootJSONResolver jsonHandler;
-    private final Theme theme;
     private final ServerInfo serverInfo;
 
     private final ExportPaths exportPaths;
+    private static final String PLAYERS_TABLE = "playersTable";
 
     @Inject
     public PlayersPageExporter(
             PlanFiles files,
             PlanConfig config, DBSystem dbSystem,
-            PageFactory pageFactory,
             RootJSONResolver jsonHandler,
-            Theme theme,
             ServerInfo serverInfo
     ) {
         this.files = files;
         this.config = config;
         this.dbSystem = dbSystem;
-        this.pageFactory = pageFactory;
         this.jsonHandler = jsonHandler;
-        this.theme = theme;
         this.serverInfo = serverInfo;
 
         exportPaths = new ExportPaths();
@@ -85,121 +73,42 @@ public class PlayersPageExporter extends FileExporter {
         if (dbState == Database.State.CLOSED || dbState == Database.State.CLOSING) return;
 
         exportPaths.put("href=\"/\"", "href=\"" + toRelativePathFromRoot(serverInfo.getServer().isProxy() ? "network" : "server") + '"');
-        exportRequiredResources(toDirectory);
         exportJSON(toDirectory);
-        exportHtml(toDirectory);
         exportReactRedirects(toDirectory);
         exportPaths.clear();
     }
 
-    private void exportHtml(Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        Path to = toDirectory
-                .resolve("players")
-                .resolve("index.html");
-
-        Page page = pageFactory.playersPage();
-
-        // Fixes refreshingJsonRequest ignoring old data of export
-        String html = StringUtils.replaceEach(page.toHtml(),
-                new String[]{
-                        "}, 'playerlist', true);",
-                        "<head>"
-                },
-                new String[]{
-                        "}, 'playerlist');",
-                        "<head><style>.refresh-element {display: none;}</style>"
-                });
-
-        export(to, exportPaths.resolveExportPaths(html));
-    }
-
     private void exportReactRedirects(Path toDirectory) throws IOException {
-        if (config.isTrue(PluginSettings.LEGACY_FRONTEND)) return;
-
         String[] redirections = {"players"};
         exportReactRedirects(toDirectory, files, config, redirections);
     }
 
     private void exportJSON(Path toDirectory) throws IOException {
-        Response response = getJSONResponse("players")
+        Response response = getJSONResponse()
                 .orElseThrow(() -> new NotFoundException("players page was not properly exported: not found"));
 
-        String jsonResourceName = toFileName(toJSONResourceName("players")) + ".json";
+        String jsonResourceName = toFileName(toJSONResourceName()) + ".json";
 
         export(toDirectory.resolve("data").resolve(jsonResourceName),
                 // Replace ../player in urls to fix player page links
                 StringUtils.replace(response.getAsString(), "../player", toRelativePathFromRoot("player"))
         );
-        exportPaths.put("./v1/players", toRelativePathFromRoot("data/" + jsonResourceName));
+        exportPaths.put("./v1/" + PLAYERS_TABLE, toRelativePathFromRoot("data/" + jsonResourceName));
     }
 
-    private String toJSONResourceName(String resource) {
-        return StringUtils.replaceEach(resource, new String[]{"?", "&", "type=", "server="}, new String[]{"-", "_", "", ""});
+    private String toJSONResourceName() {
+        return StringUtils.replaceEach(PLAYERS_TABLE, new String[]{"?", "&", "type=", "server="}, new String[]{"-", "_", "", ""});
     }
 
-    private Optional<Response> getJSONResponse(String resource) {
+    private Optional<Response> getJSONResponse() {
         try {
-            return jsonHandler.getResolver().resolve(new Request("GET", "/v1/" + resource, null, Collections.emptyMap()));
+            return jsonHandler.getResolver().resolve(new Request("GET", "/v1/" + PLAYERS_TABLE, null, Collections.emptyMap()));
         } catch (WebUserAuthException e) {
             // The rest of the exceptions should not be thrown
             throw new IllegalStateException("Unexpected exception thrown: " + e.toString(), e);
         }
     }
 
-    private void exportRequiredResources(Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        // Style
-        exportResources(toDirectory,
-                "img/Flaticon_circle.png",
-                "css/sb-admin-2.css",
-                "css/style.css",
-                "css/noauth.css",
-                "vendor/datatables/datatables.min.js",
-                "vendor/datatables/datatables.min.css",
-                "vendor/fontawesome-free/css/all.min.css",
-                "vendor/fontawesome-free/webfonts/fa-brands-400.eot",
-                "vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
-                "vendor/fontawesome-free/webfonts/fa-brands-400.woff",
-                "vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
-                "vendor/fontawesome-free/webfonts/fa-regular-400.eot",
-                "vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
-                "vendor/fontawesome-free/webfonts/fa-regular-400.woff",
-                "vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
-                "vendor/fontawesome-free/webfonts/fa-solid-900.eot",
-                "vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
-                "vendor/fontawesome-free/webfonts/fa-solid-900.woff",
-                "vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
-                "js/sb-admin-2.js",
-                "js/xmlhttprequests.js",
-                "js/color-selector.js"
-        );
-    }
-
-    private void exportResources(Path toDirectory, String... resourceNames) throws IOException {
-        for (String resourceName : resourceNames) {
-            exportResource(toDirectory, resourceName);
-        }
-    }
-
-    private void exportResource(Path toDirectory, String resourceName) throws IOException {
-        WebResource resource = ResourceService.getInstance().getResource("Plan", resourceName,
-                () -> files.getResourceFromJar("web/" + resourceName).asWebResource());
-        Path to = toDirectory.resolve(resourceName);
-
-        if (resourceName.endsWith(".css") || resourceName.endsWith("color-selector.js")) {
-            export(to, theme.replaceThemeColors(resource.asString()));
-        } else if (Resource.isTextResource(resourceName)) {
-            export(to, resource.asString());
-        } else {
-            export(to, resource);
-        }
-
-        exportPaths.put(resourceName, toRelativePathFromRoot(resourceName));
-    }
-
     private String toRelativePathFromRoot(String resourceName) {
         // Players html is exported at /players/index.html or /server/index.html
         return "../" + toNonRelativePath(resourceName);

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

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.delivery.export;
 
+import com.djrapitops.plan.delivery.rendering.BundleAddressCorrection;
 import com.djrapitops.plan.delivery.web.AssetVersions;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
@@ -52,23 +53,25 @@ public class ReactExporter extends FileExporter {
     private final PlanConfig config;
     private final RootJSONResolver jsonHandler;
     private final AssetVersions assetVersions;
+    private final BundleAddressCorrection bundleAddressCorrection;
 
     @Inject
     public ReactExporter(
             PlanFiles files,
             PlanConfig config,
             RootJSONResolver jsonHandler,
-            AssetVersions assetVersions
+            AssetVersions assetVersions,
+            BundleAddressCorrection bundleAddressCorrection
     ) {
         this.files = files;
         this.config = config;
         this.jsonHandler = jsonHandler;
         this.assetVersions = assetVersions;
+        this.bundleAddressCorrection = bundleAddressCorrection;
     }
 
     public void exportReactFiles(Path toDirectory) throws IOException {
         exportIndexHtml(toDirectory);
-        exportAsset(toDirectory, "asset-manifest.json");
         exportAsset(toDirectory, "favicon.ico");
         exportAsset(toDirectory, "logo192.png");
         exportAsset(toDirectory, "logo512.png");
@@ -84,6 +87,7 @@ public class ReactExporter extends FileExporter {
         exportJson(toDirectory, "metadata");
         exportJson(toDirectory, "version");
         exportJson(toDirectory, "networkMetadata");
+        exportJson(toDirectory, "preferences");
     }
 
     private void exportLocaleJson(Path toDirectory) throws IOException {
@@ -103,17 +107,18 @@ public class ReactExporter extends FileExporter {
             Path to = toDirectory.resolve(path);
             Resource resource = files.getResourceFromJar("web/" + path);
             // Make static asset loading work with subdirectory addresses
-            if (path.endsWith(".css") || "asset-manifest.json".equals(path)) {
+            if (path.endsWith(".css")) {
                 String contents = resource.asString();
-                String withReplacedStatic = StringUtils.replace(contents, "/static", getBasePath() + "/static");
-                export(to, withReplacedStatic);
+                String withReplaced = bundleAddressCorrection.correctAddressForExport(contents, path);
+                export(to, withReplaced);
             } else if (path.endsWith(".js")) {
                 String withReplacedConstants = StringUtils.replaceEach(
                         resource.asString(),
-                        new String[]{"PLAN_BASE_ADDRESS", "PLAN_EXPORTED_VERSION", ".p=\"/\""},
-                        new String[]{config.get(WebserverSettings.EXTERNAL_LINK), "true", ".p=\"" + getBasePath() + "/\""}
+                        new String[]{"PLAN_BASE_ADDRESS", "PLAN_EXPORTED_VERSION"},
+                        new String[]{config.get(WebserverSettings.EXTERNAL_LINK), "true"}
                 );
-                export(to, withReplacedConstants);
+                String withReplaced = bundleAddressCorrection.correctAddressForExport(withReplacedConstants, path);
+                export(to, withReplaced);
             } else {
                 export(to, resource);
             }
@@ -140,25 +145,11 @@ public class ReactExporter extends FileExporter {
     private void exportIndexHtml(Path toDirectory) throws IOException {
         String contents = files.getResourceFromJar("web/index.html")
                 .asString();
-        String basePath = getBasePath();
-        contents = StringUtils.replaceEach(contents,
-                new String[]{"/static", "/pageExtensionApi.js"},
-                new String[]{basePath + "/static", basePath + "/pageExtensionApi.js"});
+        contents = bundleAddressCorrection.correctAddressForExport(contents, "index.html");
 
         export(toDirectory.resolve("index.html"), contents);
     }
 
-    private String getBasePath() {
-        String basePath = config.get(WebserverSettings.EXTERNAL_LINK)
-                .replace("http://", "")
-                .replace("https://", "");
-        if (StringUtils.contains(basePath, '/')) {
-            return basePath.substring(StringUtils.indexOf(basePath, '/'));
-        } else {
-            return "";
-        }
-    }
-
     private void exportAsset(Path toDirectory, String asset) throws IOException {
         export(toDirectory.resolve(asset), files.getResourceFromJar("web/" + asset));
     }

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

@@ -16,25 +16,18 @@
  */
 package com.djrapitops.plan.delivery.export;
 
-import com.djrapitops.plan.delivery.rendering.pages.Page;
-import com.djrapitops.plan.delivery.rendering.pages.PageFactory;
-import com.djrapitops.plan.delivery.web.ResourceService;
 import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resolver.exception.NotFoundException;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
-import com.djrapitops.plan.delivery.web.resource.WebResource;
 import com.djrapitops.plan.delivery.webserver.resolver.json.RootJSONResolver;
 import com.djrapitops.plan.exceptions.WebUserAuthException;
 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.PluginSettings;
-import com.djrapitops.plan.settings.theme.Theme;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
 import com.djrapitops.plan.storage.file.PlanFiles;
-import com.djrapitops.plan.storage.file.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
@@ -55,10 +48,8 @@ public class ServerPageExporter extends FileExporter {
 
     private final PlanFiles files;
     private final PlanConfig config;
-    private final PageFactory pageFactory;
     private final DBSystem dbSystem;
     private final RootJSONResolver jsonHandler;
-    private final Theme theme;
     private final ServerInfo serverInfo;
 
     private final ExportPaths exportPaths;
@@ -67,18 +58,14 @@ public class ServerPageExporter extends FileExporter {
     public ServerPageExporter(
             PlanFiles files,
             PlanConfig config,
-            PageFactory pageFactory,
             DBSystem dbSystem,
             RootJSONResolver jsonHandler,
-            Theme theme,
             ServerInfo serverInfo // To know if current server is a Proxy
     ) {
         this.files = files;
         this.config = config;
-        this.pageFactory = pageFactory;
         this.dbSystem = dbSystem;
         this.jsonHandler = jsonHandler;
-        this.theme = theme;
         this.serverInfo = serverInfo;
 
         exportPaths = new ExportPaths();
@@ -97,41 +84,11 @@ public class ServerPageExporter extends FileExporter {
         if (dbState == Database.State.CLOSED || dbState == Database.State.CLOSING) return;
 
         exportPaths.put("../network", toRelativePathFromRoot("network"));
-        exportRequiredResources(toDirectory);
         exportJSON(toDirectory, server);
-        exportHtml(toDirectory, server);
         exportReactRedirects(toDirectory, server.getUuid());
         exportPaths.clear();
     }
 
-    private void exportHtml(Path toDirectory, Server server) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        ServerUUID serverUUID = server.getUuid();
-        Path to = toDirectory
-                .resolve(serverInfo.getServer().isProxy() ? "server/" + toFileName(server.getName()) : "server")
-                .resolve("index.html");
-
-        Page page = pageFactory.serverPage(serverUUID);
-
-        // Fixes refreshingJsonRequest ignoring old data of export
-        String html = StringUtils.replaceEach(page.toHtml(),
-                new String[]{
-                        "loadOptimizedPerformanceGraph, 'performance', true);",
-                        "loadserverCalendar, 'online-activity-overview', true);",
-                        "}, 'playerlist', true);",
-                        "<head>"
-                },
-                new String[]{
-                        "loadOptimizedPerformanceGraph, 'performance');",
-                        "loadserverCalendar, 'online-activity-overview');",
-                        "}, 'playerlist');",
-                        "<head><style>.refresh-element {display: none;}</style>"
-                });
-
-        export(to, exportPaths.resolveExportPaths(html));
-    }
-
     public static String[] getRedirections(ServerUUID serverUUID) {
         String server = "server/";
         return new String[]{
@@ -143,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",
@@ -151,8 +109,6 @@ public class ServerPageExporter extends FileExporter {
     }
 
     private void exportReactRedirects(Path toDirectory, ServerUUID serverUUID) throws IOException {
-        if (config.isTrue(PluginSettings.LEGACY_FRONTEND)) return;
-
         exportReactRedirects(toDirectory, files, config, getRedirections(serverUUID));
     }
 
@@ -182,18 +138,18 @@ 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,
-                "players?server=" + serverUUID,
+                "playersTable?server=" + serverUUID,
                 "kills?server=" + serverUUID,
                 "pingTable?server=" + serverUUID,
                 "sessions?server=" + serverUUID,
                 "extensionData?server=" + serverUUID,
                 "serverIdentity?server=" + serverUUID,
                 "retention?server=" + serverUUID,
-                "joinAddresses?server=" + serverUUID
+                "joinAddresses?server=" + serverUUID,
+                "gameAllowlistBounces?server=" + serverUUID
         );
     }
 
@@ -233,71 +189,6 @@ public class ServerPageExporter extends FileExporter {
         }
     }
 
-    private void exportRequiredResources(Path toDirectory) throws IOException {
-        if (config.isFalse(PluginSettings.LEGACY_FRONTEND)) return;
-
-        // Style
-        exportResources(toDirectory,
-                "../img/Flaticon_circle.png",
-                "../css/sb-admin-2.css",
-                "../css/style.css",
-                "../vendor/datatables/datatables.min.js",
-                "../vendor/datatables/datatables.min.css",
-                "../vendor/highcharts/modules/map.js",
-                "../vendor/highcharts/mapdata/world.js",
-                "../vendor/highcharts/modules/drilldown.js",
-                "../vendor/highcharts/highcharts.js",
-                "../vendor/highcharts/modules/no-data-to-display.js",
-                "../vendor/fullcalendar/fullcalendar.min.css",
-                "../vendor/momentjs/moment.js",
-                "../vendor/masonry/masonry.pkgd.min.js",
-                "../vendor/fullcalendar/fullcalendar.min.js",
-                "../vendor/fontawesome-free/css/all.min.css",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.eot",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.woff",
-                "../vendor/fontawesome-free/webfonts/fa-brands-400.woff2",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.eot",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.woff",
-                "../vendor/fontawesome-free/webfonts/fa-regular-400.woff2",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.eot",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.ttf",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.woff",
-                "../vendor/fontawesome-free/webfonts/fa-solid-900.woff2",
-                "../js/domUtils.js",
-                "../js/sb-admin-2.js",
-                "../js/xmlhttprequests.js",
-                "../js/color-selector.js",
-                "../js/sessionAccordion.js",
-                "../js/pingTable.js",
-                "../js/graphs.js",
-                "../js/server-values.js"
-        );
-    }
-
-    private void exportResources(Path toDirectory, String... resourceNames) throws IOException {
-        for (String resourceName : resourceNames) {
-            String nonRelativePath = toNonRelativePath(resourceName);
-            exportResource(toDirectory, nonRelativePath);
-            exportPaths.put(resourceName, toRelativePathFromRoot(nonRelativePath));
-        }
-    }
-
-    private void exportResource(Path toDirectory, String resourceName) throws IOException {
-        WebResource resource = ResourceService.getInstance().getResource("Plan", resourceName,
-                () -> files.getResourceFromJar("web/" + resourceName).asWebResource());
-        Path to = toDirectory.resolve(resourceName);
-
-        if (resourceName.endsWith(".css") || resourceName.endsWith("color-selector.js")) {
-            export(to, theme.replaceThemeColors(resource.asString()));
-        } else if (Resource.isTextResource(resourceName)) {
-            export(to, resource.asString());
-        } else {
-            export(to, resource);
-        }
-    }
-
     private String toRelativePathFromRoot(String resourceName) {
         // Server html is exported at /server/<name>/index.html or /server/index.html
         return (serverInfo.getServer().isProxy() ? "../../" : "../") + toNonRelativePath(resourceName);

Plan/common/src/main/java/com/djrapitops/plan/delivery/formatting/Formatters.java

@@ -18,6 +18,7 @@ package com.djrapitops.plan.delivery.formatting;
 
 import com.djrapitops.plan.delivery.domain.DateHolder;
 import com.djrapitops.plan.delivery.formatting.time.*;
+import com.djrapitops.plan.extension.FormatType;
 import com.djrapitops.plan.settings.config.PlanConfig;
 import com.djrapitops.plan.settings.locale.Locale;
 
@@ -160,6 +161,20 @@ public class Formatters {
         return value -> byteSizeFormatter.apply((double) value);
     }
 
+    public Formatter<Long> getNumberFormatter(FormatType type) {
+        switch (type) {
+            case DATE_SECOND:
+                return secondLong();
+            case DATE_YEAR:
+                return yearLong();
+            case TIME_MILLISECONDS:
+                return timeAmount();
+            case NONE:
+            default:
+                return Object::toString;
+        }
+    }
+
     static class Holder {
         static final AtomicReference<Formatters> formatters = new AtomicReference<>();