Update API reference

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

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/listeners/PingEvent.java

@@ -25,6 +25,8 @@
 
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
+import ch.andre601.advancedserverlist.api.bungeecord.events.PostServerListSetEvent;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import net.md_5.bungee.api.event.ProxyPingEvent;
@@ -42,6 +44,8 @@ public class PingEvent implements Listener{
     
     @EventHandler(priority = 90) // Maintenance has Event Priority 80, so we need to be AFTER it.
     public void onProxyPing(ProxyPingEvent event){
-        PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        ProfileEntry entry = PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        
+        plugin.getProxy().getPluginManager().callEvent(new PostServerListSetEvent(entry));
     }
 }

core/pom.xml

@@ -119,7 +119,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.0.0-jre</version>
+            <version>33.1.0-jre</version>
             <scope>provided</scope>
         </dependency>
         

core/src/main/java/ch/andre601/advancedserverlist/core/events/PingEventHandler.java

@@ -44,11 +44,11 @@ public class PingEventHandler{
     private static PAPIUtil papiUtil = null;
     private static MaintenanceUtil maintenanceUtil = null;
     
-    public static <F, P extends GenericPlayer> void handleEvent(GenericEventWrapper<F, P> event){
+    public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
         event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
         if(event.isInvalidProtocol()){
             event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
-            return;
+            return null;
         }
         
         PluginCore<F> plugin = event.getPlugin();
@@ -70,7 +70,7 @@ public class PingEventHandler{
         
         if(profile == null){
             logger.debugWarn(PingEventHandler.class, "Server List Profile couldn't be resolved properly. Cancelling event handling...");
-            return;
+            return null;
         }
         
         logger.debug(PingEventHandler.class, "Received valid Server List Profile. Calling PreServerListSetEvent...");
@@ -78,7 +78,7 @@ public class PingEventHandler{
         GenericServerListEvent e = event.callEvent(ProfileManager.merge(profile));
         if(e == null || e.isCancelled()){
             logger.debug(PingEventHandler.class, "PreServerListSetEvent was cancelled. Stopping ping handling...");
-            return;
+            return null;
         }
         
         logger.debug(PingEventHandler.class, "PreServerListSetEvent completed. Proceeding with ping handling...");
@@ -86,7 +86,7 @@ public class PingEventHandler{
         ProfileEntry entry = e.getEntry();
         if(entry.isInvalid()){
             logger.debugWarn(PingEventHandler.class, "No valid ProfileEntry retrieved. Cancelling ping handling...");
-            return;
+            return null;
         }
         
         boolean extraPlayers = ProfileManager.checkOption(entry.extraPlayersEnabled());
@@ -165,6 +165,8 @@ public class PingEventHandler{
         
         logger.debug(PingEventHandler.class, "Event handling completed. Updating Ping data...");
         event.updateEvent();
+        
+        return entry;
     }
     
     public static PAPIUtil getPAPIUtil(){

docs/.overrides/api-doc.html

@@ -23,13 +23,13 @@
       Detailed object info
     -->
     {% if page.meta.constructors %}
-      {{ info.info('Constructor Detail', page.meta.constructors, defaults=page.meta.defaults) }}
+      {{ info.info('Constructor Detail', page.meta.constructors, 'constructor', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.enums %}
-      {{ info.info('Enum Constant Detail', page.meta.enums, true, defaults=page.meta.defaults) }}
+      {{ info.info('Enum Constant Detail', page.meta.enums, 'enum', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.methods %}
-      {{ info.info('Method Detail', page.meta.methods, defaults=page.meta.defaults)}}
+      {{ info.info('Method Detail', page.meta.methods, 'method', defaults=page.meta.defaults)}}
     {% endif %}
   {% endif %}
 {% endblock %}

docs/.overrides/api-objects/info-template.html

@@ -105,14 +105,14 @@
   </div>
 {%- endmacro %}
 
-{% macro info(title, details, enum = false, defaults = []) -%}
+{% macro info(title, details, details_type = 'unknown', defaults = []) -%}
   <h2 id="{{ title | lower() | replace(' ', '-') | e}}">
     {{ title }}
   </h2>
   {% for detail in details %}
     <div class="api-detail">
       {% set final_name = namespace(name = "") %}
-      {% if enum %}
+      {% if details_type == "enum" %}
         {% set final_name.name = detail.name | upper() %}
       {% else %}
         {% set final_name.name = detail.name ~ "(" %}
@@ -123,7 +123,7 @@
         {% if loop.revindex > 1 %}{% set final_name.name = final_name.name ~ ", " %}{% endif %}
       {% endfor %}
       
-      {% if not enum %}
+      {% if details_type != "enum" %}
         {% set final_name.name = final_name.name ~ ")" %}
       {% endif %}
       
@@ -140,19 +140,19 @@
           <api__static></api__static> <api__final></api__final>
         {% endif %}
         
-        {% if detail.type %}
+        {% if detail.type and details_type == "method" %}
           {% if detail.type.link %}
             <a href="{{ detail.type.link }}" class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</a>
           {% else %}
             <span class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</span>
           {% endif %}
-        {% elif defaults and defaults.type %}
+        {% elif defaults and defaults.type and details_type == "method" %}
           {% if defaults.type.link %}
             <a href="{{ defaults.type.link }}" class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') | e }}</a>
           {% else %}
             <span class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') }}</span>
           {% endif %}
-        {% else %}
+        {% elif details_type == "method" %}
           <span class="api-type__primitive">void</span>
         {% endif %}
         <code>{{ final_name.name | e }}</code><a href="#{{ final_name.name | lower() | replace(' ', '-') | e }}" class="headerlink" title="Permanent link">¶</a>

docs/api/reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md

@@ -8,7 +8,7 @@ constructors:
       - name: 'identifier'
         description: 'The identifier to use for the placeholder. Cannot be empty.'
         type: String
-        attributes:
+        attribute:
           - notnull
 
 methods:
@@ -28,7 +28,7 @@ methods:
         type: GenericServer
         description: 'The <a href="./../objects/genericserver/"><code>GenericServer</code> instance</a> used.'
     returns: 'Possibly-parsed or possibly-null String to replace the placeholder with.'
-    attributes:
+    attribute:
       - nullable
       - abstract
     type:

docs/api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/events/postserverlistsetevent.md

@@ -0,0 +1,49 @@
+---
+template: api-doc.html
+
+constructors:
+  - name: 'PostServerListSetEvent'
+    description: 'Constructor for creating a new PostServerListSetEvent instance.'
+    parameters:
+      - name: 'entry'
+        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        type: ProfileEntry
+        attribute:
+          - nullable
+
+methods:
+  - name: 'getHandlerList'
+    description: 'Static <a href="https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html" target="_blank" rel="nofollow"><code>HandlerList</code></a> getter. Required by Paper.'
+    returns: 'The static <a href="https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/HandlerList.html" target="_blank" rel="nofollow"><code>HandlerList instance</code></a> of this event.'
+    attributes:
+      - static
+    type:
+      name: 'HandlerList'
+      type: 'object'
+  - name: 'getEntry'
+    description: |
+      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
+      <br>
+      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
+    returns: 'Possibly-null ProfileEntry used for the PingEvent.'
+    attributes:
+      - nullable
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+
+inherits:
+  'org.bukkit.event.Event':
+    link: 'https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/Event.html'
+    list:
+      - 'getHandlers()'
+---
+
+# <api__class></api__class> PostServerListSetEvent
+
+Called **after** the plugin has updated the Server List.
+
+The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

docs/api/reference/platform-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/events/postserverlistsetevent.md

@@ -0,0 +1,35 @@
+---
+template: api-doc.html
+
+constructors:
+  - name: 'PostServerListSetEvent'
+    description: 'Constructor for creating a new PostServerListSetEvent instance.'
+    parameters:
+      - name: 'entry'
+        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        type: ProfileEntry
+        attribute:
+          - nullable
+
+methods:
+  - name: 'getEntry'
+    description: |
+      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
+      <br>
+      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
+    returns: 'Possibly-null ProfileEntry used for the PingEvent.'
+    attributes:
+      - nullable
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+---
+
+# <api__class></api__class> PostServerListSetEvent
+
+Called **after** the plugin has updated the Server List.
+
+The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

docs/api/reference/platform-velocity/ch.andre601.advancedserverlist.api.velocity/events/postserverlistsetevent.md

@@ -0,0 +1,35 @@
+---
+template: api-doc.html
+
+constructors:
+  - name: 'PostServerListSetEvent'
+    description: 'Constructor for creating a new PostServerListSetEvent instance.'
+    parameters:
+      - name: 'entry'
+        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        type: ProfileEntry
+        attribute:
+          - nullable
+
+methods:
+  - name: 'getEntry'
+    description: |
+      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
+      <br>
+      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
+    returns: 'Possibly-null ProfileEntry used for the PingEvent.'
+    attributes:
+      - nullable
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+---
+
+# <api__class></api__class> PostServerListSetEvent
+
+Called **after** the plugin has updated the Server List.
+
+The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

mkdocs.yml

@@ -152,6 +152,7 @@ nav:
         - api/reference/platform-bukkit/index.md
         - ch.andre601.advancedserverlist.api.bukkit:
           - events:
+            - api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/events/postserverlistsetevent.md
             - api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/events/preserverlistsetevent.md
           - objects:
             - api/reference/platform-bukkit/ch.andre601.advancedserverlist.api.bukkit/objects/bukkitplayer.md
@@ -160,6 +161,7 @@ nav:
         - api/reference/platform-bungeecord/index.md
         - ch.andre601.advancedserverlist.api.bungeecord:
           - events:
+            - api/reference/platform-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/events/postserverlistsetevent.md
             - api/reference/platform-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/events/preserverlistsetevent.md
           - objects:
             - api/reference/platform-bungeecord/ch.andre601.advancedserverlist.api.bungeecord/objects/bungeeplayer.md
@@ -168,6 +170,7 @@ nav:
         - api/reference/platform-velocity/index.md
         - ch.andre601.advancedserverlist.api.velocity:
           - events:
+            - api/reference/platform-velocity/ch.andre601.advancedserverlist.api.velocity/events/postserverlistsetevent.md
             - api/reference/platform-velocity/ch.andre601.advancedserverlist.api.velocity/events/preserverlistsetevent.md
           - objects:
             - api/reference/platform-velocity/ch.andre601.advancedserverlist.api.velocity/objects/velocityplayer.md

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

@@ -25,6 +25,8 @@
 
 package ch.andre601.advancedserverlist.paper.listeners;
 
+import ch.andre601.advancedserverlist.api.bukkit.events.PostServerListSetEvent;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.paper.PaperCore;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
@@ -43,6 +45,8 @@ public class PingEvent implements Listener{
     
     @EventHandler(priority = EventPriority.HIGHEST) // Maintenance plugin has HIGHEST priority, so ASL needs too.
     public void onPaperServerListPing(PaperServerListPingEvent event){
-        PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
+        ProfileEntry entry = PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
+        
+        plugin.getServer().getPluginManager().callEvent(new PostServerListSetEvent(entry));
     }
 }

pom.xml

@@ -37,10 +37,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>4.5.0</plugin.version>
+        <plugin.version>4.6.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
-        <api.version>3.2.1</api.version>
+        <api.version>3.3.0</api.version>
         
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/listeners/PingEvent.java

@@ -25,6 +25,8 @@
 
 package ch.andre601.advancedserverlist.velocity.listeners;
 
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.api.velocity.events.PostServerListSetEvent;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import com.velocitypowered.api.event.PostOrder;
@@ -42,6 +44,8 @@ public class PingEvent{
     
     @Subscribe(order = PostOrder.LAST) // Maintenance has LAST priority, so ASL needs it too.
     public void onProxyPing(ProxyPingEvent event){
-        PingEventHandler.handleEvent(new VelocityEventWrapper(plugin, event));
+        ProfileEntry entry = PingEventHandler.handleEvent(new VelocityEventWrapper(plugin, event));
+        
+        plugin.getProxy().getEventManager().fire(new PostServerListSetEvent(entry));
     }
 }

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

@@ -35,7 +35,7 @@ public enum PlatformInfo{
             "paper/target/AdvancedServerList-Paper-{{version}}.jar",
             "addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
         ),
-        "paper", "folia"
+        List.of("Paper", "Folia")
     ),
     BUNGEECORD(
         "bungeecord",
@@ -43,7 +43,7 @@ public enum PlatformInfo{
             "bungeecord/target/AdvancedServerList-BungeeCord-{{version}}.jar",
             "addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
         ),
-        "bungeecord", "waterfall"
+        List.of("BungeeCord", "Waterfall")
     ),
     VELOCITY(
         "velocity",
@@ -51,17 +51,19 @@ public enum PlatformInfo{
             "velocity/target/AdvancedServerList-Velocity-{{version}}.jar",
             "addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
         ),
-        "velocity"
+        List.of("Velocity")
     );
     
     private final String platform;
     private final List<String> filePaths;
     private final List<String> loaders;
+    private final List<String> platformNames;
     
-    PlatformInfo(String platform, List<String> filePaths, String... loaders){
+    PlatformInfo(String platform, List<String> filePaths, List<String> loaders){
         this.platform = platform;
         this.filePaths = filePaths;
-        this.loaders = List.of(loaders);
+        this.loaders = loaders.stream().map(String::toLowerCase).toList();
+        this.platformNames = loaders;
     }
     
     public String getPlatform(){
@@ -75,4 +77,8 @@ public enum PlatformInfo{
     public List<String> getLoaders(){
         return loaders;
     }
+    
+    public List<String> getPlatformNames(){
+        return platformNames;
+    }
 }

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

@@ -25,18 +25,22 @@
 
 package ch.andre601.advancedserverlist.versionuploader;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-public class ModrinthRelease{
+public class ReleaseHolder{
     
-    Map<String, String> releases = new HashMap<>();
+    private final List<ReleaseInfo> releases = new ArrayList<>();
     
-    public void addRelease(String platform, String id){
-        releases.put(platform, id);
+    public void addRelease(String type, String platform, String url){
+        releases.add(new ReleaseInfo(type, platform, url));
     }
     
-    public Map<String, String> getReleases(){
+    public List<ReleaseInfo> getReleases(){
         return releases;
     }
+    
+    record ReleaseInfo(String type, String platform, String url){}
 }

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

@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Properties;
+import java.util.StringJoiner;
 import java.util.concurrent.CompletableFuture;
 
 public class VersionUploader{
@@ -53,7 +53,7 @@ public class VersionUploader{
         
         if(args.length == 0){
             LOGGER.warn("MISSING ARGUMENT!");
-            LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar <--all|--modrinth|--hangar> [--dryrun]");
+            LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar [--dryrun] --all | --modrinth | --hangar");
             System.exit(1);
             return;
         }
@@ -72,22 +72,19 @@ public class VersionUploader{
         }
         
         CompletableFuture<?> future;
-        ModrinthRelease modrinthRelease = null;
+        ReleaseHolder releaseHolder = new ReleaseHolder();
         switch(args[0].toLowerCase(Locale.ROOT)){
-            case "--modrinth" -> {
-                modrinthRelease = new ModrinthRelease();
-                future = new ModrinthVersionUploader().performUpload(release, modrinthRelease, dryrun);
-            }
-            case "--hangar" -> future = new HangarVersionUploader().performUpload(release, dryrun);
+            case "--modrinth" -> future = new ModrinthVersionUploader().performUpload(release, releaseHolder, dryrun);
+            case "--hangar" -> future = new HangarVersionUploader().performUpload(release, releaseHolder, dryrun);
             case "--all" -> {
-                modrinthRelease = new ModrinthRelease();
                 future = CompletableFuture.allOf(
-                    new ModrinthVersionUploader().performUpload(release, modrinthRelease, dryrun),
-                    new HangarVersionUploader().performUpload(release, dryrun)
+                    new ModrinthVersionUploader().performUpload(release, releaseHolder, dryrun),
+                    new HangarVersionUploader().performUpload(release, releaseHolder, dryrun)
                 );
             }
             default -> {
-                LOGGER.warn("Unknown argument '{}' provided. Supported are '--all', '--modrinth' or '--hangar'", args[0]);
+                LOGGER.warn("Unknown argument '{}' provided.", args[0]);
+                LOGGER.warn("COMMAND USAGE: java -jar VersionUploader.jar [--dryrun] --all | --modrinth | --hangar");
                 System.exit(1);
                 return;
             }
@@ -111,8 +108,8 @@ public class VersionUploader{
             System.exit(1);
         }
         
-        if(modrinthRelease == null || modrinthRelease.getReleases().isEmpty()){
-            LOGGER.warn("No Modrinth release info on Discord to share... Skipping.");
+        if(releaseHolder.getReleases().isEmpty()){
+            LOGGER.warn("No releases to share on Discord... Skipping.");
             return;
         }
         
@@ -124,17 +121,31 @@ public class VersionUploader{
         
         WebhookEmbedBuilder builder = new WebhookEmbedBuilder()
             .setTitle(new WebhookEmbed.EmbedTitle("New Release", null))
-            .setDescription("A new release of AdvancedServerList is available on Modrinth for you to download!")
+            .setDescription("A new release of AdvancedServerList is available on Modrinth and Hangar for you to download!")
             .setColor(0x1BD96A);
         
-        for(Map.Entry<String, String> entry : modrinthRelease.getReleases().entrySet()){
-            builder.addField(new WebhookEmbed.EmbedField(
-                false,
-                entry.getKey(),
-                "https://modrinth.com/plugin/advancedserverlist/version/" + entry.getValue()
-            ));
+        StringJoiner modrinthText = new StringJoiner("\n");
+        String hangarText = null;
+        for(ReleaseHolder.ReleaseInfo info : releaseHolder.getReleases()){
+            String text = String.format("[%s](%s)", info.platform(), info.url());
+            
+            if(info.type().equalsIgnoreCase("modrinth")){
+                modrinthText.add(text);
+            }else{
+                hangarText = text;
+            }
         }
         
+        builder.addField(new WebhookEmbed.EmbedField(
+            true,
+            "Modrinth:",
+            modrinthText.toString()
+        )).addField(new WebhookEmbed.EmbedField(
+            true,
+            "Hangar:",
+            hangarText == null ? "No download available" : hangarText
+        ));
+        
         try(WebhookClient client = new WebhookClientBuilder(webhookUrl).build()){
             CompletableFuture<ReadonlyMessage> webhookFuture = client.send(builder.build()).whenComplete((readonlyMessage, throwable) -> {
                 if(throwable != null){

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/hangar/HangarVersionUploader.java

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.versionuploader.hangar;
 
 import ch.andre601.advancedserverlist.versionuploader.PlatformInfo;
+import ch.andre601.advancedserverlist.versionuploader.ReleaseHolder;
 import ch.andre601.advancedserverlist.versionuploader.VersionUploader;
 import ch.andre601.advancedserverlist.versionuploader.data.CodebergRelease;
 import ch.andre601.advancedserverlist.versionuploader.hangar.version.Dependency;
@@ -35,6 +36,7 @@ import ch.andre601.advancedserverlist.versionuploader.hangar.version.Version;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 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;
@@ -72,7 +74,7 @@ public class HangarVersionUploader{
         this.apiKey = System.getenv("HANGAR_API_TOKEN");
     }
     
-    public CompletableFuture<?> performUpload(CodebergRelease release, boolean dryrun){
+    public CompletableFuture<?> performUpload(CodebergRelease release, ReleaseHolder releaseInfo, boolean dryrun){
         LOGGER.info("Starting HangarVersionUploader...");
         
         if((apiKey == null || apiKey.isEmpty()) && !dryrun){
@@ -145,14 +147,14 @@ public class HangarVersionUploader{
         
         try{
             HttpClient client = HttpClients.createDefault();
-            return uploadVersion(client, versionUpload, filePaths);
+            return uploadVersion(client, versionUpload, filePaths, releaseInfo);
         }catch(ParseException | IOException ex){
             LOGGER.warn("Encountered an exception while uploading to Hangar!", ex);
             return CompletableFuture.completedFuture(ex);
         }
     }
     
-    private CompletableFuture<?> uploadVersion(HttpClient client, Version versionUpload, List<Path> filePaths) throws IOException, ParseException{
+    private CompletableFuture<?> uploadVersion(HttpClient client, Version versionUpload, List<Path> filePaths, ReleaseHolder releaseInfo) throws IOException, ParseException{
         return CompletableFuture.supplyAsync(() -> {
             MultipartEntityBuilder builder = MultipartEntityBuilder.create();
             builder.addPart("versionUpload", new StringBody(GSON.toJson(versionUpload), ContentType.APPLICATION_JSON));
@@ -174,7 +176,22 @@ public class HangarVersionUploader{
                         ));
                     }
                     LOGGER.info("Successfully uploaded new release on Hangar!");
-                    return true;
+                    
+                    String body = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+                    try{
+                        JsonObject json = GSON.fromJson(body, JsonObject.class);
+                        if(json == null)
+                            return true;
+                        
+                        releaseInfo.addRelease(
+                            "hangar",
+                            "Paper, Waterfall, Velocity",
+                            json.getAsJsonPrimitive("url").getAsString()
+                        );
+                        return true;
+                    }catch(JsonSyntaxException ex){
+                        return true;
+                    }
                 });
             }catch(IOException ex){
                 LOGGER.warn("Encountered IOException while perfoming upload.", ex);

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/modrinth/ModrinthVersionUploader.java

@@ -25,7 +25,7 @@
 
 package ch.andre601.advancedserverlist.versionuploader.modrinth;
 
-import ch.andre601.advancedserverlist.versionuploader.ModrinthRelease;
+import ch.andre601.advancedserverlist.versionuploader.ReleaseHolder;
 import ch.andre601.advancedserverlist.versionuploader.PlatformInfo;
 import ch.andre601.advancedserverlist.versionuploader.VersionUploader;
 import ch.andre601.advancedserverlist.versionuploader.data.CodebergRelease;
@@ -45,7 +45,9 @@ import java.util.concurrent.CompletableFuture;
 
 public class ModrinthVersionUploader{
     
-    private static final Logger LOGGER = LoggerFactory.getLogger(ModrinthVersionUploader.class);
+    private final Logger logger = LoggerFactory.getLogger(ModrinthVersionUploader.class);
+    
+    private final String versionUrl = "https://modrinth.com/plugin/advancedserverlist/version/";
     
     private final List<PlatformInfo> platforms = List.of(
         PlatformInfo.PAPER,
@@ -62,11 +64,11 @@ public class ModrinthVersionUploader{
         this.api = createClient();
     }
     
-    public CompletableFuture<?> performUpload(CodebergRelease release, ModrinthRelease modrinthRelease, boolean dryrun){
-        LOGGER.info("Starting ModrinthVersionUploader...");
+    public CompletableFuture<?> performUpload(CodebergRelease release, ReleaseHolder releaseHolder, boolean dryrun){
+        logger.info("Starting ModrinthVersionUploader...");
         
         if(api == null){
-            LOGGER.warn("Cannot create updates on Modrinth. API instance is null.");
+            logger.warn("Cannot create updates on Modrinth. API instance is null.");
             return CompletableFuture.completedFuture(false);
         }
         
@@ -74,7 +76,7 @@ public class ModrinthVersionUploader{
         final String pluginVersion = VersionUploader.retrieveVersion();
         
         if(pluginVersion == null || pluginVersion.isEmpty()){
-            LOGGER.warn("Retrieved null/empty plugin version.");
+            logger.warn("Retrieved null/empty plugin version.");
             return CompletableFuture.completedFuture(false);
         }
         
@@ -97,7 +99,7 @@ public class ModrinthVersionUploader{
         );
         
         for(int i = 0; i < platforms.size(); i++){
-            LOGGER.info("Creating release for platform {}...", platforms.get(i).getPlatform());
+            logger.info("Creating release for platform {}...", platforms.get(i).getPlatform());
             
             List<File> files = platforms.get(i).getFilePaths().stream()
                 .map(path -> new File(path.replace("{{version}}", pluginVersion)))
@@ -125,7 +127,7 @@ public class ModrinthVersionUploader{
                 Gson gson = new GsonBuilder().setPrettyPrinting().create();
                 String json = gson.toJson(builder.build());
                 
-                LOGGER.info("JSON Data to send: {}", json);
+                logger.info("JSON Data to send: {}", json);
                 
                 futures[i] = CompletableFuture.completedFuture(json);
                 continue;
@@ -134,14 +136,20 @@ public class ModrinthVersionUploader{
             final int index = i;
             futures[i] = api.versions().createProjectVersion(builder.build()).whenComplete(((projectVersion, throwable) -> {
                 if(throwable != null){
-                    LOGGER.warn("Encountered an exception while uploading a new release to Modrinth!", throwable);
+                    logger.warn("Encountered an exception while uploading a new release to Modrinth!", throwable);
                     return;
                 }
                 
-                LOGGER.info("Created new release!");
-                LOGGER.info("Link: https://modrinth.com/plugin/advancedserverlist/version/{}", projectVersion.getId());
+                String url = versionUrl + projectVersion.getId();
                 
-                modrinthRelease.addRelease(String.join(", ", platforms.get(index).getLoaders()), projectVersion.getId());
+                logger.info("Created new release!");
+                logger.info("Link: {}", url);
+                
+                releaseHolder.addRelease(
+                    "modrinth",
+                    String.join(", ", platforms.get(index).getPlatformNames()),
+                    url
+                );
             }));
         }