Update Hytale version and progressbar placeholders

Closes #55

Author: MrMicky-FR

.github/workflows/build.yml

@@ -17,29 +17,31 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: ${{ matrix.java-version }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v6
+        with:
+          cache-provider: basic
 
       - name: Build
         run: ./gradlew build
 
       - name: Upload AzLink.jar
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: AzLink
           path: universal/build/libs/AzLink-*.jar
           overwrite: true
 
       - name: Upload AzLink-Legacy.jar
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: AzLink-Legacy
           path: universal-legacy/build/libs/AzLink-Legacy-*.jar

README.md

@@ -12,17 +12,24 @@ This plugin currently supports the following platforms:
 * [Velocity](https://velocitypowered.com/)
 * [Nukkit](https://cloudburstmc.org/articles/)
 * [Hytale](https://hytale.com/)
+* [Fabric](https://fabricmc.net/)
+* [Forge](https://files.minecraftforge.net/)
+* [NeoForge](https://neoforged.net/)
 
 > [!NOTE]
-> NeoForge and Fabric versions of the plugin are available in the [dev/mods branch](https://github.com/Azuriom/AzLink/tree/dev/mods).
+> Code for Fabric, Forge and NeoForge versions of AzLink is available in the [dev/mods branch](https://github.com/Azuriom/AzLink/tree/dev/mods).
 
 ## Setup
 
-### Installation
+### Download
 
-The plugin works with the same .jar for all the platforms, except Bukkit/Spigot 1.7.10 which requires the legacy version of the plugin.
+The latest version of AzLink for _Minecraft: Java Edition_ can be downloaded on [Modrinth](https://modrinth.com/project/azuriom).
 
-You just need to download the plugin, add it to the `plugins` folder of your server, and restart your server.
+For Nukkit and Hytale, you can download the plugin from the [GitHub Releases](https://github.com/Azuriom/AzLink/releases).
+
+## Installation
+
+Download AzLink, add it to the `plugins` or `mods` folder of your server, and restart your server.
 
 ## Building
 
@@ -61,11 +68,14 @@ When the shop and/or vote plugins are installed on your Azuriom website, the int
 * `%azlink_vote_top_[position]_votes%`: vote count of player at given position in ranking
 * `%azlink_vote_goal_progress%`: number of votes currently counted toward the monthly vote goal
 * `%azlink_vote_goal_target%`: total number of votes required to reach the monthly vote goal
+* `%azlink_vote_goal_percentage%`: percentage progress toward the monthly vote goal
+* `%azlink_vote_goal_progressbar%`: progress bar of recent votes toward the monthly vote goal
 
 ### Shop Placeholders
 * `%azlink_shop_goal_progress%`: current progress of the shop goal this month
 * `%azlink_shop_goal_total%`: total amount of the shop goal this month
 * `%azlink_shop_goal_percentage%`: percentage progress of the shop goal this month
+* `%azlink_shop_goal_progressbar%`: progress bar of the shop goal this month
 * `%azlink_shop_top_[position]_name%`: name of top customer at given position this month
 * `%azlink_shop_top_[position]_amount%`: amount spent by top customer at given position
 * `%azlink_shop_top_[position]_currency%`: currency of top customer at given position

build.gradle

@@ -1,6 +1,6 @@
 allprojects {
     group = 'com.azuriom'
-    version = '1.3.11'
+    version = '1.3.12'
 }
 
 subprojects {

bukkit/src/main/java/com/azuriom/azlink/bukkit/command/BukkitCommandSender.java

@@ -1,15 +1,32 @@
 package com.azuriom.azlink.bukkit.command;
 
+import com.azuriom.azlink.common.chat.AdventureComponentAdapter;
 import com.azuriom.azlink.common.chat.TextComponent;
 import com.azuriom.azlink.common.command.CommandSender;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
 
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
 public class BukkitCommandSender implements CommandSender {
 
+    private static final boolean ADVENTURE_SUPPORT;
+
+    static {
+        boolean adventureSupport = true;
+
+        try {
+            Class<?> component = Class.forName("net.kyori.adventure.text.Component");
+            Player.class.getMethod("sendMessage", component);
+        } catch (ClassNotFoundException | NoSuchMethodException e) {
+            adventureSupport = false;
+        }
+
+        ADVENTURE_SUPPORT = adventureSupport;
+    }
+
     private final org.bukkit.command.CommandSender sender;
 
     public BukkitCommandSender(org.bukkit.command.CommandSender sender) {
@@ -37,6 +54,11 @@ public void sendMessage(String message) {
 
     @Override
     public void sendMessage(TextComponent message) {
+        if (ADVENTURE_SUPPORT) {
+            this.sender.sendMessage(AdventureComponentAdapter.toAdventure(message));
+            return;
+        }
+
         sendMessage(message.toMinecraftLegacy());
     }
 

bukkit/src/main/java/com/azuriom/azlink/bukkit/injector/InjectedHttpServer.java

@@ -32,19 +32,19 @@ public InjectedHttpServer(AzLinkBukkitPlugin plugin) {
     public void start() {
         // Make sure Netty isn't relocated
         if (!HttpDecoder.class.getSuperclass().getName().startsWith("io.")) {
-            plugin.getLoggerAdapter().error("Injecting HTTP server on server channel is not supported with AzLink legacy.");
+            this.plugin.getLoggerAdapter().error("Injecting HTTP server on server channel is not supported with AzLink legacy.");
             return;
         }
 
         if (!Bukkit.getServer().getClass().getSimpleName().equals("CraftServer")) {
-            plugin.getLoggerAdapter().error("Injecting HTTP server on server channel is only supported on CraftBukkit based servers. You can use an other port for AzLink.");
+            this.plugin.getLoggerAdapter().error("Injecting HTTP server on server channel is only supported on CraftBukkit based servers. You can use an other port for AzLink.");
             return;
         }
 
         try {
             inject();
         } catch (Exception e) {
-            plugin.getLoggerAdapter().error("Unable to inject HTTP server. Try using a different port for AzLink", e);
+            this.plugin.getLoggerAdapter().error("Unable to inject HTTP server. Try using a different port for AzLink", e);
         }
     }
 
@@ -82,7 +82,7 @@ private void inject() throws Exception {
 
                 injectServerChannel((ChannelFuture) item);
 
-                plugin.getLoggerAdapter().info("HTTP server successfully injected.");
+                this.plugin.getLoggerAdapter().info("HTTP server successfully injected.");
 
                 return;
             }
@@ -96,7 +96,7 @@ public void uninject() {
             return; // We are not injected
         }
 
-        Channel channel = serverChannel.channel();
+        Channel channel = this.serverChannel.channel();
 
         channel.eventLoop().submit(() -> {
             try {
@@ -106,7 +106,7 @@ public void uninject() {
             }
         });
 
-        serverChannel = null;
+        this.serverChannel = null;
     }
 
     private void injectServerChannel(ChannelFuture future) {
@@ -139,9 +139,9 @@ private ChannelHandler createChannelHandler() {
             @Override
             protected void initChannel(Channel channel) {
                 try {
-                    channel.eventLoop().submit(() -> channel.pipeline().addFirst(new HttpDecoder(plugin.getPlugin())));
+                    channel.eventLoop().submit(() -> channel.pipeline().addFirst(new HttpDecoder(InjectedHttpServer.this.plugin.getPlugin())));
                 } catch (Exception e) {
-                    plugin.getLoggerAdapter().error("Unable to init channel", e);
+                    InjectedHttpServer.this.plugin.getLoggerAdapter().error("Unable to init channel", e);
                 }
             }
         };

bukkit/src/main/java/com/azuriom/azlink/bukkit/injector/NettyLibraryLoader.java

@@ -63,7 +63,7 @@ private void loadLibrary(String groupId, String artifactId, String version) thro
         }
 
         URL[] urls = {jar.toUri().toURL()};
-        ClassLoader classLoader = plugin.getClass().getClassLoader();
+        ClassLoader classLoader = this.plugin.getClass().getClassLoader();
         Field classLoaderField = classLoader.getClass().getDeclaredField("libraryLoader");
 
         classLoaderField.setAccessible(true);

bukkit/src/main/java/com/azuriom/azlink/bukkit/placeholders/BasePlaceholderExpansion.java

@@ -69,13 +69,13 @@ public boolean persist() {
     public void start() {
         this.providers.put("money", new MoneyPlaceholderProvider());
 
-        if (plugin.getConfig().getBoolean("placeholders.shop")) {
-            this.providers.put("shop", new ShopPlaceholderProvider(plugin));
+        if (this.plugin.getConfig().getBoolean("placeholders.shop")) {
+            this.providers.put("shop", new ShopPlaceholderProvider(this.plugin));
             this.plugin.getLogger().info("Shop placeholders successfully enabled.");
         }
 
-        if (plugin.getConfig().getBoolean("placeholders.vote")) {
-            this.providers.put("vote", new VotePlaceholderProvider(plugin));
+        if (this.plugin.getConfig().getBoolean("placeholders.vote")) {
+            this.providers.put("vote", new VotePlaceholderProvider(this.plugin));
             this.plugin.getLogger().info("Vote placeholders successfully enabled.");
         }
     }

bukkit/src/main/java/com/azuriom/azlink/bukkit/placeholders/PlaceholderProvider.java

@@ -1,7 +1,10 @@
 package com.azuriom.azlink.bukkit.placeholders;
 
+import com.google.common.base.Strings;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.ConfigurationSection;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -47,4 +50,14 @@ default String formatDuration(String format, Duration duration) {
                 .replace("%m", Long.toString(minutes))
                 .replace("%s", Long.toString(seconds));
     }
+
+    default String formatProgressBar(double progress, ConfigurationSection config) {
+        int totalLength = config.getInt("progress-bar.length", 15);
+        String fill = config.getString("progress-bar.fill", "█");
+        String separator = config.getString("progress-bar.separator", "&7");
+        int filled = (int) Math.round(totalLength * Math.max(Math.min(progress, 1), 0));
+        String sep = ChatColor.translateAlternateColorCodes('&', separator);
+
+        return Strings.repeat(fill, filled) + sep + Strings.repeat(fill, totalLength - filled);
+    }
 }

bukkit/src/main/java/com/azuriom/azlink/bukkit/placeholders/ShopPlaceholderProvider.java

@@ -2,9 +2,8 @@
 
 import com.azuriom.azlink.bukkit.AzLinkBukkitPlugin;
 import com.azuriom.azlink.common.http.client.HttpClient;
-import com.google.common.base.Strings;
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.scheduler.BukkitTask;
 
 import java.time.Instant;
@@ -36,6 +35,7 @@ public List<String> availablePlaceholders() {
                 "%azlink_shop_goal_progress%",
                 "%azlink_shop_goal_total%",
                 "%azlink_shop_goal_percentage%",
+                "%azlink_shop_goal_progressbar%",
                 "%azlink_shop_top_[position]_name%",
                 "%azlink_shop_top_[position]_amount%",
                 "%azlink_shop_top_[position]_currency%",
@@ -81,16 +81,14 @@ private String goalPlaceholder(String type) {
 
         switch (type) {
             case "progress":
-                return String.valueOf(this.goalProgress);
+                return Double.toString(this.goalProgress);
             case "total":
-                return String.valueOf(this.goalTotal);
+                return Double.toString(this.goalTotal);
             case "percentage":
                 return String.format("%.2f%%", proportion * 100);
             case "progressbar":
-                int length = 15;
-                int filled = (int) Math.round(length * Math.min(proportion, 1));
-
-                return Strings.repeat("■", filled) + ChatColor.GRAY + Strings.repeat("■", length - filled);
+                FileConfiguration config = this.plugin.getConfig();
+                return formatProgressBar(proportion, config.getConfigurationSection("placeholders"));
             default:
                 return null;
         }

bukkit/src/main/java/com/azuriom/azlink/bukkit/placeholders/VotePlaceholderProvider.java

@@ -4,6 +4,7 @@
 import com.azuriom.azlink.common.http.client.HttpClient;
 import com.google.gson.annotations.SerializedName;
 import org.bukkit.OfflinePlayer;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
@@ -67,7 +68,9 @@ public List<String> availablePlaceholders() {
                 "%azlink_vote_top_[position]_name%",
                 "%azlink_vote_top_[position]_votes%",
                 "%azlink_vote_goal_target%",
-                "%azlink_vote_goal_progress%"
+                "%azlink_vote_goal_progress%",
+                "%azlink_vote_goal_percentage%",
+                "%azlink_vote_goal_progressbar%"
         );
     }
 
@@ -139,30 +142,36 @@ private String userCanPlaceholder(String[] parts, OfflinePlayer player) throws N
         return null;
     }
 
-    private String goalPlaceholder(String action) {
+    private String goalPlaceholder(String type) {
         VoteGoal goal = this.goal;
+        double proportion = goal != null ? (double) goal.progress / goal.target : 0;
 
-        switch (action) {
+        switch (type) {
             case "target":
                 return goal != null ? Integer.toString(goal.target) : "0";
             case "progress":
                 return goal != null ? Integer.toString(goal.progress) : "0";
+            case "percentage":
+                return String.format("%.2f%%", proportion * 100);
+            case "progressbar":
+                FileConfiguration config = this.plugin.getConfig();
+                return formatProgressBar(proportion, config.getConfigurationSection("placeholders"));
             default:
                 return null;
         }
     }
 
     private String sitePlaceholder(String[] parts) throws NumberFormatException {
         if (parts[1].equals("count")) {
-            return Integer.toString(voteSites.size());
+            return Integer.toString(this.voteSites.size());
         }
 
         if (parts.length < 3) {
             return null;
         }
 
         int id = Integer.parseInt(parts[1]);
-        VoteSite site = voteSites.get(id);
+        VoteSite site = this.voteSites.get(id);
 
         if (site == null) {
             return "<unknown>";