#patch Quality Updates and 1.21.5 pre update

.github/building/pom.xml

@@ -24,7 +24,7 @@
 
     <groupId>plugily.projects</groupId>
     <artifactId>minigamesbox</artifactId>
-    <version>1.3.17-SNAPSHOT4</version>
+    <version>1.4.0-SNAPSHOT0</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -101,21 +101,32 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.12.0</version>
+                <version>3.21.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>3.9.0</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <configuration>
                     <append>true</append>
                 </configuration>
@@ -153,8 +164,12 @@
 
     <distributionManagement>
         <repository>
-            <id>plugily-projects</id>
+            <id>Release</id>
             <url>https://maven.plugily.xyz/releases</url>
         </repository>
+        <snapshotRepository>
+            <id>Snapshot</id>
+            <url>https://maven.plugily.xyz/snapshots</url>
+        </snapshotRepository>
     </distributionManagement>
 </project>

MiniGamesBox API/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>minigamesbox</artifactId>
         <groupId>plugily.projects</groupId>
-        <version>1.4.0</version>
+        <version>1.4.0-SNAPSHOT7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>13.0.0</version>
+            <version>13.2.0</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

MiniGamesBox API/src/main/java/plugily/projects/minigamesbox/api/arena/managers/IPluginScoreboardManager.java

@@ -37,7 +37,7 @@ public interface IPluginScoreboardManager {
   /**
    * Get Lines from the language.yml according to arena state
    */
-  List<String> getScoreboardLines();
+  List<String> getScoreboardLines(Player player);
 
   /**
    * Update lines with defined placeholders

MiniGamesBox Classic/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>minigamesbox</artifactId>
         <groupId>plugily.projects</groupId>
-        <version>1.4.0</version>
+        <version>1.4.0-SNAPSHOT7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>13.0.0</version>
+            <version>13.2.0</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/PluginArenaManager.java

@@ -198,6 +198,7 @@ private boolean canJoinArenaAndMessage(Player player, IPluginArena arena) {
       return false;
     }
     String perm = plugin.getPluginNamePrefixLong() + ".join.<arena>";
+    plugin.getDebugger().debug("[{0}] Initial perm is <{1}> of name <{2}>", arena.getId(), perm, plugin.getPluginNamePrefixLong());
     if(!(player.hasPermission(perm.replace("<arena>", "*")) || player.hasPermission(perm.replace("<arena>", arena.getId())))) {
       MessageBuilder denyMessage = new MessageBuilder("IN_GAME_JOIN_NO_PERMISSION").asKey().player(player).value(perm.replace("<arena>", arena.getId()));
       if(plugin.getConfigPreferences().getOption("BUNGEEMODE")) {

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/arena/managers/PluginScoreboardManager.java

@@ -58,27 +58,20 @@ public void createScoreboard(IUser user) {
     FastBoard board = new FastBoard(player) {
       @Override
       public boolean hasLinesMaxLength() {
-        if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
-          try {
-            return Via.getAPI().getPlayerVersion(getPlayer()) < ProtocolVersion.v1_13.getVersion();
-          } catch(Exception ignored) {
-            //Not using ViaVersion 4 or unable to get ViaVersion return LegacyBoard!
-          }
-        }
-        return !ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_13);
+        return isLinesMaxLength(getPlayer());
       }
     };
 
     board.updateTitle(boardTitle);
-    board.updateLines(formatScoreboardLines(getScoreboardLines(), player));
+    board.updateLines(formatScoreboardLines(getScoreboardLines(player), player));
 
 
     boardMap.put(user.getUniqueId(), board);
   }
 
   @Override
   public void updateScoreboards() {
-    boardMap.values().forEach(fastBoard -> fastBoard.updateLines(formatScoreboardLines(getScoreboardLines(), fastBoard.getPlayer())));
+    boardMap.values().forEach(fastBoard -> fastBoard.updateLines(formatScoreboardLines(getScoreboardLines(fastBoard.getPlayer()), fastBoard.getPlayer())));
   }
 
   @Override
@@ -93,18 +86,36 @@ public void stopAllScoreboards() {
   }
 
   @Override
-  public List<String> getScoreboardLines() {
+  public List<String> getScoreboardLines(Player player) {
     return new ArrayList<>(plugin.getLanguageManager().getLanguageList(arena.getArenaState() == IArenaState.FULL_GAME ? "Scoreboard.Content.Starting"
         : "Scoreboard.Content." + arena.getArenaState().getFormattedName()));
   }
 
   @Override
   public List<String> formatScoreboardLines(List<String> lines, Player player) {
     List<String> formattedLines = new ArrayList<>();
+    if(isLinesMaxLength(player)) {
+      List<String> linesWithoutSpecialChars = new ArrayList<>();
+      for(String line : lines) {
+        linesWithoutSpecialChars.add(line.replace("■ ", "").replace("|", ""));
+      }
+      lines = linesWithoutSpecialChars;
+    }
     for(String line : lines) {
       formattedLines.add(new MessageBuilder(line).player(player).arena(arena).build());
     }
     return formattedLines;
   }
 
+  private boolean isLinesMaxLength(Player player) {
+    if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion")) {
+      try {
+        return Via.getAPI().getPlayerVersion(player) < ProtocolVersion.v1_13.getVersion();
+      } catch(Exception ignored) {
+        //Not using ViaVersion 4 or unable to get ViaVersion return LegacyBoard!
+      }
+    }
+    return !ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_13);
+  }
+
 }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/commands/arguments/game/LeaderboardArgument.java

@@ -85,11 +85,12 @@ private void printLeaderboard(CommandSender sender, IStatisticType statisticType
   }
 
   private String formatMessage(String statisticName, String playerName, int position, int value) {
-    String message = new MessageBuilder("LEADERBOARD_TYPE_CHAT_TOP_FORMAT").asKey().build();
+    String message = new MessageBuilder("LEADERBOARD_TYPE_CHAT_TOP_FORMAT").asKey().getRaw();
     message = message.replace("%number%", Integer.toString(position));
     message = message.replace("%player%", playerName);
     message = message.replace("%value%", Integer.toString(value));
     message = message.replace("%user_statistic%", statisticName);
+    message = new MessageBuilder(message).build();
     return message;
   }
 

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/hologram/LeaderboardHologram.java

@@ -72,8 +72,9 @@ public void updateHologram() {
       String text;
       if(i < reverseKeys.size()) {
         UUID uuid = reverseKeys.get(i);
-        text = new MessageBuilder("LEADERBOARD_TYPE_HOLOGRAM_FORMAT").asKey().integer(i + 1).value(String.valueOf(values.get(uuid))).build();
+        text = new MessageBuilder("LEADERBOARD_TYPE_HOLOGRAM_FORMAT").asKey().integer(i + 1).value(String.valueOf(values.get(uuid))).getRaw();
         text = text.replace("%player%", getPlayerNameSafely(uuid));
+        text = new MessageBuilder(text).build();
       } else {
         text = new MessageBuilder("LEADERBOARD_TYPE_HOLOGRAM_EMPTY_FORMAT").asKey().integer(i + 1).build();
       }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/language/MessageBuilder.java

@@ -117,18 +117,21 @@ public MessageBuilder prefix(String prefix) {
 
   public MessageBuilder player(Player player) {
     this.player = player;
+    colorChatIssue();
     formatPlayer();
     return this;
   }
 
   public MessageBuilder value(String value) {
     this.value = value;
+    colorChatIssue();
     formatValue();
     return this;
   }
 
   public MessageBuilder integer(int integer) {
     this.integer = integer;
+    colorChatIssue();
     formatInteger();
     return this;
   }
@@ -138,6 +141,7 @@ public MessageBuilder arena(IPluginArena arena) {
       return this;
     }
     this.arena = arena;
+    colorChatIssue();
     formatArena();
     return this;
   }

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/handlers/setup/categories/PluginCountableCategory.java

@@ -47,6 +47,7 @@ public void addItems(NormalFastInv gui) {
     CountItem minimumPlayers = new CountItem(setupInventory, new ItemBuilder(XMaterial.COAL.parseMaterial()), "Minimum Players", "How many players are needed to start the lobby countdown?", "minimumplayers");
     itemList.add(minimumPlayers);
     gui.setItem((getInventoryLine() * 9) + 1, minimumPlayers);
+    // could be added minimum players check
     CountItem maximumPlayers = new CountItem(setupInventory, new ItemBuilder(XMaterial.REDSTONE_BLOCK.parseMaterial()), "Maximum Players", "How many players can the arena hold?", "maximumplayers");
     itemList.add(maximumPlayers);
     gui.setItem((getInventoryLine() * 9) + 2, maximumPlayers);

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/preferences/ConfigOption.java

@@ -62,7 +62,8 @@ public class ConfigOption implements IConfigOption {
 
 
     options.put("EXTERNAL_PARTIES", new ConfigOption("Parties.External", true, true));
-    options.put("PARTIES", new ConfigOption("Parties.Own", false, true));
+    //todo not implemented yet!!!
+    options.put("OWN_PARTIES", new ConfigOption("Parties.Own", false, true));
     options.put("FALL_DAMAGE", new ConfigOption("Damage.Fall", false, true));
     options.put("DROWNING_DAMAGE", new ConfigOption("Damage.Drowning", false, true));
     options.put("FIRE_DAMAGE", new ConfigOption("Damage.Fire", false, true));

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/serialization/InventorySerializer.java

@@ -75,39 +75,6 @@ public static boolean saveInventoryToFile(JavaPlugin plugin, Player player) {
 
       FileConfiguration invConfig = YamlConfiguration.loadConfiguration(invFile);
 
-      invConfig.set("ExperienceProgress", player.getExp());
-      invConfig.set("ExperienceLevel", player.getLevel());
-      invConfig.set("Current health", player.getHealth());
-      invConfig.set("Food", player.getFoodLevel());
-      invConfig.set("Saturation", player.getSaturation());
-      invConfig.set("Fire ticks", player.getFireTicks());
-      invConfig.set("GameMode", player.getGameMode().name());
-      invConfig.set("Allow flight", player.getAllowFlight());
-      invConfig.set("Flight speed", player.getFlySpeed());
-      invConfig.set("Walk speed", player.getWalkSpeed());
-
-      invConfig.set("Size", inventory.getSize());
-      invConfig.set("Max stack size", inventory.getMaxStackSize());
-      Collection<PotionEffect> activeEffects = player.getActivePotionEffects();
-      List<String> activePotions = new ArrayList<>(activeEffects.size());
-
-      double maxHealth = VersionUtils.getMaxHealth(player);
-
-      for(PotionEffect potion : activeEffects) {
-        activePotions.add(potion.getType().getName() + "#" + potion.getDuration() + "#" + potion.getAmplifier());
-        if(potion.getType().equals(XPotion.HEALTH_BOOST.getPotionEffectType())) {
-          // Health boost effect gives +2 hearts per level, health is counted in half hearts so amplifier * 4
-          maxHealth -= (potion.getAmplifier() + 1) * 4;
-        }
-      }
-      invConfig.set("Active potion effects", activePotions);
-      invConfig.set("Max health", maxHealth);
-
-      org.bukkit.entity.HumanEntity holder = inventory.getHolder();
-      if(holder instanceof Player) {
-        invConfig.set("Holder", holder.getName());
-      }
-
       ItemStack[] invContents = inventory.getContents();
       for(int i = 0; i < invContents.length; i++) {
         ItemStack itemInInv = invContents[i];
@@ -136,6 +103,7 @@ public static boolean saveInventoryToFile(JavaPlugin plugin, Player player) {
 
       if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_9)) {
         invConfig.set("Offhand", inventory.getItemInOffHand());
+        inventory.setItemInOffHand(null);
       }
 
       ItemStack[] armorContents = inventory.getArmorContents();
@@ -146,6 +114,43 @@ public static boolean saveInventoryToFile(JavaPlugin plugin, Player player) {
         }
       }
 
+      inventory.clear();
+      inventory.setArmorContents(null);
+
+
+      invConfig.set("ExperienceProgress", player.getExp());
+      invConfig.set("ExperienceLevel", player.getLevel());
+      invConfig.set("Current health", player.getHealth());
+      invConfig.set("Food", player.getFoodLevel());
+      invConfig.set("Saturation", player.getSaturation());
+      invConfig.set("Fire ticks", player.getFireTicks());
+      invConfig.set("GameMode", player.getGameMode().name());
+      invConfig.set("Allow flight", player.getAllowFlight());
+      invConfig.set("Flight speed", player.getFlySpeed());
+      invConfig.set("Walk speed", player.getWalkSpeed());
+
+      invConfig.set("Size", inventory.getSize());
+      invConfig.set("Max stack size", inventory.getMaxStackSize());
+      Collection<PotionEffect> activeEffects = player.getActivePotionEffects();
+      List<String> activePotions = new ArrayList<>(activeEffects.size());
+
+      double maxHealth = VersionUtils.getMaxHealth(player);
+
+      for(PotionEffect potion : activeEffects) {
+        activePotions.add(potion.getType().getName() + "#" + potion.getDuration() + "#" + potion.getAmplifier());
+        if(potion.getType().equals(XPotion.HEALTH_BOOST.getPotionEffectType())) {
+          // Health boost effect gives +2 hearts per level, health is counted in half hearts so amplifier * 4
+          maxHealth -= (potion.getAmplifier() + 1) * 4;
+        }
+      }
+      invConfig.set("Active potion effects", activePotions);
+      invConfig.set("Max health", maxHealth);
+
+      org.bukkit.entity.HumanEntity holder = inventory.getHolder();
+      if(holder instanceof Player) {
+        invConfig.set("Holder", holder.getName());
+      }
+
       invConfig.save(invFile);
       plugin.getLogger().log(Level.INFO, "Saved inventory of {0}", player.getName());
       return true;

MiniGamesBox Database/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>minigamesbox</artifactId>
         <groupId>plugily.projects</groupId>
-        <version>1.4.0</version>
+        <version>1.4.0-SNAPSHOT7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

MiniGamesBox Inventory/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>minigamesbox</artifactId>
         <groupId>plugily.projects</groupId>
-        <version>1.4.0</version>
+        <version>1.4.0-SNAPSHOT7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>