Bump version

Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/267

.woodpecker/pr_preview.yml

@@ -6,7 +6,7 @@ when:
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "andre@andre601.ch"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
     - git config --global user.name "ASL Docs Builder"
 
 steps:
@@ -15,10 +15,10 @@ steps:
     commands:
       - chmod -R a+w .
       - <<: *setup_git
-      - git clone https://codeberg.org/Andre601/asl-docs.git site
+      - git clone https://codeberg.org/Andre601/preview.git site
       - chmod -R a+w site
       - cd site
-      - git switch pr-${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c pr-${CI_COMMIT_PULL_REQUEST}
+      - git switch ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST}
   buildDocs:
     image: woodpeckerci/plugin-mkdocs:latest
     settings:
@@ -29,12 +29,12 @@ steps:
       - bot_token
     commands:
       - <<: *setup_git
-      - mv domains site/.domains
+      - mv preview-domains site/.domains
       - cd site
-      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/asl-docs.git
+      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/preview.git
       - git add --all
-      - git commit -m "Update Preview for PR ${CI_COMMIT_PULL_REQUEST} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
-      - git push --set-upstream upstream pr-${CI_COMMIT_PULL_REQUEST} -f
+      - git commit -m "Update Preview for PR ${CI_COMMIT_PULL_REQUEST} in Repository ${CI_REPO_NAME} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
+      - git push --set-upstream upstream ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} -f
   commentOnSuccess:
     image: mcs94/gitea-comment
     when:
@@ -46,10 +46,10 @@ steps:
       comment: |-
         Pull request Preview ready!
 
-        | Name   | Value                                                 |
-        |--------|-------------------------------------------------------|
-        | Commit | ${CI_COMMIT_SHA}                                      |
-        | Link   | https://asl.andre601.ch/@pr-${CI_COMMIT_PULL_REQUEST} |
+        | Name   | Value                                                                       |
+        |--------|-----------------------------------------------------------------------------|
+        | Commit | ${CI_COMMIT_SHA}                                                            |
+        | Link   | https://preview.andre601.ch/@${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} |
   commentOnFailure:
     image: mcs94/gitea-comment
     when:

.woodpecker/publish_docs.yml

@@ -7,7 +7,7 @@ when:
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "github@andre601.ch"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
     - git config --global user.name "ASL Docs Builder"
 
 steps:

bungeecord/pom.xml

@@ -42,6 +42,11 @@
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
+        
+        <dependency.adventure-api>4.16.0</dependency.adventure-api>
+        <dependency.adventure-text-minimessage>4.16.0</dependency.adventure-text-minimessage>
+        <dependency.adventure-platform-bungeecord>4.3.2</dependency.adventure-platform-bungeecord>
+        <dependency.configurate-yaml>4.1.2</dependency.configurate-yaml>
     </properties>
     
     <repositories>
@@ -49,6 +54,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -85,20 +94,20 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-api}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-text-minimessage}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.2</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-platform-bungeecord}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Metrics -->
@@ -113,8 +122,8 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
+            <version>${dependency.configurate-yaml}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Plugins -->
@@ -124,6 +133,14 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Other -->
+        <dependency>
+            <groupId>com.alessiodp.libby</groupId>
+            <artifactId>libby-bungee</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -147,18 +164,14 @@
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
-                        <relocation>
-                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.configurate</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.kyori</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>net.byteflux.libby</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.libby</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -35,6 +35,8 @@ 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 com.alessiodp.libby.BungeeLibraryManager;
+import com.alessiodp.libby.Library;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
@@ -45,19 +47,36 @@ import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 
 import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
+    private boolean successfulLoad = false;
+    
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
     private final PluginLogger logger = new BungeeLogger(this);
     
+    @Override
+    public void onLoad(){
+        successfulLoad = loadLibs();
+    }
+    
     @Override
     public void onEnable(){
+        if(!successfulLoad){
+            logger.warn("There were issues during the plugins Loading-phase! Please see the console for possible reasons.");
+            logger.warn("The plugin won't be enabled to prevent additional problems.");
+            return;
+        }
+        
         this.audiences = BungeeAudiences.create(this);
         this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
     }
@@ -156,4 +175,39 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         
         return players.size();
     }
+    
+    private boolean loadLibs(){
+        BungeeLibraryManager libraryManager = new BungeeLibraryManager(this);
+        libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+        
+        try(InputStream stream = getClass().getResourceAsStream("/dependencies.maven")){
+            if(stream == null){
+                logger.warn("Received null InputStream while trying to resolve dependencies!");
+                return false;
+            }
+            try(InputStreamReader streamReader = new InputStreamReader(stream); 
+                BufferedReader reader = new BufferedReader(streamReader)){
+                String line;
+                while((line = reader.readLine()) != null){
+                    String[] dependency = line.split(":", 3);
+                    if(dependency.length < 3)
+                        continue;
+                    
+                    Library library = Library.builder()
+                        .groupId(dependency[0])
+                        .artifactId(dependency[1])
+                        .version(dependency[2])
+                        .resolveTransitiveDependencies(true)
+                        .build();
+                    
+                    libraryManager.loadLibrary(library);
+                }
+                
+                return true;
+            }
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to resolve dependencies.", ex);
+            return false;
+        }
+    }
 }

bungeecord/src/main/resources/dependencies.maven

@@ -0,0 +1,4 @@
+net{}kyori:adventure-api:${dependency.adventure-api}
+net{}kyori:adventure-text-minimessage:${dependency.adventure-text-minimessage}
+net{}kyori:adventure-platform-bungeecord:${dependency.adventure-platform-bungeecord}
+org{}spongepowered:configurate-yaml:${dependency.configurate-yaml}

core/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>4.6.4</plugin.version>
+        <plugin.version>4.7.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>3.3.0</api.version>

preview-domains

@@ -0,0 +1 @@
+preview.andre601.ch

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/data/CodebergReleaseFetcher.java

@@ -57,10 +57,6 @@ public class CodebergReleaseFetcher{
             return null;
         }
         
-        // Forgejo broke tags returned, causing CI_COMMIT_TAG to return refs/tags/<tag>, so we check for this and filter it...
-        if(tag.startsWith("refs/tags/"))
-            tag = tag.substring("ref/tags/".length());
-        
         String url = "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/tags/" + tag;
         LOGGER.info("Fetching Release data from {}...", url);