26.1.2 (#160)

* Update for 26.1.1

* Update workflow to Java 25

* Minor updates

* Bump paper version

* Bump paper

* Change how plugin is named

* Update for 26.1.2

* Mass format

* Convert to Adventure rather than ChatColor

* Prefix is now in grey as well

* Spacing fix

* Remove message as it's clear when this is granted anyway

* Remove message as it's clear when this is granted anyway

* Undo last 2 commits

* Minor spacing changes

* Cleaning up colors further - can now specify firework color in config

* Code cleanup

* Fix gui elements having color codes written in

* Remove all instances of ChatColor

* Update readme

* Format

* Update ConfigModule to use Component for PluginHeader

* Add legacy stringbuilder
for now

* Readme update

* Readme update

* Possibly resolve #159

* Possibly resolve #157

* Fix compile error

* Readme update - Changes to support this are still in the works

* Potential fix for pull request finding 'Potential input resource leak'

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

* Github CQ suggestion

* Hardcode more colours into strings

* Combine lines

* Revert readme

* Fix commands appearing as raw strings

* Fixes #159

* Closes #165

* Inline variable

* Expand test suite

* Inline method to remove class

* Code cleanup

* Fix #162

* Update paper version

* Dependency update

* Disable tests to continue working. Adventure update broke a lot of these

* Revert adventure update

* Code refactor

Code refactor

* Fix #166

* Update config links

* Embed method

* Embed method

* Fix #161

* Capitals

* Make 'HINT' light grey again

* Fix #174

* Fix #173, #171, #157

* Fix tests

* Fix #172

---------

Co-authored-by: Copilot Autofix powered by AI <223894421+github-code-quality[bot]@users.noreply.github.com>

Author: Greymagic27

.github/workflows/maven.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6.0.2
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v5.2.0
         with:
-          java-version: '21'
+          java-version: '25'
           distribution: 'microsoft'
           cache: maven
       - name: Build with Maven

CONTRIBUTING.md

@@ -3,7 +3,8 @@
 Found a problem or need some help? The following steps may help:
 
 1. Upgrade to the latest version of the plugin (
-   available [here](https://www.spigotmc.org/resources/advancedachievements.121486/history)) and a recent Paper build for
+   available [here](https://www.spigotmc.org/resources/advancedachievements.121486/history)) and a recent Paper build
+   for
    your Minecraft version (see [here](https://docs.papermc.io/paper/getting-started)).
 2. Check your server's logs (including when plugins are loaded!), there may be warnings/errors/stack straces to help you
    out with your issue.

README.md

@@ -10,7 +10,7 @@
 
 Custom fork for Minecraft server 1MoreBlock.com
 
-Recent changes include java 21+, 1.21.11, and legacy color code fixes.
+Recent changes include Java 25, 26.1.2, and removing deprecated ChatColor methods in favour of Adventure Components.
 
 **Advanced Achievements enables unique and challenging achievements on Minecraft servers. Collect as many as you can,
 earn rewards, climb the rankings and receive RP books! The plugin supports SQLite, MySQL, H2 and PostgreSQL, manages an
@@ -26,23 +26,22 @@ releases page here on GitHub by the way, but here it is.)
 <br/>
 </p>
 
-## :star: Support and feedback
+## ⭐ Support and feedback
 
-Thought of a cool idea? Found a problem or need some help? Simply open an [**issue
-**](https://github.com/mrfdev/advanced-achievements/issues)!
+Thought of a cool idea? Found a problem or need some help? Simply open an [**issue**](https://github.com/mrfdev/advanced-achievements/issues)!
 
 Find the project useful, fun or interesting? **Star** the repository by clicking on the icon on the top right of this
 page!
 
-## :computer: Code contributions
+## 🖥️ Code contributions
 
 Want to make Advanced Achievements better, faster, stronger? Contributions are welcome, open a **pull request** and
 share your code! Simply **fork** the repository by clicking on the icon on the top right of this page to get started.
 
-## :balance_scale: License
+## ⚖️ License
 
 GNU General Public License v3.0
 
-## Special credits
+## 📜 Special credits
 
 Pierre-Yves Bigourdan, [@PyvesB](https://github.com/PyvesB/) 

advanced-achievements-api/src/main/java/com/hm/achievement/domain/Reward.java

@@ -2,9 +2,8 @@
 
 import java.util.List;
 import java.util.function.Consumer;
+import net.kyori.adventure.text.Component;
 import org.bukkit.entity.Player;
 
-public record Reward(List<String> listTexts, List<String> chatTexts, Consumer<Player> rewarder) {
-
-
+public record Reward(List<String> listTexts, List<Component> chatTexts, Consumer<Player> rewarder) {
 }

advanced-achievements-plugin/pom.xml

@@ -52,7 +52,6 @@
             <artifactId>petmaster</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--suppress VulnerableLibrariesLocal -->
         <dependency>
             <groupId>com.github.Zrips</groupId>
             <artifactId>CMI-API</artifactId>
@@ -163,7 +162,7 @@
                 <executions>
                     <execution>
                         <configuration>
-                            <finalName>advanced-achievements-plugin-${project.version}</finalName>
+                            <finalName>advanced-achievements-${project.version}</finalName>
                             <minimizeJar>true</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <outputFile>${project.build.directory}/${project.build.finalName}.jar</outputFile>
@@ -197,6 +196,10 @@
                                     <shadedPattern>com.hm.fasterxml.jackson</shadedPattern>
                                 </relocation>
                             </relocations>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                            </transformers>
                         </configuration>
                         <phase>package</phase>
                         <goals>

advanced-achievements-plugin/src/main/java/com/hm/achievement/AdvancedAchievements.java

@@ -19,14 +19,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 @Singleton
-@Component(modules = {
-        CleanableModule.class,
-        CommandModule.class,
-        ConfigModule.class,
-        DatabaseModule.class,
-        ReloadableModule.class,
-        ServerVersionModule.class
-})
+@Component(modules = {CleanableModule.class, CommandModule.class, ConfigModule.class, DatabaseModule.class, ReloadableModule.class, ServerVersionModule.class})
 interface AdvancedAchievementsComponent {
 
     PluginLoader pluginLoader();
@@ -64,30 +57,27 @@ public void onEnable() {
         long startTime = System.currentTimeMillis();
         // DaggerAdvancedAchievementsComponent is generated by Dagger. Add target/generated-sources/annotations to your
         // build path if the IDE complains here. In any case this will not actually prevent you from compiling.
-        AdvancedAchievementsComponent advancedAchievementsComponent = DaggerAdvancedAchievementsComponent.builder()
-                .advancedAchievements(this).logger(getLogger()).build();
+        AdvancedAchievementsComponent advancedAchievementsComponent = DaggerAdvancedAchievementsComponent.builder().advancedAchievements(this).logger(getLogger()).build();
 
         pluginLoader = advancedAchievementsComponent.pluginLoader();
         advancedAchievementsAPI = advancedAchievementsComponent.advancedAchievementsBukkitAPI();
 
         try {
             pluginLoader.loadAdvancedAchievements();
         } catch (PluginLoadError e) {
-            getLogger().log(Level.SEVERE,
-                    "A non recoverable error was encountered while loading the plugin, disabling it:", e);
+            getLogger().log(Level.SEVERE, "A non recoverable error was encountered while loading the plugin, disabling it:", e);
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
-
-        getLogger().info(
-                "Plugin has finished loading and is ready to run! Took " + (System.currentTimeMillis() - startTime) + "ms.");
+        getLogger().info("Plugin has finished loading and is ready to run! Took " + (System.currentTimeMillis() - startTime) + "ms.");
     }
 
     @Override
     public void onDisable() {
         pluginLoader.disableAdvancedAchievements();
     }
 
+    @SuppressWarnings("unused")
     public AdvancedAchievementsAPI getAdvancedAchievementsAPI() {
         return advancedAchievementsAPI;
     }

advanced-achievements-plugin/src/main/java/com/hm/achievement/command/executable/AbstractCommand.java

@@ -1,9 +1,11 @@
 package com.hm.achievement.command.executable;
 
+import com.hm.achievement.config.PluginHeader;
 import com.hm.achievement.lifecycle.Reloadable;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Abstract class in charge of factoring out common functionality for commands.
@@ -14,11 +16,11 @@ public abstract class AbstractCommand implements Reloadable {
 
     final YamlConfiguration mainConfig;
     final YamlConfiguration langConfig;
-    final StringBuilder pluginHeader;
+    final PluginHeader pluginHeader;
 
     private String langNoPermissions;
 
-    AbstractCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, StringBuilder pluginHeader) {
+    AbstractCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, PluginHeader pluginHeader) {
         this.mainConfig = mainConfig;
         this.langConfig = langConfig;
         this.pluginHeader = pluginHeader;
@@ -53,7 +55,12 @@ public void execute(CommandSender sender, String[] args) {
      */
     abstract void onExecute(CommandSender sender, String[] args);
 
-    String translateColorCodes(String translate) {
-        return ChatColor.translateAlternateColorCodes('&', translate);
+    protected Component replace(@NonNull Component component, String placeholder, String value) {
+        return component.replaceText(b -> b.matchLiteral(placeholder).replacement(value));
+    }
+
+    protected Component replace(@NonNull Component component, String @NonNull [] placeholders, String[] values) {
+        for (int i = 0; i < placeholders.length; i++) component = replace(component, placeholders[i], values[i]);
+        return component;
     }
 }

advanced-achievements-plugin/src/main/java/com/hm/achievement/command/executable/AbstractParsableCommand.java

@@ -1,6 +1,7 @@
 package com.hm.achievement.command.executable;
 
 import com.hm.achievement.command.external.CommandUtils;
+import com.hm.achievement.config.PluginHeader;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -18,7 +19,7 @@ public abstract class AbstractParsableCommand extends AbstractCommand {
     private String langPlayerOffline;
     private String langEntityNotPlayer;
 
-    AbstractParsableCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, StringBuilder pluginHeader) {
+    AbstractParsableCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, PluginHeader pluginHeader) {
         super(mainConfig, langConfig, pluginHeader);
     }
 

advanced-achievements-plugin/src/main/java/com/hm/achievement/command/executable/AbstractRankingCommand.java

@@ -1,7 +1,9 @@
 package com.hm.achievement.command.executable;
 
 import com.hm.achievement.command.pagination.CommandPagination;
+import com.hm.achievement.config.PluginHeader;
 import com.hm.achievement.db.AbstractDatabaseManager;
+import com.hm.achievement.utils.ColorHelper;
 import com.hm.achievement.utils.SoundPlayer;
 import com.hm.achievement.utils.StringHelper;
 import java.util.ArrayList;
@@ -11,13 +13,15 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.logging.Logger;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.Particle;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Abstract class in charge of factoring out common functionality for /aach top, week and month commands.
@@ -39,21 +43,20 @@ public abstract class AbstractRankingCommand extends AbstractCommand {
     private final AbstractDatabaseManager databaseManager;
     private final SoundPlayer soundPlayer;
 
-    private ChatColor configColor;
+    private NamedTextColor configColor;
     private int configTopList;
     private boolean configAdditionalEffects;
     private boolean configSound;
     private String configSoundRanking;
-    private String langPeriodAchievement;
-    private String langPlayerRank;
-    private String langNotRanked;
+    private Component langPeriodAchievement;
+    private Component langPlayerRank;
+    private Component langNotRanked;
     // Used for caching.
     private Map<String, Integer> cachedSortedRankings;
     private List<Integer> cachedAchievementCounts;
     private long lastCacheUpdate = 0L;
 
-    AbstractRankingCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, StringBuilder pluginHeader,
-                           Logger logger, String languageKey, AbstractDatabaseManager databaseManager, SoundPlayer soundPlayer) {
+    AbstractRankingCommand(YamlConfiguration mainConfig, YamlConfiguration langConfig, PluginHeader pluginHeader, Logger logger, String languageKey, AbstractDatabaseManager databaseManager, SoundPlayer soundPlayer) {
         super(mainConfig, langConfig, pluginHeader);
         this.logger = logger;
         this.languageKey = languageKey;
@@ -64,16 +67,15 @@ public abstract class AbstractRankingCommand extends AbstractCommand {
     @Override
     public void extractConfigurationParameters() {
         super.extractConfigurationParameters();
-
-        configColor = ChatColor.getByChar(Objects.requireNonNull(mainConfig.getString("Color")));
+        configColor = ColorHelper.configColor(mainConfig);
         configTopList = mainConfig.getInt("TopList");
         configAdditionalEffects = mainConfig.getBoolean("AdditionalEffects");
         configSound = mainConfig.getBoolean("Sound");
         configSoundRanking = Objects.requireNonNull(mainConfig.getString("SoundRanking")).toUpperCase();
 
-        langPeriodAchievement = pluginHeader + langConfig.getString(languageKey);
-        langPlayerRank = pluginHeader + langConfig.getString("player-rank") + " " + configColor;
-        langNotRanked = pluginHeader + langConfig.getString("not-ranked");
+        langPeriodAchievement = Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString(languageKey)))).build();
+        langPlayerRank = Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString("player-rank")))).append(Component.text(" ").color(configColor)).build();
+        langNotRanked = Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString("not-ranked")))).build();
     }
 
     @Override
@@ -87,7 +89,7 @@ public void onExecute(CommandSender sender, String[] args) {
 
         sender.sendMessage(langPeriodAchievement);
 
-        List<String> rankingMessages = getRankingMessages(sender);
+        List<Component> rankingMessages = getRankingMessages(sender);
 
         // If config has top set at less than one page, don't use pagination.
         if (configTopList < PER_PAGE) {
@@ -110,43 +112,36 @@ public void onExecute(CommandSender sender, String[] args) {
                 if (playerRank <= configTopList) {
                     launchEffects((Player) sender);
                 }
-                sender.sendMessage(
-                        langPlayerRank + playerRank + ChatColor.GRAY + "/" + configColor + cachedSortedRankings.size());
+                sender.sendMessage(langPlayerRank.append(Component.text(playerRank)).color(NamedTextColor.GRAY).append(Component.text("/").append(Component.text(cachedSortedRankings.size()))).color(NamedTextColor.GRAY));
             }
         }
     }
 
-    private int getPage(String[] args) {
+    private int getPage(String @NonNull [] args) {
         return args.length > 1 && NumberUtils.isDigits(args[1]) ? Integer.parseInt(args[1]) : 1;
     }
 
-    private List<String> getRankingMessages(CommandSender sender) {
-        List<String> rankingMessages = new ArrayList<>();
+    private @NonNull List<Component> getRankingMessages(CommandSender sender) {
+        List<Component> rankingMessages = new ArrayList<>();
         int currentRank = 1;
         for (Entry<String, Integer> ranking : cachedSortedRankings.entrySet()) {
             String playerName = Bukkit.getOfflinePlayer(UUID.fromString(ranking.getKey())).getName();
             if (playerName != null) {
-                // Color the name of the player if he is in the top list.
-                ChatColor color = playerName.equals(sender.getName()) ? configColor : ChatColor.GRAY;
-                rankingMessages.add(color + " " + getRankingSymbol(currentRank) + " " + playerName + " - "
-                        + ranking.getValue());
-            } else {
-                logger.warning("Ranking command: could not find player's name using a database UUID.");
-            }
-
+                // Colour the name of the player if he is in the top list.
+                NamedTextColor color = playerName.equals(sender.getName()) ? configColor : NamedTextColor.GRAY;
+                rankingMessages.add(Component.text(" " + getRankingSymbol(currentRank) + " " + playerName + " - " + ranking.getValue()).color(color));
+            } else logger.warning("Ranking command: could not find player's name using a database UUID.");
             ++currentRank;
-            if (currentRank > configTopList) {
-                break;
-            }
+            if (currentRank > configTopList) break;
         }
         return rankingMessages;
     }
 
     /**
      * Returns a UTF-8 circled number based on the player's rank.
      *
-     * @param rank
-     * @return an UTF-8 string corresponding to the rank
+     * @param rank rank
+     * @return a UTF-8 string corresponding to the rank
      */
     private String getRankingSymbol(int rank) {
         int decimalRankSymbol;
@@ -172,15 +167,10 @@ private String getRankingSymbol(int rank) {
     /**
      * Launches sound and particle effects if player is in a top list.
      *
-     * @param player
+     * @param player player
      */
     private void launchEffects(Player player) {
-        if (configAdditionalEffects) {
-            player.spawnParticle(Particle.PORTAL, player.getLocation(), 100, 0, 1, 0, 0.5f);
-        }
-
-        if (configSound) {
-            soundPlayer.play(player, configSoundRanking, "ENTITY_FIREWORK_ROCKET_BLAST");
-        }
+        if (configAdditionalEffects) player.spawnParticle(Particle.PORTAL, player.getLocation(), 100, 0, 1, 0, 0.5f);
+        if (configSound) soundPlayer.play(player, configSoundRanking, "ENTITY_FIREWORK_ROCKET_BLAST");
     }
 }