Fix length check

Automate Hangar publishing

.github/workflows/pr-builds.yml.disabled

@@ -0,0 +1,88 @@
+name: 'Build PR changes'
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    paths:
+      - 'bukkit/src/**'
+      - 'bungeecord/src/**'
+      - 'core/src/**'
+      - 'velocity/src/**'
+
+concurrency: 'pr-preview'
+
+jobs:
+  buildJars:
+    name: 'Build Jars from Pull request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Setup Java 16'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '16'
+          cache: 'maven'
+      - name: 'Build Jar files'
+        run: mvn clean install
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: asl-files
+          path: '*/target/AdvancedServerList-*.jar'
+          if-no-files-found: error
+  updateCommentSuccess:
+    name: 'Create or update Comment (On Success).'
+    needs: [buildJars]
+    if: success()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Find comment
+        uses: peter-evans/find-comment@v2
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          body: |-
+            ## Build Preview
+            
+            Below is a URL to the Jar files made using this Pull request.
+            Please note that artifacts build by this GitHub Action only exist for at most 90 days since last run!
+  
+            | Name      | Link                                                                                |
+            |-----------|-------------------------------------------------------------------------------------|
+            | Commit    | ${{ github.event.pull_request.head.sha }}                                           |
+            | Logs      | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} |
+            | Jar Files | <!-- What can I put here? -->                                                       |
+  UpdateCommentFailure:
+    name: 'Create or update Comment (On Success).'
+    needs: [buildJars]
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Find comment
+        uses: peter-evans/find-comment@v2
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          body: |-
+            ## Build Preview
+        
+            There was an issue generating the Jar files from your Pull request.
+            Please review the logs linked below for further information.
+            
+            | Name   | Link                                                                                |
+            |--------|-------------------------------------------------------------------------------------|
+            | Commit | ${{ github.event.pull_request.head.sha }}                                           |
+            | Logs   | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} |

.github/workflows/release.yml

@@ -13,8 +13,16 @@ on:
 jobs:
   buildJars:
     runs-on: ubuntu-latest
+    outputs:
+      plugin_release: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
     steps:
-    - uses: actions/checkout@v3
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+    - name: Get Version from Release
+      id: github-release
+      run: |
+        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
+        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
     - name: Set up JDK 1.16
       uses: actions/setup-java@v3
       with:
@@ -23,25 +31,13 @@ jobs:
         cache: 'maven'
     - name: Build Jar files
       run: mvn clean install
-    - name: Save BungeeCord Jar file
+    - name: Save All files
       uses: actions/upload-artifact@v3
       with:
-        name: asl-bungeecord
-        path: bungeecord/target/AdvancedServerList-*.jar
-        if-no-files-found: error
-        retention-days: 1
-    - name: Save Bukkit Jar file
-      uses: actions/upload-artifact@v3
-      with:
-        name: asl-bukkit
-        path: bukkit/target/AdvancedServerList-*.jar
-        if-no-files-found: error
-        retention-days: 1
-    - name: Save Velocity Jar file
-      uses: actions/upload-artifact@v3
-      with:
-        name: asl-velocity
-        path: velocity/target/AdvancedServerList-*.jar
+        name: asl-files
+        path: |
+          */target/AdvancedServerList-*.jar
+          hangar-uploader/target/HangarUploader.jar
         if-no-files-found: error
         retention-days: 1
   publish:
@@ -68,19 +64,13 @@ jobs:
     - name: Get Jar files
       uses: actions/download-artifact@v3
       with:
-        name: asl-${{ matrix.directory }}
-        path: ${{ matrix.directory }}/target
-    - name: Get Version
-      id: github-release
-      run: |
-        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
-        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
-    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
+        name: asl-files
+    - name: Upload AdvancedServerList v${{ needs.buildJars.outputs.plugin_release }} (${{ matrix.loaders }}) to GitHub and Modrinth
       if: '!github.event.release.prerelease'
       uses: Kir-Antipov/mc-publish@v3.2
       with:
         name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
-        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
+        version: ${{ needs.buildJars.outputs.plugin_release }}
         version-type: release
         files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar
         files-secondary: ""
@@ -97,12 +87,12 @@ jobs:
         modrinth-featured: false
         modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
         github-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth [Pre-Release]
+    - name: Upload AdvancedServerList v${{ needs.buildJars.outputs.plugin_release }} (${{ matrix.loaders }}) to GitHub and Modrinth [Pre-Release]
       if: 'github.event.release.prerelease'
       uses: Kir-Antipov/mc-publish@v3.2
       with:
         name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
