Merge pull request #2899 from BentoBoxWorld/develop

Release 3.13.0

Author: tastybento

.github/workflows/modrinth-publish.yml

@@ -0,0 +1,102 @@
+name: Publish to Modrinth
+
+# Triggers when you publish a GitHub Release
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag to publish (e.g. 3.12.1)'
+        required: true
+        type: string
+      changelog:
+        description: 'Changelog / release notes (markdown)'
+        required: false
+        type: string
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      # 1. Check out the repository at the release tag
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # 2. Set up Java 21 (required by BentoBox's build)
+      - name: Set up Java 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      # 3. Cache Gradle dependencies to speed up builds
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle-
+
+      # 4. Build the shaded JAR
+      #    GIT_BRANCH=origin/master tells the build script to produce a clean
+      #    version number (e.g. 3.12.0) without -LOCAL-SNAPSHOT suffixes.
+      - name: Build with Gradle
+        run: ./gradlew shadowJar --no-daemon
+        env:
+          GIT_BRANCH: origin/master
+
+      # 5. Upload the JAR to Modrinth
+      #
+      #    Prerequisites — add these secrets in your GitHub repo settings
+      #    (Settings → Secrets and variables → Actions):
+      #
+      #      MODRINTH_TOKEN  — personal access token from https://modrinth.com/settings/pats
+      #                        (scope: "Create versions")
+      #      MODRINTH_PROJECT_ID — your Modrinth project ID, visible on your project page
+      #                        under the three-dot menu ("Copy ID")
+      #
+      - name: Publish to Modrinth
+        uses: cloudnode-pro/modrinth-publish@v2
+        with:
+          token: ${{ secrets.MODRINTH_TOKEN }}
+          project: ${{ secrets.MODRINTH_PROJECT_ID }}
+
+          # Use the release tag, or the manually supplied tag when triggered via workflow_dispatch
+          version: ${{ github.event.release.tag_name || inputs.tag }}
+
+          # Use the GitHub release body, or the manually supplied changelog for workflow_dispatch
+          changelog: ${{ github.event.release.body || inputs.changelog }}
+
+          # Release channel — auto-detected from version string:
+          #   *-alpha → alpha, *-beta → beta, anything else → release
+          # Override here if needed: release | beta | alpha
+          # channel: release
+
+          # BentoBox is a Paper plugin
+          loaders: |-
+            paper
+            purpur
+
+          # Minecraft versions this release supports.
+          # Update this list when you start supporting newer or older MC versions.
+          # You can use exact versions (1.21.1) or patterns (1.21.x not supported by this action).
+          game-versions: |-
+            1.21.5
+            1.21.6
+            1.21.7
+            1.21.8
+            1.21.9
+            1.21.10
+            1.21.11
+            26.1
+            26.1.1
+
+          # Path to the built JAR — the Shadow plugin produces BentoBox-<version>.jar
+          # Note: glob patterns are not supported; use the release tag directly.
+          files: build/libs/BentoBox-${{ github.event.release.tag_name || inputs.tag }}.jar

build.gradle.kts

@@ -46,7 +46,7 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt
 group = "world.bentobox" // From <groupId>
 
 // Base properties from <properties>
-val buildVersion = "3.12.0"
+val buildVersion = "3.13.0"
 val buildNumberDefault = "-LOCAL" // Local build identifier
 val snapshotSuffix = "-SNAPSHOT"  // Indicates development/snapshot version
 

src/main/java/world/bentobox/bentobox/api/commands/admin/conversations/NamePrompt.java

