update

Basic-Land · Aug 2, 2024 · 4a79309 · 4a79309
1 parent db90a21
commit 4a79309
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/items/ShopMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/items/ShopMenu.java
@@ -38,6 +38,7 @@ public ShopMenu(Crate crate, Player player) {
     public InventoryBuilder build() {
         setTopCrates();
         setTextureGlass();
+        setBackButton();
         return this;
     }
 
@@ -65,6 +66,10 @@ public void run(InventoryClickEvent e) {
             player.playSound(UltimateMenuStuff.CLICK);
             player.openInventory(new ShopMenu(shopMenu, newCrateNum).build().getInventory());
         }
+
+        if (slot == 49) {
+            plugin.getCrateManager().getDatabaseManager().getUltimateMenuManager().open(player, shopMenu.getCrate());
+        }
     }
 
     private void setTopCrates() {
@@ -100,4 +105,8 @@ private void setTopCrates() {
     private void setTextureGlass() {
         getInventory().setItem(45, UltimateMenuStuff.SHOP_BANNER.getStack());
     }
+
+    private void setBackButton() {
+        getInventory().setItem(49, UltimateMenuStuff.MAIN_MENU_SHOP.getStack());
+    }
 }
diff --git a/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/items/UltimateMenu.java b/paper/src/main/java/com/badbones69/crazycrates/api/builders/types/items/UltimateMenu.java
@@ -61,7 +61,7 @@ public UltimateMenu(Crate crate, Player player, Component trans) {
         this.totalPageAmount = crateSettingsSplit.size();
     }
 
-    public UltimateMenu(Player player, Component trans, int page, int selectedCrate) {
+    private UltimateMenu(Player player, Component trans, int page, int selectedCrate) {
         super(manager.getCrateSettingsSplit().get(page).get(selectedCrate).getCrate(), player, 54, trans);
         this.currentPage = page;
         this.selectedCrate = selectedCrate;
@@ -71,7 +71,7 @@ public UltimateMenu(Player player, Component trans, int page, int selectedCrate)
         player.getInventory().clear();
     }
 
-    public UltimateMenu(UltimateMenu ultimateMenu, Component title, int selectedCrate) {
+    private UltimateMenu(UltimateMenu ultimateMenu, Component title, int selectedCrate) {
         this(ultimateMenu.getPlayer(), title, ultimateMenu.currentPage, selectedCrate);
     }
 

diff --git a/...ain/java/com/badbones69/crazycrates/api/objects/gacha/ultimatemenu/UltimateMenuStuff.java b/...ain/java/com/badbones69/crazycrates/api/objects/gacha/ultimatemenu/UltimateMenuStuff.java
@@ -49,6 +49,7 @@ public class UltimateMenuStuff {
             .addDisplayLore("<gray>Právě vybraný obchod");
     public static final ItemBuilder SHOP_UNSELECTED = getItem(Material.RED_STAINED_GLASS_PANE, 1000007)
             .addDisplayLore("<gray>Kliknutím vyberete tento obchod");
+    public static final ItemBuilder MAIN_MENU_SHOP = getItem(Material.CHEST, 1000008);
 
 
 

diff --git a/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/GachaCrateListener.java b/paper/src/main/java/com/badbones69/crazycrates/listeners/crates/GachaCrateListener.java
@@ -61,8 +61,12 @@ public void onInventoryClick(InventoryClickEvent event) {
         int count = rouletteStandard.getCount();
         Inventory inv = event.getView().getTopInventory();
         long time = rouletteStandard.getTime();
+        long diff = System.currentTimeMillis() - time;
 
-        if (System.currentTimeMillis() - time < 400) return;
+        if (diff < 400) return;
+
+        System.out.println("Count: " + count);
+        System.out.println("Diff: " + diff);
 
         rouletteStandard.updateTimer();
 

diff --git a/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/types/GachaCrate.java b/paper/src/main/java/com/badbones69/crazycrates/tasks/crates/types/GachaCrate.java
@@ -106,7 +106,7 @@ public void open(@NotNull KeyType type, boolean checkHand) {
 
 
         setItem(37, UltimateMenuStuff.BORDER.getStack());
-        setItem(8, new ItemBuilder(Material.PLAYER_HEAD).setDisplayName("<green>Skip").getStack());
+        setItem(8, new ItemBuilder(Material.PLAYER_HEAD).setDisplayName("<green>Skip").setCustomModelData(1000002).getStack());
 
         addCrateTask(new RouletteStandard(this, items, sneak).runAtFixedRate(this.plugin, 1, 2));
 

diff --git a/...rc/main/java/com/badbones69/crazycrates/tasks/crates/types/roulette/RouletteStandard.java b/...rc/main/java/com/badbones69/crazycrates/tasks/crates/types/roulette/RouletteStandard.java
@@ -108,6 +108,7 @@ public void run() {
                 lock = true;
                 builder.setItem(36, glass.setCustomModelData(600).getStack());
                 if (!skip) builder.setItem(22, prize.getFirst().getPrize().getDisplayItem());
+                skip = true;
                 return;
             }
 
@@ -175,6 +176,7 @@ public void skip() {
         modelData = 64;
         count = 10;
         skip = true;
+        player.stopAllSounds();
     }
 
     public void updateTimer() {