1.9.0

Artillex-Studios · Jul 4, 2024 · 824b46e · 824b46e
1 parent 19fbaa6
commit 824b46e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.artillexstudios</groupId>
     <artifactId>AxVaults</artifactId>
-    <version>1.8.1</version>
+    <version>1.9.0</version>
     <packaging>jar</packaging>
 
     <name>AxVaults</name>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>com.artillexstudios.axapi</groupId>
             <artifactId>axapi</artifactId>
-            <version>1.4.279</version>
+            <version>1.4.280</version>
             <scope>compile</scope>
             <classifier>all</classifier>
         </dependency>

diff --git a/src/main/java/com/artillexstudios/axvaults/guis/ItemPicker.java b/src/main/java/com/artillexstudios/axvaults/guis/ItemPicker.java
@@ -1,5 +1,6 @@
 package com.artillexstudios.axvaults.guis;
 
+import com.artillexstudios.axapi.reflection.ClassUtils;
 import com.artillexstudios.axapi.utils.ItemBuilder;
 import com.artillexstudios.axapi.utils.StringUtils;
 import com.artillexstudios.axvaults.utils.SoundUtils;
@@ -29,8 +30,14 @@ public void open(@NotNull Player player, @NotNull Vault vault) {
     public void open(@NotNull Player player, @NotNull Vault vault, int oldPage, int cPage) {
         int rows = CONFIG.getInt("vault-selector-rows", 6);
         int pageSize = rows * 9 - 9;
+
+        String title = MESSAGES.getString("guis.item-picker.title");
+        if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            title = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, title);
+        }
+
         final PaginatedGui gui = Gui.paginated()
-                .title(StringUtils.format(MESSAGES.getString("guis.item-picker.title")))
+                .title(StringUtils.format(title))
                 .rows(rows)
                 .pageSize(pageSize)
                 .disableAllInteractions()

diff --git a/src/main/java/com/artillexstudios/axvaults/guis/VaultSelector.java b/src/main/java/com/artillexstudios/axvaults/guis/VaultSelector.java
@@ -1,5 +1,6 @@
 package com.artillexstudios.axvaults.guis;
 
+import com.artillexstudios.axapi.reflection.ClassUtils;
 import com.artillexstudios.axapi.utils.ItemBuilder;
 import com.artillexstudios.axapi.utils.StringUtils;
 import com.artillexstudios.axvaults.vaults.Vault;
@@ -29,8 +30,14 @@ public void open(@NotNull Player player) {
     public void open(@NotNull Player player, int page) {
         int rows = CONFIG.getInt("vault-selector-rows", 6);
         int pageSize = rows * 9 - 9;
+
+        String title = MESSAGES.getString("guis.selector.title");
+        if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            title = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, title);
+        }
+
         final PaginatedGui gui = Gui.paginated()
-                .title(StringUtils.format(MESSAGES.getString("guis.selector.title")))
+                .title(StringUtils.format(title))
                 .rows(rows)
                 .pageSize(pageSize)
                 .disableAllInteractions()

diff --git a/src/main/java/com/artillexstudios/axvaults/vaults/Vault.java b/src/main/java/com/artillexstudios/axvaults/vaults/Vault.java
@@ -1,5 +1,6 @@
 package com.artillexstudios.axvaults.vaults;
 
+import com.artillexstudios.axapi.reflection.ClassUtils;
 import com.artillexstudios.axapi.utils.StringUtils;
 import com.artillexstudios.axvaults.utils.SoundUtils;
 import org.bukkit.Bukkit;
@@ -27,7 +28,13 @@ public class Vault {
     public Vault(UUID uuid, int num, Material icon) {
         this.uuid = uuid;
         this.id = num;
-        this.storage = Bukkit.createInventory(null, VaultManager.getPlayer(uuid).getRows() * 9, StringUtils.formatToString(MESSAGES.getString("guis.vault.title").replace("%num%", "" + num)));
+
+        String title = MESSAGES.getString("guis.vault.title").replace("%num%", "" + num);
+        if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            title = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(Bukkit.getOfflinePlayer(uuid), title);
+        }
+
+        this.storage = Bukkit.createInventory(null, VaultManager.getPlayer(uuid).getRows() * 9, StringUtils.formatToString(title));
         this.icon = icon;
         VaultManager.getVaults().add(this);
     }
@@ -82,7 +89,12 @@ public void open(@NotNull Player player) {
     }
 
     public void reload() {
-        final Inventory newStorage = Bukkit.createInventory(null, VaultManager.getPlayer(uuid).getRows() * 9, StringUtils.formatToString(MESSAGES.getString("guis.vault.title").replace("%num%", "" + id)));
+        String title = MESSAGES.getString("guis.vault.title").replace("%num%", "" + id);
+        if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            title = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(Bukkit.getOfflinePlayer(uuid), title);
+        }
+
+        final Inventory newStorage = Bukkit.createInventory(null, VaultManager.getPlayer(uuid).getRows() * 9, StringUtils.formatToString(title));
         final ItemStack[] contents = storage.getContents();
 
         int n = -1;

diff --git a/src/main/java/com/artillexstudios/axvaults/vaults/VaultManager.java b/src/main/java/com/artillexstudios/axvaults/vaults/VaultManager.java
@@ -29,6 +29,7 @@ public static VaultPlayer getPlayer(@NotNull UUID uuid) {
 
     public static void removePlayer(@NotNull Player player) {
         final VaultPlayer vaultPlayer = players.remove(player.getUniqueId());
+        if (vaultPlayer == null) return;
         vaultPlayer.save();
     }
 

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1,3 +1,5 @@
+# DOCUMENTATION: https://docs.artillex-studios.com/axvaults.html
+
 prefix: "&#55ff00&lAxVaults &7» "
 
 # this setting is not reloadable, you have to restart the server

diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
@@ -1,3 +1,6 @@
+# DOCUMENTATION: https://docs.artillex-studios.com/axvaults.html
+# ITEM BUILDER: https://docs.artillex-studios.com/item-builder.html
+
 guis:
   selector:
     title: "&0My Vaults"
@@ -18,7 +21,7 @@ guis:
       glow: false
       lore:
         - " "
-        - " &7- &fYou have not unlocked this vault yet!"
+        - " &7- &fYou have &#FF0000not unlocked &fthis vault yet!"
         - " "
         - "&#FF0000&l(!) &#FF0000Locked Vault"
   item-picker: