#patch Quality Of Life (QOL) Improvements (#79)

* Bump version from 2.1.3 to 2.1.3-SNAPSHOT0

* Ensure UTF-8 compiling

* Bump version from 2.1.3-SNAPSHOT0 to 2.1.3-SNAPSHOT1

* Removed unused permissions in permissions.yml

* Updated language.yml so by default base selection got prefix

* Fixed arena forcestop the game after a player leave the Fullgame and not enough players to continue are online

* Bump version from 2.1.3-SNAPSHOT1 to 2.1.3-SNAPSHOT2

* Updated Minigamesbox to 1.4.1

* Bump version from 2.1.3-SNAPSHOT2 to 2.1.3-SNAPSHOT3

* Simplify ScoreboardManager

* Bump version from 2.1.3-SNAPSHOT3 to 2.1.3-SNAPSHOT4

* Adjusted CHANGELOG.md

* Bump version from 2.1.3-SNAPSHOT4 to 2.1.3-SNAPSHOT5

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>

Author: Tigerpanzer02

.github/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.1.4 Release (03.05.2025)
+* Fixed arena forcestop the game after a player leave the Fullgame and not enough players to continue are online
+* Updated language.yml so by default base selection got prefix
+* Removed unused permissions in permissions.yml
+* Updated to minigamesbox 1.4.1
+
 ### 2.1.3 Release (13.03.2025)
 * Updated to minigamesbox 1.4.0
 

.github/building/pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>plugily.projects</groupId>
     <artifactId>thebridge</artifactId>
-    <version>2.1.1-SNAPSHOT1-java8</version>
+    <version>2.1.3-SNAPSHOT0</version>
     <name>TheBridge</name>
 
     <properties>
@@ -35,14 +35,6 @@
             <id>plugilyprojects-snapshots</id>
             <url>https://maven.plugily.xyz/snapshots</url>
         </repository>
-        <repository>
-            <id>jitpack</id>
-            <url>https://jitpack.io</url>
-        </repository>
-        <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public/</url>
-        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -61,12 +53,12 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
             <version>23.0.0</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>plugily.projects</groupId>
             <artifactId>MiniGamesBox-Classic</artifactId>
-            <version>1.3.3-java8</version>
+            <version>1.4.0</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -79,53 +71,59 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.12.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
-                <goals>
-                    <goal>compile</goal>
-                </goals>
+                <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.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.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.11.2</version>
                 <configuration>
-                    <windowtitle>Murder Mystery API docs for v${project.version}</windowtitle>
-                    <description>Minecraft survival minigame.
-                        Be the murderer, innocent or the detective! Don't be killed during the game to win! API
-                        documentation for hooking Murder Mystery with your plugin.
+                    <windowtitle>TheBridge API docs for v${project.version}</windowtitle>
+                    <description>Minecraft Base PvP minigame.
+                        Defend your base and try to wipe out the others
                     </description>
-                    <destDir>minecraft/thebridge</destDir>
-                    <isOffline>false</isOffline>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.4.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <minimizeJar>true</minimizeJar>
                             <relocations>
                                 <relocation>
                                     <pattern>com.zaxxer.hikari</pattern>
@@ -135,10 +133,6 @@
                                     <pattern>plugily.projects.minigamesbox</pattern>
                                     <shadedPattern>plugily.projects.thebridge.minigamesbox</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>plugily.projects.commonsbox</pattern>
-                                    <shadedPattern>plugily.projects.thebridge.commonsbox</shadedPattern>
-                                </relocation>
                             </relocations>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
@@ -161,15 +155,18 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
             </extension>
         </extensions>
     </build>
     <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>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>plugily.projects</groupId>
     <artifactId>thebridge</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.3-SNAPSHOT5</version>
     <name>TheBridge</name>
 
     <properties>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>plugily.projects</groupId>
             <artifactId>MiniGamesBox-Classic</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -78,6 +78,7 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/plugily/projects/thebridge/arena/ArenaManager.java

