don't fetch item meta just to get the name of the key.

Crazy-Crew · Feb 12, 2024 · 323e38e · 323e38e
1 parent cf13f2f
commit 323e38e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/EventLogger.java b/paper/src/main/java/com/badbones69/crazycrates/api/EventLogger.java
@@ -89,13 +89,13 @@ private String getDateTime() {
     @SuppressWarnings("DEPRECATIONS")
     private String setEntryData(String string, Player player, CommandSender sender, Crate crate, KeyType keyType) {
         return string.replace("%player%", player.getName()).replace("%crate_name%", crate.getName()).replace("%sender%", sender.getName())
-                .replace("%crate_type%", crate.getCrateType().getName()).replace("%key_name%", crate.getKey().getItemMeta().getDisplayName())
+                .replace("%crate_type%", crate.getCrateType().getName()).replace("%key_name%", crate.getKeyName())
                 .replace("%key_type%", keyType.getName()).replace("%key_item%", crate.getKey().getType().toString());
     }
 
     private String setEntryData(String string, OfflinePlayer player, CommandSender sender, Crate crate, KeyType keyType) {
         return string.replace("%player%", player.getName()).replace("%crate_name%", crate.getName()).replace("%sender%", sender.getName())
-                .replace("%crate_type%", crate.getCrateType().getName()).replace("%key_name%", crate.getKey().getItemMeta().getDisplayName())
+                .replace("%crate_type%", crate.getCrateType().getName()).replace("%key_name%", crate.getKeyName())
                 .replace("%key_type%", keyType.getName()).replace("%key_item%", crate.getKey().getType().toString());
     }
 

diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java b/paper/src/main/java/com/badbones69/crazycrates/api/objects/Crate.java
@@ -39,6 +39,7 @@ public class Crate {
 
     private AbstractCrateManager manager;
     private final String name;
+    private final String keyName;
     private final ItemStack key;
     private final ItemStack keyNoNBT;
     private final ItemStack adminKey;
@@ -86,10 +87,11 @@ public class Crate {
      * @param prizes The prizes that can be won.
      * @param file The crate file.
      */
-    public Crate(String name, String previewName, CrateType crateType, ItemStack key, List<Prize> prizes, FileConfiguration file, int newPlayerKeys, List<Tier> tiers, int maxMassOpen, int requiredKeys, List<String> prizeMessage, CrateHologram hologram) {
+    public Crate(String name, String previewName, CrateType crateType, ItemStack key, String keyName, List<Prize> prizes, FileConfiguration file, int newPlayerKeys, List<Tier> tiers, int maxMassOpen, int requiredKeys, List<String> prizeMessage, CrateHologram hologram) {
         ItemBuilder itemBuilder = ItemBuilder.convertItemStack(key);
         this.keyNoNBT = itemBuilder.build();
         this.key = itemBuilder.setCrateName(name).build();
+        this.keyName = keyName;
         this.adminKey = itemBuilder
         .addLore("")
         .addLore("&7&l(&6&l!&7&l) Left click for Physical Key")
@@ -137,6 +139,13 @@ public Crate(String name, String previewName, CrateType crateType, ItemStack key
         }
     }
 
+    /**
+     * @return the key name.
+     */
+    public String getKeyName() {
+        return this.keyName;
+    }
+
     /**
      * @return true or false if the border for the preview tier is toggled.
      */

diff --git a/paper/src/main/java/com/badbones69/crazycrates/commands/subs/CrateBaseCommand.java b/paper/src/main/java/com/badbones69/crazycrates/commands/subs/CrateBaseCommand.java
@@ -622,7 +622,7 @@ private void addKey(CommandSender sender, Player player, OfflinePlayer offlinePl
 
             placeholders.put("%amount%", String.valueOf(amount));
             placeholders.put("%player%", player.getName());
-            placeholders.put("%key%", crate.getKey().getItemMeta().getDisplayName());
+            placeholders.put("%key%", crate.getKeyName());
 
             boolean fullMessage = this.config.getProperty(ConfigKeys.notify_player_when_inventory_full);
             boolean inventoryCheck = this.config.getProperty(ConfigKeys.give_virtual_keys_when_inventory_full);
@@ -754,7 +754,7 @@ public void onAdminCrateGiveAllKeys(CommandSender sender, @Suggestion("key-types
         HashMap<String, String> placeholders = new HashMap<>();
 
         placeholders.put("%amount%", String.valueOf(amount));
-        placeholders.put("%key%", crate.getKey().getItemMeta().getDisplayName());
+        placeholders.put("%key%", crate.getKeyName());
 
         sender.sendMessage(Messages.given_everyone_keys.getMessage(placeholders).toString());
 

diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java
@@ -129,7 +129,7 @@ public void onCrateOpen(PlayerInteractEvent e) {
                     boolean hasKey = false;
                     boolean isPhysical = false;
                     boolean useQuickCrateAgain = false;
-                    String keyName = crate.getKey().getItemMeta().getDisplayName();
+                    String keyName = crate.getKeyName();
 
                     int requiredKeys = this.plugin.getCrateManager().getCrateFromName(crate.getName()).getRequiredKeys();
 

diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/menus/CrateAdminListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/menus/CrateAdminListener.java
@@ -52,7 +52,7 @@ public void onInventoryClick(InventoryClickEvent event) {
 
         if (event.getClickedInventory() != topInventory) return;
 
-        if (!MiscUtils.permCheck(player, Permissions.CRAZY_CRATES_ADMIN_ACCESS, false)) {
+        if (!Permissions.CRAZYCRATES_ACCESS.hasPermission(player)) {
             player.closeInventory(InventoryCloseEvent.Reason.CANT_USE);
             player.sendMessage(Messages.no_permission.getString());
             return;
@@ -83,7 +83,7 @@ public void onInventoryClick(InventoryClickEvent event) {
                 HashMap<String, String> placeholders = new HashMap<>();
 
                 placeholders.put("%amount%", String.valueOf(1));
-                placeholders.put("%key%", crate.getKey().getItemMeta().getDisplayName());
+                placeholders.put("%key%", crate.getKeyName());
 
                 player.sendMessage(Messages.obtaining_keys.getMessage(placeholders).toString());
             }

diff --git a/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java b/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/CrateManager.java
@@ -252,7 +252,7 @@ public void loadCrates() {
                 List<String> prizeMessage = file.contains("Crate.Prize-Message") ? file.getStringList("Crate.Prize-Message") : Collections.emptyList();
 
                 CrateHologram holo = new CrateHologram(file.getBoolean("Crate.Hologram.Toggle"), file.getDouble("Crate.Hologram.Height", 0.0), file.getInt("Crate.Hologram.Range", 8), file.getStringList("Crate.Hologram.Message"));
-                addCrate(new Crate(crateName, previewName, crateType, getKey(file), prizes, file, newPlayersKeys, tiers, maxMassOpen, requiredKeys, prizeMessage, holo));
+                addCrate(new Crate(crateName, previewName, crateType, getKey(file), file.getString("Crate.PhysicalKey.Name"), prizes, file, newPlayersKeys, tiers, maxMassOpen, requiredKeys, prizeMessage, holo));
 
                 Permission doesExist = this.plugin.getServer().getPluginManager().getPermission("crazycrates.open." + crateName);
 
@@ -271,7 +271,7 @@ public void loadCrates() {
             }
         }
 
-        addCrate(new Crate("Menu", "Menu", CrateType.menu, new ItemStack(Material.AIR), new ArrayList<>(), null, 0, null, 0, 0, Collections.emptyList(), null));
+        addCrate(new Crate("Menu", "Menu", CrateType.menu, new ItemStack(Material.AIR), "", new ArrayList<>(), null, 0, null, 0, 0, Collections.emptyList(), null));
 
         if (this.plugin.isLogging()) {
             List.of(