-        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
+        version: ${{ needs.buildJars.outputs.plugin_release }}
         version-type: beta
         files: ${{ matrix.directory }}/target/AdvancedServerList-*.jar
         files-secondary: ""
@@ -118,4 +108,24 @@ jobs:
         modrinth-id: xss83sOY
         modrinth-featured: false
         modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+  publishHangar:
+    needs: [buildJars]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 1.16
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '16'
+      - name: Download Release Assets
+        uses: actions/download-artifact@v3
+        with:
+          name: asl-files
+      - name: Move HangarUploader.jar
+        working-directory: hangar-uploader/target/
+        run: mv HangarUploader.jar ../../
+      - name: Execute HangarUploader.jar
+        run: java -jar HangarUploader.jar ${{ secrets.HANGAR_TOKEN }} ${{ needs.buildJars.outputs.plugin_release }} ${{ github.event.release.prerelease }}
+        env:
+          GITHUB_RELEASE_BODY: ${{ github.event.release.body }}

bukkit/pom.xml

@@ -95,6 +95,7 @@
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
             <version>4.3.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
@@ -105,7 +106,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.1</version>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -117,7 +118,8 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>4.6.1</version>
+            <version>4.6.2</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -149,10 +151,6 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.bstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.caffeine</shadedPattern>
-                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

bukkit/src/main/resources/plugin.yml

@@ -7,6 +7,8 @@ main: 'ch.andre601.advancedserverlist.spigot.SpigotCore'
 
 api-version: 1.19
 
+folia-supported: true
+
 libraries:
   - 'org.spongepowered:configurate-yaml:4.1.2'
   - 'net.kyori:adventure-api:4.12.0'

bungeecord/pom.xml

@@ -78,6 +78,18 @@
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.13.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.13.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
@@ -90,6 +102,18 @@
             <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-yaml</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -125,10 +149,6 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.caffeine</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>okhttp3</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.okhttp3</shadedPattern>

core/pom.xml

@@ -61,42 +61,49 @@
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
             <version>4.1.2</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
             <version>4.13.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
             <version>4.13.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
             <version>4.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <version>3.1.5</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>4.10.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.unascribed</groupId>
             <artifactId>flexver-java</artifactId>
             <version>1.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Test dependencies -->

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/favicon/FaviconHandler.java