@@ -73,7 +73,7 @@ public void leaveAttempt(@NotNull Player player, @NotNull IPluginArena arena) {
       pluginArena.removeDeathPlayer(player);
     }
     if(arena.getArenaState() != IArenaState.WAITING_FOR_PLAYERS
-      && arena.getArenaState() != IArenaState.STARTING
+      && arena.getArenaState() != IArenaState.STARTING && arena.getArenaState() != IArenaState.FULL_GAME
       && (arena.getPlayersLeft().size() <= 1
       || (arena.getPlayersLeft().size() <= arena.getArenaOption("BASE_PLAYER_SIZE")
       && pluginArena.getBases().stream()

src/main/java/plugily/projects/thebridge/arena/managers/ScoreboardManager.java

@@ -44,10 +44,10 @@ public ScoreboardManager(PluginArena arena) {
   }
 
   @Override
-  public List<String> formatScoreboardLines(List<String> lines, Player player) {
+  public List<String> getScoreboardLines(Player player) {
     List<String> changedLines = new ArrayList<>();
     IUser user = arena.getPlugin().getUserManager().getUser(player);
-    for(String line : lines) {
+    for(String line : super.getScoreboardLines(player)) {
       if(line.contains("%arena_option_reset_blocks%")
         && arena.getArenaOption("RESET_BLOCKS") == 0) {
         continue;
@@ -63,7 +63,7 @@ public List<String> formatScoreboardLines(List<String> lines, Player player) {
           }
         }
       } else {
-        changedLines.add(new MessageBuilder(line).player(player).arena(arena).build());
+        changedLines.add(line);
       }
     }
     return changedLines;
@@ -118,10 +118,10 @@ public String formatBase(Base base, IUser user) {
         formattedLine.replaceAll("%scoreboard_base_points_formatted%", points.toString());
     } else if(formattedLine.contains("%scoreboard_base_points%")) {
       String points;
-      if (pluginArena.getMode() == Arena.Mode.HEARTS) {
+      if(pluginArena.getMode() == Arena.Mode.HEARTS) {
         points = pluginArena.getArenaOption("MODE_VALUE") + " / " + base.getPoints();
       } else {
-        points = base.getPoints() + " / " +pluginArena.getArenaOption("MODE_VALUE");
+        points = base.getPoints() + " / " + pluginArena.getArenaOption("MODE_VALUE");
       }
       formattedLine =
         formattedLine.replaceAll("%scoreboard_base_points%", points);

src/main/java/plugily/projects/thebridge/commands/arguments/game/SelectBaseArgument.java

@@ -45,7 +45,7 @@ public void execute(CommandSender sender, String[] args) {
             Arena arena = (Arena) registry.getPlugin().getArenaRegistry().getArena((Player) sender);
             if(arena != null) {
               if(arena.getArenaState() == IArenaState.WAITING_FOR_PLAYERS
-                  || arena.getArenaState() == IArenaState.STARTING)
+                  || arena.getArenaState() == IArenaState.STARTING || arena.getArenaState() == IArenaState.FULL_GAME)
                 arena.getPlugin().getBaseMenuHandler().createMenu((Player) sender, arena);
             }
           }

src/main/resources/config.yml

@@ -12,6 +12,7 @@
 # Available locales:
 #    default - English language. Uses 'language.yml'.
 #    See https://github.com/Plugily-Projects/locale_storage/tree/master/plugins/minecraft/thebridge
+#    Help us translate the project -> https://translate.plugily.xyz
 #    Use filename of the language e.g. de_DE.yml -> locale: de_DE
 locale: default
 

src/main/resources/language.yml

@@ -351,8 +351,8 @@ Bases:
     Inside: "Your team"
     Name: "Base - %base%"
     Menu: "Base Menu"
-    Choose: "You are now on base %base%"
-    Member: "You are already member of it!"
+    Choose: "%plugin_prefix% You are now on base %base%"
+    Member: "%color_chat_issue%%plugin_prefix% You are already member of it!"
   Colors:
     BLACK: "&0BLACK"
     DARK_BLUE: "&1DARK_BLUE"

src/main/resources/locales/language_default.yml

@@ -86,10 +86,11 @@ Commands:
 # Please do not use more chars than the scoreboard can handle!
 # Scoreboard supports up to 122 chars for 1.14+ and 48 chars for 1.13- (COLOR CODES INCLUDED.)
 # Placeholders:
-# https://wiki.plugily.xyz/REPLACEWITHPROJECTNAME/placeholders/language
+# https://wiki.plugily.xyz/minigame/placeholders/
 Scoreboard:
   Title: "&a&l%plugin_name%"
   Bases:
+    # Alternative format with numbers instead of symbols would be %scoreboard_base_color_formatted% (%scoreboard_base_players_size%) &e%scoreboard_base_yourself% %scoreboard_base_points%
     Format: "%scoreboard_base_color_formatted% (%scoreboard_base_players_size%) &e%scoreboard_base_yourself% %scoreboard_base_points_formatted%"
     Not-Inside: "--"
     Inside: "(You)"
@@ -168,7 +169,7 @@ Bossbar:
     In-Game:
       - "Playing %plugin_name_uppercase% on PLUGILY.XYZ"
       - "Check the plugin creator out on PLUGILY.XYZ"
-      - "Current base points %base_color_formatted%"
+      - "Current own points %user_statistic_local_scored_points%"
       - "Your base %arena_base_color_formatted%"
     Ending:
       - "Game has ended! You were playing on PLUGILY.XYZ"
@@ -341,48 +342,14 @@ Kit:
   Not-Unlocked: "%color_chat_issue%%plugin_prefix% You haven't unlocked %value% yet!"
   Choose: "%plugin_prefix% You have chosen: %value%!"
   Cooldown: "%color_chat_issue%%plugin_prefix% Kit ability still on cooldown (%number%)!"
+  No-Armor: "%color_chat_issue%%plugin_prefix% You can't wear armor with your kit!"
   Menu:
     Title: "Kit Menu"
     Lore:
       Unlocked: "&aUNLOCKED!"
       Locked: "&cLOCKED!"
       Unlock-At-Level: "Unlocks at level %number%"
       Unlock-In-Store: "&bUnlock this in the store!"
-  Content:
-    Bridge:
-      Name: "&2Bridge"
-      Description: "&7Basic bridge kit like the one you know!"
-    Knight:
-      Name: "&2Knight"
-      Description: "&7This is the one and only knight kit! Many people think this is the worst kit! I must admit they are totally wrong!"
-    Light-Tank:
-      Name: "&2Light Tank"
-      Description: "&7You are Junior tank!"
-    Archer:
-      Name: "&6Archer"
-      Description: "&7Start with a extra amount of arrows, leather armor and a wooden sword. Archers are loved by the villagers, know that!"
-    Hardcore:
-      Name: "&6Hardcore"
-      Description: "&7You'll see yourself why this is hardcore"
-    Healer:
-      Name: "&6Healer"
-      Description: "&7Being a healer is the same as being loved. You are able to heal your teammates."
-    Medium-Tank:
-      Name: "&6Medium Tank"
-      Description: "&7Start off with 6 more hearts! Don't be afraid! You have plenty hearts left to lose!"
-    Terminator:
-      Name: "&6Terminator"
-      Description: "&7Easily kill other players with your strength powers!"
-    Heavy-Tank:
-      Name: "&bHeavy Tank"
-      Description: "&7Start off with iron armor and a double amount of hearts! Yup, that's right, you'll be the last man standing!"
-    Wild-Naked:
-      Name: "&bWild Naked"
-      Description: "&7You are the ultimate master! You start off with a better iron sword!"
-      Cannot-Wear-Armor: "&cYou can't wear armor with the Wild Naked kit!"
-    Premium-Hardcore:
-      Name: "&bPremium Hardcore Master"
-      Description: "&7One hit most players with your OP sword! However be careful. this kit is only for the pros! Do not use it if you aren't a pro!"
 
 
 #
@@ -395,8 +362,8 @@ Bases:
     Inside: "Your team"
     Name: "Base - %base%"
     Menu: "Base Menu"
-    Choose: "You are now on base %base%"
-    Member: "You are already member of it!"
+    Choose: "%plugin_prefix% You are now on base %base%"
+    Member: "%color_chat_issue%%plugin_prefix% You are already member of it!"
   Colors:
     BLACK: "&0BLACK"
     DARK_BLUE: "&1DARK_BLUE"
@@ -458,4 +425,4 @@ Leaderboard:
 # You edited it, huh? Next time hurt yourself!
 Do-Not-Edit:
   File-Version: 1
-  Core-Version: 1
+  Core-Version: 2

src/main/resources/permissions.yml

@@ -12,11 +12,6 @@ Exp-Boost:
 
 # Basic permissions for game, permissions explained here: https://wiki.plugily.xyz/
 Basic:
-  Full-Games: "thebridge.fullgames"
-  # <arena> represents arena name (NOT MAP NAME!), for example: 'thebridge.join.ARENAnice'
-  # use 'thebridge.join.*' to enable access to all arenas
-  Join: "thebridge.join.<arena>"
-  Forcestart: "thebridge.admin.forcestart"
   Premium-Kits: "thebridge.kits.premium"
 
 # Don't edit it. But who's stopping you? It's your server!