Merge branch 'master' into 65-add-the-ability-to-transfer-ownership-of-a-bank-account

Author: zefir-git

.github/dependabot.yaml

@@ -6,13 +6,9 @@ updates:
       interval: weekly
       day: monday
       time: "06:00"
-    reviewers:
-      - cloudnode-pro/smp
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly
       day: monday
       time: "06:00"
-    reviewers:
-      - cloudnode-pro/smp

.github/workflows/codeql.yaml

@@ -57,14 +57,14 @@ jobs:
       uses: actions/checkout@v4
 
 
-    - uses: actions/setup-java@v4
+    - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: 17
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -78,7 +78,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -91,6 +91,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/maven.yaml

@@ -25,7 +25,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -35,4 +35,4 @@ jobs:
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Submit Dependency Snapshot
-      uses: advanced-security/maven-dependency-submission-action@v4
+      uses: advanced-security/maven-dependency-submission-action@v5

.github/workflows/release.yaml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: temurin
@@ -41,6 +41,11 @@ jobs:
           version: ${{ github.event.release.tag_name }}
           changelog: ${{ github.event.release.body }}
           loaders: paper
+          dependencies: |-
+            [{
+              "project_id": "lKEzGugV",
+              "dependency_type": "optional"
+            }]
           game-versions: |-
             1.20.x
             1.21.x

README.md