@@ -34,7 +34,10 @@ public NamePrompt(BentoBox plugin, @NonNull Island island, @NonNull User user, S
     @Override
     @NonNull
     public String getPromptText(@NonNull ConversationContext context) {
-        return user.getTranslation("commands.island.renamehome.enter-new-name");
+        // Send via User to properly render MiniMessage/legacy formatting,
+        // since Bukkit's conversation API sends raw text without formatting.
+        user.sendRawMessage(user.getTranslation("commands.island.renamehome.enter-new-name"));
+        return "";
     }
 
     @Override

src/main/java/world/bentobox/bentobox/api/commands/island/conversations/ConfirmPrompt.java

@@ -35,7 +35,10 @@ public ConfirmPrompt(@NonNull User user, BentoBox plugin, String instructions, S
     @Override
     @NonNull
     public String getPromptText(@NonNull ConversationContext context) {
-        return user.getTranslation(instructions);
+        // Send via User to properly render MiniMessage/legacy formatting,
+        // since Bukkit's conversation API sends raw text without formatting.
+        user.sendRawMessage(user.getTranslation(instructions));
+        return "";
     }
 
     @Override

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamGUI.java

@@ -214,25 +214,34 @@ private void createClickHandler(PanelItemBuilder builder, @NonNull List<ActionRe
      */
     private void createDescription(PanelItemBuilder builder) {
         RanksManager.getInstance().getRanks().forEach((reference, score) -> {
+            String rankName = user.getTranslation(reference);
             if (rankView == RanksManager.OWNER_RANK && score > RanksManager.VISITOR_RANK
                     && score <= RanksManager.OWNER_RANK) {
-                builder.description(user.getTranslation("protection.panel.flag-item.allowed-rank")
-                        + user.getTranslation(reference));
+                builder.description(getRankTranslation("protection.panel.flag-item.allowed-rank", rankName));
             } else if (score > RanksManager.VISITOR_RANK && score < rankView) {
-                builder.description(user.getTranslation("protection.panel.flag-item.blocked-rank")
-                        + user.getTranslation(reference));
+                builder.description(getRankTranslation("protection.panel.flag-item.blocked-rank", rankName));
             } else if (score <= RanksManager.OWNER_RANK && score > rankView) {
-                builder.description(user.getTranslation("protection.panel.flag-item.blocked-rank")
-                        + user.getTranslation(reference));
+                builder.description(getRankTranslation("protection.panel.flag-item.blocked-rank", rankName));
             } else if (score == rankView) {
-                builder.description(user.getTranslation("protection.panel.flag-item.allowed-rank")
-                        + user.getTranslation(reference));
+                builder.description(getRankTranslation("protection.panel.flag-item.allowed-rank", rankName));
             }
         });
         builder.description(user.getTranslation("commands.island.team.gui.buttons.rank-filter.description"));
 
     }
 
+    /**
+     * Gets a rank translation, supporting both MiniMessage format (with [rank] placeholder)
+     * and legacy format (without placeholder, rank name concatenated at end).
+     */
+    private String getRankTranslation(String key, String rankName) {
+        String translation = user.getTranslation(key, TextVariables.RANK, rankName);
+        if (!translation.contains(rankName)) {
+            translation = user.getTranslation(key) + rankName;
+        }
+        return translation;
+    }
+
     /**
      * Create invited button panel item.
      *

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteGUI.java

@@ -267,7 +267,8 @@ class InviteNamePrompt extends StringPrompt {
         @Override
         @NonNull
         public String getPromptText(@NonNull ConversationContext context) {
-            return user.getTranslation("commands.island.team.invite.gui.enter-name");
+            user.sendRawMessage(user.getTranslation("commands.island.team.invite.gui.enter-name"));
+            return "";
         }
 
         @Override

src/main/java/world/bentobox/bentobox/api/flags/Flag.java

@@ -485,20 +485,33 @@ private PanelItemBuilder createProtectionFlag(BentoBox plugin, User user, Island
                     TextVariables.DESCRIPTION, user.getTranslation(getDescriptionReference())));
 
             RanksManager.getInstance().getRanks().forEach((reference, score) -> {
-
+                String rankName = user.getTranslation(reference);
                 if (score > RanksManager.BANNED_RANK && score < y) {
-                    pib.description(user.getTranslation("protection.panel.flag-item.blocked-rank") + user.getTranslation(reference));
+                    pib.description(getRankTranslation(user, "protection.panel.flag-item.blocked-rank", rankName));
                 } else if (score <= RanksManager.OWNER_RANK && score > y) {
-                    pib.description(user.getTranslation("protection.panel.flag-item.allowed-rank") + user.getTranslation(reference));
+                    pib.description(getRankTranslation(user, "protection.panel.flag-item.allowed-rank", rankName));
                 } else if (score == y) {
-                    pib.description(user.getTranslation("protection.panel.flag-item.minimal-rank") + user.getTranslation(reference));
+                    pib.description(getRankTranslation(user, "protection.panel.flag-item.minimal-rank", rankName));
                 }
             });
         }
 
         return pib;
     }
 
+    /**
+     * Gets a rank translation, supporting both MiniMessage format (with [rank] placeholder)
+     * and legacy format (without placeholder, rank name concatenated at end).
+     */
+    private String getRankTranslation(User user, String key, String rankName) {
+        String translation = user.getTranslation(key, TextVariables.RANK, rankName);
+        // If [rank] placeholder was not in the locale string (legacy format),
+        // the rank name won't appear in the result — fall back to concatenation
+        if (!translation.contains(rankName)) {
+            translation = user.getTranslation(key) + rankName;
+        }
+        return translation;
+    }
 
     /**
      * @return the mode

src/main/java/world/bentobox/bentobox/api/panels/Panel.java

@@ -11,10 +11,12 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.eclipse.jdt.annotation.NonNull;
 
+import net.kyori.adventure.text.Component;
 import world.bentobox.bentobox.api.panels.builders.PanelBuilder;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
+import world.bentobox.bentobox.util.Util;
 import world.bentobox.bentobox.util.heads.HeadGetter;
 import world.bentobox.bentobox.util.heads.HeadRequester;
 
@@ -82,18 +84,18 @@ protected void makePanel(String name, Map<Integer, PanelItem> items, int size, U
     /**
      * @since 1.7.0
      */
-    @SuppressWarnings("deprecation")
     protected void makePanel(String name, Map<Integer, PanelItem> items, int size, User user, PanelListener listener,
             Type type) {
         this.name = name;
         this.items = items;
 
-        // Create panel
+        // Create panel with Component-based title
+        Component title = name != null ? Util.parseMiniMessageOrLegacy(name) : Component.empty();
         switch (type) {
-        case INVENTORY -> inventory = Bukkit.createInventory(null, fixSize(size), name);
-        case HOPPER -> inventory = Bukkit.createInventory(null, InventoryType.HOPPER, name);
-        case DROPPER -> inventory = Bukkit.createInventory(null, InventoryType.DROPPER, name);
-        case ANVIL -> inventory = Bukkit.createInventory(null, InventoryType.ANVIL, name);
+        case INVENTORY -> inventory = Bukkit.createInventory(null, fixSize(size), title);
+        case HOPPER -> inventory = Bukkit.createInventory(null, InventoryType.HOPPER, title);
+        case DROPPER -> inventory = Bukkit.createInventory(null, InventoryType.DROPPER, title);
+        case ANVIL -> inventory = Bukkit.createInventory(null, InventoryType.ANVIL, title);
         }
 
         // Fill the inventory and return

src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java

@@ -12,6 +12,7 @@
 
 import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * Represents an item in a {@link Panel}
@@ -75,7 +76,9 @@ public List<String> getDescription() {
     public void setDescription(List<String> description) {
         this.description = description;
         if (meta != null) {
-            meta.setLore(description);
+            meta.lore(description.stream()
+                    .map(Util::parseMiniMessageOrLegacy)
+                    .toList());
             icon.setItemMeta(meta);
         }
     }
@@ -87,7 +90,7 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
         if (meta != null) {
-            meta.setDisplayName(name);
+            meta.displayName(name != null ? Util.parseMiniMessageOrLegacy(name) : null);
             icon.setItemMeta(meta);
         }
     }

src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java

@@ -27,7 +27,7 @@ public class PanelBuilder {
     private World world;
 
     public PanelBuilder name(String name) {
-        this.name = Util.translateColorCodes(name);
+        this.name = name;
         return this;
     }