Fix #173, #171, #157

Author: Greymagic27

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

@@ -48,9 +48,9 @@ public abstract class AbstractRankingCommand extends AbstractCommand {
     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;
@@ -73,9 +73,9 @@ public void extractConfigurationParameters() {
         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
@@ -112,7 +112,7 @@ public void onExecute(CommandSender sender, String[] args) {
                 if (playerRank <= configTopList) {
                     launchEffects((Player) sender);
                 }
-                sender.sendMessage(langPlayerRank + playerRank + NamedTextColor.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));
             }
         }
     }

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

@@ -53,11 +53,11 @@ public class BookCommand extends AbstractCommand implements Cleanable {
     private boolean configAdditionalEffects;
     private boolean configSound;
     private String configSoundBook;
-    private String langBookDelay;
-    private String langBookNotReceived;
+    private Component langBookDelay;
+    private Component langBookNotReceived;
     private Component langBookDate;
     private String langBookName;
-    private String langBookReceived;
+    private Component langBookReceived;
     private DateFormat dateFormat;
 
     @Inject
@@ -77,11 +77,12 @@ public void extractConfigurationParameters() {
         configAdditionalEffects = mainConfig.getBoolean("AdditionalEffects");
         configSound = mainConfig.getBoolean("Sound");
         configSoundBook = Objects.requireNonNull(mainConfig.getString("SoundBook")).toUpperCase();
-        langBookDelay = pluginHeader + StringUtils.replaceEach(langConfig.getString("book-delay"), new String[]{"TIME"}, new String[]{Integer.toString(configTimeBook / 1000)});
-        langBookNotReceived = pluginHeader + langConfig.getString("book-not-received");
+        langBookDelay = replace(Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString("book-delay")))).build(), "TIME", Integer.toString(configTimeBook / 1000));
+        langBookNotReceived = Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString("book-not-received")))).build();
         langBookDate = ColorHelper.convertAmpersandToComponent(langConfig.getString("book-date"));
         langBookName = langConfig.getString("book-name");
-        langBookReceived = pluginHeader + langConfig.getString("book-received");
+        langBookReceived = Component.text().append(pluginHeader.get()).append(Component.text(Objects.requireNonNull(langConfig.getString("book-received")))).build();
+
 
         String localeString = mainConfig.getString("DateLocale");
         dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.forLanguageTag(Objects.requireNonNull(localeString)));
@@ -125,7 +126,7 @@ void onExecute(CommandSender sender, String[] args) {
      * Constructs the pages of a book.
      *
      * @param achievements achievements
-     * @param player player
+     * @param player       player
      */
     private void fillBook(@NonNull List<AwardedDBAchievement> achievements, Player player) {
         ItemStack book = new ItemStack(Material.WRITTEN_BOOK);

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

@@ -102,7 +102,7 @@ void onExecute(CommandSender sender, String[] args) {
             }
         }
         // Display enriched progress bar.
-        Component message = Component.text(String.valueOf(pluginHeader)).append(Component.text("[")).append(barDisplay).append(Component.text("]", NamedTextColor.DARK_GRAY));
+        Component message = Component.text().append(pluginHeader.get()).append(Component.text("[")).append(barDisplay).append(Component.text("]")).build();
         player.sendMessage(message);
 
         // Player has received all achievement; play special effect and sound.

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

@@ -40,7 +40,6 @@ public void play(@NonNull Player player, String providedSound, String fallbackSo
         } else {
             logger.warning("soundToPlay is null");
         }
-        logger.info("playing sound " + soundToPlay);
     }
 
     /**