@@ -1,9 +1,13 @@
 [<img src="https://wsrv.nl/?url=https://raw.githubusercontent.com/cloudnode-pro/BankAccounts/master/icon.svg&w=128&output=webp" alt="BankAccounts logo" align="left">](https://modrinth.com/plugin/Dc8RS2En)
 
 # Bank Accounts
-[![Available on Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg)](https://modrinth.com/plugin/Dc8RS2En) [![Available for Paper](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg)](https://papermc.io/software/paper) [![Available on GitHub](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/github_vector.svg)](https://github.com/cloudnode-pro/BankAccounts/)
+[![Available on Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg)](https://modrinth.com/plugin/Dc8RS2En)
+[![Available for Paper](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/paper_vector.svg)](https://papermc.io/software/paper)
+[![Available on GitHub](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/github_vector.svg)](https://github.com/cloudnode-pro/BankAccounts/)
+[![Won’t support Spigot](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/unsupported/spigot_vector.svg)](https://github.com/cloudnode-pro/BankAccounts/issues/28)
+[![Chat with us on Matrix](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/matrix-plural_vector.svg)](https://matrix.to/#/#community:cloudnode.pro)
 
-[![Java CI with Maven](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/maven.yml/badge.svg)](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/maven.yml) [![CodeQL](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/codeql.yml/badge.svg)](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/codeql.yml) [![Version](https://img.shields.io/modrinth/v/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/version/latest) [![Game Versions](https://img.shields.io/modrinth/game-versions/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/) [![Downloads](https://img.shields.io/modrinth/dt/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/)
+[![Java CI with Maven](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/maven.yaml/badge.svg)](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/maven.yaml) [![CodeQL](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/codeql.yaml/badge.svg)](https://github.com/cloudnode-pro/BankAccounts/actions/workflows/codeql.yaml) [![Version](https://img.shields.io/modrinth/v/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/version/latest) [![Game Versions](https://img.shields.io/modrinth/game-versions/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/) [![Downloads](https://img.shields.io/modrinth/dt/Dc8RS2En)](https://modrinth.com/plugin/Dc8RS2En/)
 
 A Minecraft economy plugin that enables players to hold multiple bank accounts.
 
@@ -33,6 +37,11 @@ enabling compatibility with third-party plugins that support Vault.
 
 You can create a [Point of Sale](https://github.com/cloudnode-pro/BankAccounts/wiki/POS), which is a type of single-use chest shop. Players can pay using a bank card (`/bank card`).
 
+### PlaceholderAPI Support
+
+BankAccounts provides several *PlaceholderAPI* placeholders that you can use. See
+the [Placeholders Wiki](https://github.com/cloudnode-pro/BankAccounts/wiki/Placeholders) for an exhaustive list.
+
 ### Extensive Configuration
 
 All functionality is fully configurable. See [default config](https://github.com/cloudnode-pro/BankAccounts/blob/master/src/main/resources/config.yml).
@@ -75,9 +84,3 @@ If you're interested in contributing, follow these steps:
 4.  Commit your changes with clear and descriptive messages.
 5.  Push your changes to your fork.
 6.  Submit a pull request.
-
-## Thanks To
-
-[<img src="https://github.com/JetBrains/logos/raw/master/web/jetbrains/jetbrains-simple.svg" alt="JetBrains logo" height="96" align="left">](https://www.jetbrains.com)
-
-[JetBrains](https://www.jetbrains.com/), creators of the IntelliJ IDEA, supports BankAccounts with one of their [Open Source Licenses](https://www.jetbrains.com/opensource/). IntelliJ IDEA is the recommended IDE for working with BankAccounts.

pom.xml

@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.14.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -30,7 +30,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -81,13 +81,13 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>6.2.1</version>
+            <version>7.0.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/pro/cloudnode/smp/bankaccounts/integrations/PAPIIntegration.java

@@ -6,6 +6,10 @@
 import pro.cloudnode.smp.bankaccounts.Account;
 import pro.cloudnode.smp.bankaccounts.BankAccounts;
 
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 public final class PAPIIntegration extends PlaceholderExpansion {
     @Override
     public @NotNull String getIdentifier() {
@@ -22,29 +26,60 @@ public final class PAPIIntegration extends PlaceholderExpansion {
         return BankAccounts.getInstance().getPluginMeta().getVersion();
     }
 
-    /**
-     *  Adds the following placeholders:
-     *  <ul>
-     *      <li>%bankaccounts_balance_&lt;accountID&gt;% - returns balance of account with specified ID</li>
-     *      <li>%bankaccounts_balance_formatted_&lt;accountID&gt;% - returns formatted balance of account with specified ID</li>
-     *      <li>%bankaccounts_owner_&lt;accountID&gt;% - returns name of the owner of account with specified ID</li>
-     *      <li>%bankaccounts_type_&lt;accountID&gt;% - returns type of account with specified ID</li>
-     *      <li>%bankaccounts_name_&lt;accountID&gt;% - returns name of account with specified ID</li>
-     *  </ul>
-    */
     @Override
     public String onRequest(final @NotNull OfflinePlayer player, final @NotNull String params) {
         final @NotNull String[] args = params.split("_");
 
         if (args.length < 1) return null;
         return switch (args[0]) {
-            case "balance" -> args.length < 2 ? null : switch (args[1]) {
-                case "formatted" -> args.length != 3 ? null : Account.get(Account.Tag.from(args[2])).map(value -> BankAccounts.formatCurrency(value.balance)).orElse(null);
-                default -> Account.get(Account.Tag.from(args[1])).map(value -> String.valueOf(value.balance)).orElse(null);
-            };
-            case "owner" -> args.length < 2 ? null : Account.get(Account.Tag.from(args[1])).map(value -> value.owner.getName()).orElse(null);
-            case "type" -> args.length < 2 ? null : Account.get(Account.Tag.from(args[1])).map(value -> value.type.getName()).orElse(null);
-            case "name" -> args.length < 2 ? null : Account.get(Account.Tag.from(args[1])).map(value -> value.name).orElse(null);
+            case "balance" -> {
+                if (args.length == 1)
+                    yield String.valueOf(
+                            Arrays.stream(Account.get(player))
+                                    .map(account -> account.balance)
+                                    .reduce(BigDecimal.ZERO, BigDecimal::add)
+                    );
+                yield switch (args[1]) {
+                    case "formatted" -> {
+                        if (args.length == 3)
+                            yield Account.get(Account.Tag.from(args[2])).map(value -> BankAccounts.formatCurrency(value.balance)).orElse(null);
+                        if (args.length == 2)
+                            yield BankAccounts.formatCurrency(
+                                    Arrays.stream(Account.get(player))
+                                            .map(account -> account.balance)
+                                            .reduce(BigDecimal.ZERO, BigDecimal::add)
+                            );
+                        yield null;
+                    }
+                    case "short" -> {
+                        if (args.length == 3)
+                            yield Account.get(Account.Tag.from(args[2])).map(value -> BankAccounts.formatCurrencyShort(value.balance)).orElse(null);
+                        if (args.length == 2)
+                            yield BankAccounts.formatCurrencyShort(
+                                    Arrays.stream(Account.get(player))
+                                            .map(account -> account.balance)
+                                            .reduce(BigDecimal.ZERO, BigDecimal::add)
+                            );
+                        yield null;
+                    }
+                    default -> Account.get(Account.Tag.from(args[1])).map(value -> String.valueOf(value.balance)).orElse(null);
+                };
+            }
+            case "owner" -> args.length != 2 ? null : Account.get(Account.Tag.from(args[1])).map(value -> value.owner.getName()).orElse(null);
+            case "type" -> args.length != 2 ? null : Account.get(Account.Tag.from(args[1])).map(value -> value.type.getName()).orElse(null);
+            case "name" -> args.length != 2 ? null : Account.get(Account.Tag.from(args[1])).map(Account::name).orElse(null);
+            case "account" -> {
+                if (args.length == 2) {
+                    final @NotNull Account @NotNull [] accounts = Account.get(player);
+                    yield switch (args[1]) {
+                        case "list" -> Arrays.stream(accounts).map(account -> account.id).collect(Collectors.joining(", "));
+                        case "names" -> Arrays.stream(accounts).map(Account::name).collect(Collectors.joining(", "));
+                        case "count" -> String.valueOf(accounts.length);
+                        default -> null;
+                    };
+                }
+                yield null;
+            }
             default -> null;
         };
     }