Change how the admin key menu functions.

Crazy-Crew · Mar 4, 2024 · ab9dad6 · ab9dad6
1 parent 98bcf0f
commit ab9dad6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 34 deletions.
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -9,6 +9,8 @@ dependencies {
 
     implementation(libs.triumphcmds)
 
+    //implementation(libs.triumphgui)
+
     implementation(libs.metrics)
 
     implementation(libs.nbtapi)

diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/CrateAdminMenu.java
@@ -4,6 +4,7 @@
 import com.badbones69.crazycrates.api.enums.Messages;
 import com.badbones69.crazycrates.api.enums.Permissions;
 import com.badbones69.crazycrates.api.objects.Crate;
+import com.badbones69.crazycrates.api.objects.other.ItemBuilder;
 import com.badbones69.crazycrates.tasks.crates.CrateManager;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -16,14 +17,10 @@
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
-import us.crazycrew.crazycrates.api.enums.types.CrateType;
 import com.badbones69.crazycrates.api.builders.InventoryBuilder;
 import us.crazycrew.crazycrates.api.enums.types.KeyType;
 import us.crazycrew.crazycrates.api.users.UserManager;
-
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 public class CrateAdminMenu extends InventoryBuilder {
 
@@ -35,8 +32,15 @@ public CrateAdminMenu(Player player, int size, String title) {
     public InventoryBuilder build() {
         Inventory inventory = getInventory();
 
+        inventory.setItem(49, new ItemBuilder().setMaterial(Material.CHEST)
+                .setName("&cWhat is this menu?")
+                .addLore("")
+                .addLore("&dA cheat cheat menu of all your available keys.")
+                .addLore("&7&lRight click to get virtual keys.")
+                .addLore("&7&lLeft click to get physical keys.").build());
+
         for (Crate crate : this.plugin.getCrateManager().getUsableCrates()) {
-            if (inventory.firstEmpty() >= 0) inventory.setItem(inventory.firstEmpty(), crate.getAdminKey(getPlayer()));
+            if (inventory.firstEmpty() >= 0) inventory.setItem(inventory.firstEmpty(), crate.getKey(getPlayer()));
         }
 
         return this;

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
@@ -42,7 +42,6 @@ public class Crate {
     private final String keyName;
     private final ItemBuilder keyBuilder;
     private final ItemStack keyNoNBT;
-    private final ItemBuilder adminKey;
     private int maxPage = 1;
     private final int maxSlots;
     private final String previewName;
@@ -91,11 +90,7 @@ public Crate(String name, String previewName, CrateType crateType, ItemStack key
         this.keyBuilder = ItemBuilder.convertItemStack(key).setCrateName(name);
         this.keyNoNBT = this.keyBuilder.build();
         this.keyName = keyName;
-        this.adminKey = this.keyBuilder
-        .addLore("")
-        .addLore("&7&l(&6&l!&7&l) Left click for Physical Key")
-        .addLore("&7&l(&6&l!&7&l) Right click for Virtual Key")
-        .setCrateName(name);
+
         this.file = file;
         this.name = name;
         this.tiers = tiers != null ? tiers : new ArrayList<>();
@@ -510,26 +505,6 @@ public ItemStack getKeyNoNBT(int amount) {
         return key;
     }
 
-    /**
-     * Get the key that shows in the /cc admin menu.
-     *
-     * @return the itemstack of the key shown in the /cc admin menu.
-     */
-    public ItemStack getAdminKey() {
-        return this.adminKey.build();
-    }
-
-    /**
-     * Get the key that shows in the /cc admin menu.
-     *
-     * @param player The player getting the key.
-     *
-     * @return the itemstack of the key shown in the /cc admin menu.
-     */
-    public ItemStack getAdminKey(Player player) {
-        return this.adminKey.setTarget(player).build();
-    }
-
     /**
      * @return the crates file.
      */

diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java b/paper/src/main/java/com/badbones69/crazycrates/api/utils/ItemUtils.java
@@ -19,8 +19,7 @@ public static void removeItem(ItemStack item, Player player) {
 
     public static boolean isSimilar(ItemStack itemStack, Crate crate) {
         NBTItem nbtItem = new NBTItem(itemStack);
-        return itemStack.isSimilar(crate.getKey()) || itemStack.isSimilar(crate.getKeyNoNBT()) ||
-                itemStack.isSimilar(crate.getAdminKey()) || stripNBT(itemStack).isSimilar(crate.getKeyNoNBT()) ||
+        return itemStack.isSimilar(crate.getKey()) || itemStack.isSimilar(crate.getKeyNoNBT()) || stripNBT(itemStack).isSimilar(crate.getKeyNoNBT()) ||
                 isSimilarCustom(crate.getKeyNoNBT(), itemStack) || (nbtItem.hasTag("CrazyCrates-Crate") && crate.getName().equals(nbtItem.getString("CrazyCrates-Crate")));
     }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,6 +32,8 @@ dependencyResolutionManagement {
 
             library("placeholderapi", "me.clip", "placeholderapi").version("2.11.5")
 
+            library("triumphgui", "dev.triumphteam", "triumph-gui").version("3.1.7")
+
             library("metrics", "org.bstats", "bstats-bukkit").version("3.0.2")
 
             library("nbtapi", "de.tr7zw", "item-nbt-api").version("2.12.2")
@@ -47,5 +49,5 @@ rootProject.name = "CrazyCrates"
 
 include("api")
 include("paper")
-include("fabric")
+//include("fabric")
 include("common")