@@ -26,8 +26,8 @@
 package ch.andre601.advancedserverlist.core.profiles.favicon;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -39,12 +39,13 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Locale;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 public class FaviconHandler<F>{
     
-    private final Cache<String, F> favicons = Caffeine.newBuilder()
+    private final Cache<String, F> favicons = CacheBuilder.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
     
@@ -55,13 +56,17 @@ public class FaviconHandler<F>{
     }
     
     public F getFavicon(String input, Function<BufferedImage, F> function){
-        return favicons.get(input, k -> {
-            BufferedImage image = resolveImage(core, input);
-            if(image == null)
-                return null;
-            
-            return function.apply(image);
-        });
+        try{
+            return favicons.get(input, () -> {
+                BufferedImage image = resolveImage(core, input);
+                if(image == null)
+                    return null;
+                
+                return function.apply(image);
+            });
+        }catch(ExecutionException ignored){
+            return null;
+        }
     }
     
     public void clearCache(){

hangar-uploader/pom.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2022-2023 Andre_601
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>ch.andre601.advancedserverlist</groupId>
+        <artifactId>parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <artifactId>hangar-uploader</artifactId>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>HangarUploader</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <release>16</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>ch.andre601.advancedserverlist.hangaruploader.HangarUploader</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,209 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.hangaruploader;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.entity.mime.StringBody;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class HangarUploader{
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(HangarUploader.class);
+    private static final String API_URL = "https://hangar.papermc.io/api/v1/";
+    
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+    private final String apiKey;
+    private ActiveJWT activeJWT;
+    
+    public HangarUploader(String apiKey){
+        this.apiKey = apiKey;
+    }
+    
+    public static void main(String[] args) throws IOException{
+        LOGGER.info("Starting Jar file...");
+        final VersionUpload.Namespace project = new VersionUpload.Namespace("Andre_601", "AdvancedServerList");
+        
+        if(args.length < 3){
+            throw new IllegalStateException("Application requires HANGAR_TOKEN, RELEASE_TAG, PRERELEASE and RELEASE_BODY to work");
+        }
+        
+        String apiToken = args[0];
+        String version = args[1].startsWith("v") ? args[1].substring(1) : args[1];
+        boolean isPreRelease = args[2].equalsIgnoreCase("true");
+        String body = System.getenv("GITHUB_RELEASE_BODY");
+        
+        LOGGER.info("Version: {}", version);
+        LOGGER.info("Is Prerelease: {}", isPreRelease);
+        LOGGER.info("Release Message: {}", body);
+        
+        final List<Path> filePaths = List.of(
+            new File("bukkit/target/AdvancedServerList-Bukkit-" + version + ".jar").toPath(),
+            new File("bungeecord/target/AdvancedServerList-BungeeCord-" + version + ".jar").toPath(),
+            new File("velocity/target/AdvancedServerList-Velocity-" + version + ".jar").toPath()
+        );
+        final List<VersionUpload.PluginDependency> paperDependencies = List.of(
+            VersionUpload.PluginDependency.createWithHangarNamespace(
+                "ViaVersion",
+                false,
+                new VersionUpload.Namespace("ViaVersion", "ViaVersion")
+            ),
+            VersionUpload.PluginDependency.createWithExternalUrl(
+                "PlaceholderAPI",
+                false,
+                "https://www.spigotmc.org/resources/6245/"
+            )
+        );
+        final List<VersionUpload.MultipartFileOrUrl> fileInfo = List.of(
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.PAPER), null),
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.WATERFALL), null),
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.VELOCITY), null)
+        );
+        
+        final VersionUpload versionUpload = new VersionUpload(
+            version,
+            Map.of(
+                VersionUpload.Platform.PAPER, paperDependencies,
+                VersionUpload.Platform.WATERFALL, List.of(),
+                VersionUpload.Platform.VELOCITY, List.of()
+            ),
+            Map.of(
+                VersionUpload.Platform.PAPER, List.of("1.19.x"),
+                VersionUpload.Platform.WATERFALL, List.of("1.19.x"),
+                VersionUpload.Platform.VELOCITY, List.of("3.1")
+            ),
+            body,
+            fileInfo,
+            isPreRelease ? "Beta" : "Release"
+        );
+        
+        HangarUploader uploader = new HangarUploader(apiToken);
+        try(CloseableHttpClient client = HttpClients.createDefault()){
+            uploader.uploadVersion(client, project, versionUpload, filePaths);
+        }catch(ParseException ex){
+            LOGGER.error("Encountered ParseException while performing a request.", ex);
+        }
+    }
+    
+    public void uploadVersion(HttpClient client, VersionUpload.Namespace namespace, VersionUpload versionUpload,
+                              List<Path> filePaths) throws IOException, ParseException{
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.addPart("versionUpload", new StringBody(GSON.toJson(versionUpload), ContentType.APPLICATION_JSON));
+        
+        for(Path path : filePaths){
+            builder.addPart("files", new FileBody(path.toFile(), ContentType.DEFAULT_BINARY));
+        }
+    
+        HttpPost post = new HttpPost(API_URL + "projects/" + namespace + "/upload");
+        post.setEntity(builder.build());
+        this.addAuthHeader(client, post);
+        
+        LOGGER.info("Uploading release...");
+        final boolean success = client.execute(post, response -> {
+            if(response.getCode() != 200){
+                LOGGER.error("Error while uploading version. Received response code {}: {}", response.getCode(), response.getReasonPhrase());
+                LOGGER.error("Body: {}", EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+                return false;
+            }
+            return true;
+        });
+        if(!success){
+            throw new RuntimeException("Error uploading version!");
+        }
+        LOGGER.info("Upload complete!");
+        System.exit(0);
+    }
+    
+    private synchronized void addAuthHeader(HttpClient client, HttpMessage message) throws IOException{
+        LOGGER.info("Applying Authorization Header...");
+        if(this.activeJWT != null && !this.activeJWT.hasExpired()){
+            message.addHeader("Authorization", this.activeJWT.jwt());
+            LOGGER.info("Authorization Header applied. Expires at {}", getDate(this.activeJWT.expiresAt()));
+            return;
+        }
+        
+        LOGGER.info("Current JWT expired. Requesting new one...");
+        ActiveJWT jwt = client.execute(new HttpPost(API_URL + "authenticate?apiKey=" + this.apiKey), response -> {
+            if(response.getCode() == 400){
+                LOGGER.error("Bad JWT request; is the API-token valid?");
+                return null;
+            }else
+            if(response.getCode() != 200){
+                LOGGER.error("Received non-successful response code {}: {}", response.getCode(), response.getReasonPhrase());
+                return null;
+            }
+            
+            final String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            final JsonObject jsonObject = GSON.fromJson(json, JsonObject.class);
+            final String token = jsonObject.getAsJsonPrimitive("token").getAsString();
+            final long expiresIn = jsonObject.getAsJsonPrimitive("expiresIn").getAsLong();
+    
+            LOGGER.info("Received new JWT!");
+            return new ActiveJWT(token, System.currentTimeMillis() + expiresIn);
+        });
+        
+        if(jwt == null){
+            throw new RuntimeException("Error getting JWT.");
+        }
+        
+        this.activeJWT = jwt;
+        
+        LOGGER.info("Authorization Header applied. Expires at {}", getDate(this.activeJWT.expiresAt()));
+        message.addHeader("Authorization", jwt.jwt());
+    }
+    
+    private synchronized String getDate(long timestamp){
+        return timestamp + " (" + new Date(timestamp) + ")";
+    }
+    
+    private record ActiveJWT(String jwt, long expiresAt){
+        
+        public boolean hasExpired(){
+            return System.currentTimeMillis() < this.expiresAt + TimeUnit.SECONDS.toMillis(3);
+        }
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.hangaruploader;
+
+import java.util.List;
+import java.util.Map;
+
+public record VersionUpload(String version, Map<Platform, List<PluginDependency>> pluginDependencies,
+                            Map<Platform, List<String>> platformDependencies, String description,
+                            List<MultipartFileOrUrl> files, String channel){
+    
+    public record Namespace(String owner, String slug){
+        
+        @Override
+        public String toString(){
+            return this.owner + "/" + this.slug;
+        }
+    }
+    
+    public record PluginDependency(String name, boolean required, Namespace namespace, String externalUrl){
+        
+        public PluginDependency{
+            if(namespace == null && externalUrl == null)
+                throw new IllegalStateException("Either a Hangar Namespace or an external URL needs to be defined.");
+        }
+        
+        public static PluginDependency createWithHangarNamespace(String name, boolean required, Namespace namespace){
+            return new PluginDependency(name, required, namespace, null);
+        }
+        
+        public static PluginDependency createWithExternalUrl(String name, boolean required, String externalUrl){
+            return new PluginDependency(name, required, null, externalUrl);
+        }
+    }
+    
+    public record MultipartFileOrUrl(List<Platform> platforms, String externalUrl){}
+    
+    public enum Platform{
+        PAPER,
+        WATERFALL,
+        VELOCITY
+    }
+}

hangar-uploader/src/main/resources/logback.xml

@@ -0,0 +1,60 @@
+<!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2022-2023 Andre_601
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  ~
+  -->
+
+<configuration debug="false">
+
+    <property name="DEV_HOME" value="./logs"/>
+
+    <!--CONSOLE -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%highlight([) %boldWhite(%d{dd.MM.yyyy HH:mm:ss}) %highlight(%-5level) %highlight(]) %cyan([%t]) %boldWhite([%logger{0}]) %boldRed(-) %white(%msg) %n</pattern>
+        </encoder>
+    </appender>
+
+    <!--FILE OUT-->
+    <appender name="FILE-AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <file>${DEV_HOME}/Purr.log</file>
+        <encoder>
+            <pattern>%d{dd.MM.yyyy HH:mm:ss} [%thread] [ %-5level] [%logger{0}] %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${DEV_HOME}/archived/purr-%d{dd.MM.yyyy}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>60</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <!--Root logger-->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE-AUDIT"/>
+    </root>
+</configuration>

paper/pom.xml

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2022-2023 Andre_601
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  ~
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>parent</artifactId>
-        <groupId>ch.andre601.advancedserverlist</groupId>
-        <version>parent</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>paper</artifactId>
-    <packaging>jar</packaging>
-    <version>${plugin.version}</version>
-
-    <properties>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
-    </properties>
-    
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>placeholderapi-repo</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
-        <repository>
-            <id>viaversion</id>
-            <url>https://repo.viaversion.com/</url>
-        </repository>
-    </repositories>
-    
-    <dependencies>
-        <dependency>
-            <groupId>ch.andre601.advancedserverlist</groupId>
-            <artifactId>core</artifactId>
-            <version>${plugin.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.andre601.asl-api</groupId>
-            <artifactId>platform-spigot</artifactId>
-            <version>${api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.11.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.viaversion</groupId>
-            <artifactId>viaversion-api</artifactId>
-            <version>4.6.2</version>
-        </dependency>
-    </dependencies>
-    
-    <build>
-        <finalName>AdvancedServerList-Paper-${plugin.version}</finalName>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>${project.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
-                <configuration>
-                    <release>16</release>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.configurate</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.caffeine</shadedPattern>
-                        </relocation>
-                    </relocations>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

paper/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java

@@ -1,169 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper;
-
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
-import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
-import ch.andre601.advancedserverlist.paper.events.JoinEvent;
-import ch.andre601.advancedserverlist.paper.events.PingEvent;
-import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
-import ch.andre601.advancedserverlist.paper.objects.PAPIPlaceholders;
-import ch.andre601.advancedserverlist.paper.objects.PaperPlayerPlaceholders;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.CachedServerIcon;
-
-import java.nio.file.Path;
-
-public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon>{
-    
-    private final PluginLogger logger = new PaperLogger(getLogger());
-    
-    private AdvancedServerList core;
-    private FaviconHandler<CachedServerIcon> faviconHandler;
-    
-    @Override
-    public void onEnable(){
-        try{
-            Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
-            enable();
-        }catch(ClassNotFoundException ex){
-            try{
-                Class.forName("com.destroystokyo.paper.PaperConfig");
-                enable();
-            }catch(ClassNotFoundException ex1){
-                printSpigotWarning();
-                getServer().getPluginManager().disablePlugin(this);
-            }
-        }
-    }
-    
-    @Override
-    public void onDisable(){
-        if(getCore() == null)
-            return; // This is always the case when the plugin is used on a Spigot server (See above try-catch blocks).
-        
-        getCore().disable();
-    }
-    
-    @Override
-    public void loadCommands(){
-        PluginCommand cmd = getServer().getPluginCommand("advancedserverlist");
-        if(cmd == null){
-            getPluginLogger().warn("Could not register command /advancedserverlist");
-            return;
-        }
-        cmd.setExecutor(new CmdAdvancedServerList(this));
-    }
-    
-    @Override
-    public void loadEvents(){
-        new JoinEvent(this);
-        new PingEvent(this);
-    }
-    
-    @Override
-    public void loadMetrics(){
-        new Metrics(this, 15584).addCustomChart(new SimplePie("profiles",
-            () -> String.valueOf(core.getFileHandler().getProfiles().size())
-        ));
-    }
-    
-    @Override
-    public void clearFaviconCache(){
-        if(faviconHandler == null)
-            return;
-        
-        faviconHandler.clearCache();
-    }
-    
-    @Override
-    public AdvancedServerList getCore(){
-        return core;
-    }
-    
-    @Override
-    public Path getFolderPath(){
-        return getDataFolder().toPath();
-    }
-    
-    @Override
-    public PluginLogger getPluginLogger(){
-        return logger;
-    }
-    
-    @Override
-    public FaviconHandler<CachedServerIcon> getFaviconHandler(){
-        if(faviconHandler == null)
-            faviconHandler = new FaviconHandler<>(core);
-        
-        return faviconHandler;
-    }
-    
-    @Override
-    public String getPlatformName(){
-        return getServer().getName();
-    }
-    
-    @Override
-    public String getPlatformVersion(){
-        return getServer().getVersion();
-    }
-    
-    @Override
-    public String getLoader(){
-        return "paper";
-    }
-    
-    private void enable(){
-        this.core = new AdvancedServerList(this, new PaperPlayerPlaceholders());
-        
-        if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-            new PAPIPlaceholders(this);
-    }
-    
-    private void printSpigotWarning(){
-        getPluginLogger().warn("======================================== WARNING ========================================");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("You are using the Paper version of AdvancedServerList on a SpigotMC server.");
-        getPluginLogger().warn("The Paper version is ONLY compatible with Paper itself due to it using exclusive");
-        getPluginLogger().warn("methods and events not available within SpigotMC.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("To avoid any exceptions and errors will AdvancedServerList disable itself now.");
-        getPluginLogger().warn("Please stop your server and either switch to Paper or use the Spigot version");
-        getPluginLogger().warn("of AdvancedServerList.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("Paper can be downloaded here:");
-        getPluginLogger().warn("https://papermc.io/downloads");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("======================================== WARNING ========================================");
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/commands/CmdAdvancedServerList.java

@@ -1,48 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.commands;
-
-import ch.andre601.advancedserverlist.paper.PaperCore;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-public class CmdAdvancedServerList implements CommandExecutor{
-    
-    private final PaperCore plugin;
-    
-    public CmdAdvancedServerList(PaperCore plugin){
-        this.plugin = plugin;
-    }
-    
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args){
-        plugin.getCore().getCommandHandler().handle(new PaperCmdSender(sender), args);
-        
-        return true;
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/commands/PaperCmdSender.java

@@ -1,49 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.commands;
-
-import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import org.bukkit.command.CommandSender;
-
-public class PaperCmdSender implements CmdSender{
-    
-    private final CommandSender sender;
-    
-    public PaperCmdSender(CommandSender sender){
-        this.sender = sender;
-    }
-    
-    @Override
-    public boolean hasPermission(String permission){
-        return sender.hasPermission(permission) || sender.hasPermission("advancedserverlist.admin");
-    }
-    
-    @Override
-    public void sendMsg(String msg, Object... args){
-        sender.sendMessage(ComponentParser.text(String.format(msg, args)).toComponent());
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/JoinEvent.java

@@ -1,54 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.events;
-
-import ch.andre601.advancedserverlist.paper.PaperCore;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-import java.net.InetSocketAddress;
-
-public class JoinEvent implements Listener{
-    
-    private final PaperCore plugin;
-    
-    public JoinEvent(PaperCore plugin){
-        this.plugin = plugin;
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-    
-    @EventHandler
-    public void onJoin(PlayerJoinEvent event){
-        InetSocketAddress address = event.getPlayer().getAddress();
-        if(address == null)
-            return;
-    
-        Player player = event.getPlayer();
-        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperEventWrapper.java

@@ -1,181 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.events;
-
-import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
-import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.paper.PaperCore;
-import ch.andre601.advancedserverlist.paper.objects.PaperPlayerImpl;
-import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-import com.destroystokyo.paper.profile.PlayerProfile;
-import me.clip.placeholderapi.PlaceholderAPI;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.util.CachedServerIcon;
-
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, PaperPlayerImpl>{
-    
-    private final PaperCore plugin;
-    private final PaperServerListPingEvent event;
-    
-    public PaperEventWrapper(PaperCore plugin, PaperServerListPingEvent event){
-        this.plugin = plugin;
-        this.event = event;
-    }
-    
-    @Override
-    public GenericServerListEvent callEvent(ProfileEntry entry){
-        PreServerListSetEventImpl event = new PreServerListSetEventImpl(entry);
-        plugin.getServer().getPluginManager().callEvent(event);
-        
-        return event;
-    }
-    
-    @Override
-    public void setMaxPlayers(int maxPlayers){
-        event.setMaxPlayers(maxPlayers);
-    }
-    
-    @Override
-    public void setMotd(Component component){
-        event.motd(component);
-    }
-    
-    @Override
-    public void hidePlayers(){
-        event.setHidePlayers(true);
-    }
-    
-    @Override
-    public void setPlayerCount(String name){
-        event.setVersion(name);
-        event.setProtocolVersion(-1);
-    }
-    
-    @Override
-    public void setPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
-        event.getPlayerSample().clear();
-        List<PlayerProfile> players = new ArrayList<>(lines.size());
-        
-        for(String line : lines){
-            String parsed = ComponentParser.text(line)
-                .modifyText(text -> StringReplacer.replace(text, player, server))
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
-                .toString();
-            
-            players.add(Bukkit.createProfile(UUID.randomUUID(), parsed));
-        }
-        
-        event.getPlayerSample().addAll(players);
-    }
-    
-    @Override
-    public void setFavicon(CachedServerIcon favicon){
-        event.setServerIcon(favicon);
-    }
-    
-    @Override
-    public void setDefaultFavicon(){
-        event.setServerIcon(event.getServerIcon());
-    }
-    
-    // Not used in Paper
-    @Override
-    public void updateEvent(){}
-    
-    // Not used in Paper
-    @Override
-    public boolean isInvalidProtocol(){
-        return false;
-    }
-    
-    @Override
-    public int getProtocolVersion(){
-        return event.getClient().getProtocolVersion();
-    }
-    
-    @Override
-    public int getOnlinePlayers(){
-        return event.getNumPlayers();
-    }
-    
-    @Override
-    public int getMaxPlayers(){
-        return event.getMaxPlayers();
-    }
-    
-    @Override
-    public String getPlayerIP(){
-        return event.getClient().getAddress().getHostString();
-    }
-    
-    @Override
-    public String parsePAPIPlaceholders(String text, PaperPlayerImpl player){
-        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-        
-        return text;
-    }
-    
-    @Override
-    public String getVirtualHost(){
-        return this.resolveHost(event.getClient().getVirtualHost());
-    }
-    
-    @Override
-    public PluginCore<CachedServerIcon> getPlugin(){
-        return plugin;
-    }
-    
-    @Override
-    public PaperPlayerImpl createPlayer(CachedPlayer player, int protocol){
-        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
-        
-        return new PaperPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
-    }
-    
-    @Override
-    public CachedServerIcon createFavicon(BufferedImage image) throws Exception{
-        return Bukkit.loadServerIcon(image);
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PingEvent.java

@@ -1,47 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.events;
-
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
-import ch.andre601.advancedserverlist.paper.PaperCore;
-import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class PingEvent implements Listener{
-    
-    private final PaperCore plugin;
-    
-    public PingEvent(PaperCore plugin){
-        this.plugin = plugin;
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-    
-    @EventHandler
-    public void onServerPing(PaperServerListPingEvent event){
-        PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PreServerListSetEventImpl.java

@@ -1,36 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.events;
-
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.spigot.events.PreServerListSetEvent;
-
-public class PreServerListSetEventImpl extends PreServerListSetEvent{
-    
-    public PreServerListSetEventImpl(ProfileEntry entry){
-        super(entry);
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/logging/PaperLogger.java

@@ -1,60 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.logging;
-
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class PaperLogger implements PluginLogger{
-    
-    private final Logger logger;
-    
-    public PaperLogger(Logger logger){
-        this.logger = logger;
-    }
-    
-    @Override
-    public void info(String msg, Object... args){
-        logger.info(String.format(msg, args));
-    }
-    
-    @Override
-    public void warn(String msg, Object... args){
-        logger.warning(String.format(msg, args));
-    }
-    
-    @Override
-    public void warn(String msg, Throwable throwable){
-        logger.log(Level.WARNING, msg, throwable);
-    }
-    
-    @Override
-    public void warn(String msg, Throwable throwable, Object... args){
-        logger.log(Level.WARNING, String.format(msg, args), throwable);
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/PAPIPlaceholders.java

@@ -1,122 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.objects;
-
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.objects.GenericServerImpl;
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.paper.PaperCore;
-import com.viaversion.viaversion.api.Via;
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Locale;
-
-public class PAPIPlaceholders extends PlaceholderExpansion{
-    
-    private final PaperCore plugin;
-    
-    public PAPIPlaceholders(PaperCore plugin){
-        this.plugin = plugin;
-        this.register();
-    }
-    
-    @Override
-    public @NotNull String getIdentifier(){
-        return "asl";
-    }
-    
-    @Override
-    public @NotNull String getAuthor(){
-        return String.join(", ", plugin.getDescription().getAuthors());
-    }
-    
-    @Override
-    public @NotNull String getVersion(){
-        return plugin.getDescription().getVersion();
-    }
-    
-    @Override
-    public String onPlaceholderRequest(Player pl, @NotNull String identifier){
-        String host = pl.getVirtualHost() == null ? null : pl.getVirtualHost().getHostString();
-        CachedPlayer cached = plugin.getCore().getPlayerHandler().getCachedPlayer(pl.getUniqueId());
-        
-        // Check if ViaVersion is enabled to resolve the player's protocol version.
-        // If not can we assume the client's version to be the same as the server's.
-        int protocol;
-        if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion")){
-            protocol = Via.getAPI().getPlayerVersion(pl.getUniqueId());
-        }else{
-            protocol = Bukkit.getUnsafe().getProtocolVersion();
-        }
-        
-        int online = Bukkit.getOnlinePlayers().size();
-        int max = Bukkit.getMaxPlayers();
-        GenericServer server = new GenericServerImpl(online, max, host);
-        GenericPlayer player = new PaperPlayerImpl(pl, cached, protocol);
-        
-        ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
-        if(profile == null)
-            return null;
-    
-        ProfileEntry entry = ProfileManager.merge(profile);
-        
-        if(ProfileManager.checkOption(entry.isExtraPlayersEnabled()))
-            max = online + (entry.getExtraPlayersCount() == null ? 0 : entry.getExtraPlayersCount());
-        
-        GenericServer finalServer = new GenericServerImpl(online, max, host);
-        
-        return switch(identifier.toLowerCase(Locale.ROOT)){
-            case "motd" -> ComponentParser.list(entry.getMotd())
-                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
-                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
-                .toString();
-            case "favicon" -> ComponentParser.text(entry.getFavicon())
-                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
-                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
-                .toString();
-            case "playercount_hover" -> ComponentParser.list(entry.getPlayers())
-                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
-                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
-                .toString();
-            case "playercount_text" -> ComponentParser.text(entry.getPlayerCountText())
-                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
-                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
-                .toString();
-            case "extra_players_max" -> String.valueOf(max);
-            default -> null;
-        };
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/PaperPlayerImpl.java

@@ -1,74 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.objects;
-
-import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
-import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
-import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayer;
-import org.bukkit.OfflinePlayer;
-
-public class PaperPlayerImpl extends GenericPlayerImpl implements SpigotPlayer{
-    
-    private final OfflinePlayer player;
-    private boolean playedBefore = false;
-    private boolean banned = false;
-    private boolean whitelisted = false;
-    
-    public PaperPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
-        this.player = player;
-        
-        this.name = player == null ? cachedPlayer.getName() : player.getName();
-        this.protocol = protocol;
-        this.uuid = player == null ? cachedPlayer.getUuid() : player.getUniqueId();
-        
-        if(player == null)
-            return;
-        
-        this.playedBefore = player.hasPlayedBefore();
-        this.banned = player.isBanned();
-        this.whitelisted = player.isWhitelisted();
-    }
-    
-    @Override
-    public OfflinePlayer getPlayer(){
-        return player;
-    }
-    
-    @Override
-    public boolean hasPlayedBefore(){
-        return playedBefore;
-    }
-    
-    @Override
-    public boolean isBanned(){
-        return banned;
-    }
-    
-    @Override
-    public boolean isWhitelisted(){
-        return whitelisted;
-    }
-}

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/PaperPlayerPlaceholders.java

@@ -1,57 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.objects;
-
-import ch.andre601.advancedserverlist.api.PlaceholderProvider;
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayer;
-
-public class PaperPlayerPlaceholders extends PlaceholderProvider{
-    
-    public PaperPlayerPlaceholders(){
-        super("player");
-    }
-    
-    @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        SpigotPlayer paperPlayer = (SpigotPlayer)player;
-        
-        return switch(placeholder){
-            case "name" -> paperPlayer.getName();
-            case "protocol" -> String.valueOf(paperPlayer.getProtocol());
-            case "uuid" -> String.valueOf(paperPlayer.getUUID());
-            case "hasPlayedBefore" -> returnValue(paperPlayer, paperPlayer.hasPlayedBefore());
-            case "isBanned" -> returnValue(paperPlayer, paperPlayer.isBanned());
-            case "isWhitelisted" -> returnValue(paperPlayer, paperPlayer.isWhitelisted());
-            default -> null;
-        };
-    }
-    
-    private String returnValue(SpigotPlayer player, Object value){
-        return player.getPlayer() == null ? null : String.valueOf(value);
-    }
-}

paper/src/main/resources/plugin.yml

@@ -1,47 +0,0 @@
-name: 'AdvancedServerList'
-author: 'Andre_601'
-version: '${plugin.version}'
-description: '${plugin.description}'
-
-main: 'ch.andre601.advancedserverlist.paper.PaperCore'
-
-api-version: 1.19
-
-libraries:
-  - 'com.squareup.okhttp3:okhttp:4.10.0'
-
-softdepend:
-  - 'PlaceholderAPI'
-  - 'ViaVersion'
-
-commands: 
-  advancedserverlist:
-    description: 'Main command of AdvancedServerList'
-    usage: '/<command> [help|reload]'
-    aliases:
-      - 'asl'
-    permission: 'advancedserverlist.admin'
-
-permissions: 
-  advancedserverlist.*:
-    description: 'Grants access to all permissions'
-    default: op
-    children: 
-      - 'advancedserverlist.admin'
-  advancedserverlist.admin:
-    description: 'Grants access to all permissions'
-    default: op
-    children:
-      - 'advancedserverlist.command.*'
-  advancedserverlist.command.*:
-    description: 'Grants access to all commands'
-    default: op
-    children:
-      - 'advancedserverlist.command.help'
-      - 'advancedserverlist.command.reload'
-  advancedserverlist.command.help:
-    description: 'Grants access to /asl help'
-    default: op
-  advancedserverlist.command.reload:
-    description: 'Grants access to /asl reload'
-    default: op

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>3.0.0-b2</plugin.version>
+        <plugin.version>3.0.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>v2.1.0</api.version>
@@ -56,8 +56,8 @@
     <modules>
         <module>core</module>
         <module>bungeecord</module>
-        <module>paper</module>
         <module>bukkit</module>
         <module>velocity</module>
+        <module>hangar-uploader</module>
     </modules>
 </project>

requirements.txt

@@ -1 +1 @@
-mkdocs-material==9.1.4
+mkdocs-material==9.1.5

velocity/pom.xml

@@ -75,6 +75,18 @@
             <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-yaml</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -106,10 +118,6 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.bstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.caffeine</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>okhttp3</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.okhttp3</shadedPattern>