make right click open the menu again

Crazy-Crew · Aug 14, 2024 · 438399a · 438399a
1 parent 4f6a2b9
commit 438399a
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java b/src/main/java/com/badbones69/crazycrates/listeners/CrateControlListener.java
@@ -97,27 +97,9 @@ public void onCrateInteract(PlayerInteractEvent event) {
             return;
         }
 
-        final Crate crate = crateLocation.getCrate();
-
-        if (crate.getCrateType() == CrateType.menu) {
-            // this is to stop players in QuadCrate to not be able to try and open a crate set to menu.
-            if (!this.crateManager.isInOpeningList(player) && this.config.getProperty(ConfigKeys.enable_crate_menu)) {
-                final CrateMainMenu crateMainMenu = new CrateMainMenu(player, this.config.getProperty(ConfigKeys.inventory_name), this.config.getProperty(ConfigKeys.inventory_size));
-
-                player.openInventory(crateMainMenu.build().getInventory());
-            } else {
-                Messages.feature_disabled.sendMessage(player);
-            }
-        } else {
-            if (crate.isPreviewEnabled()) {
-                this.inventoryManager.addViewer(player);
-                this.inventoryManager.openNewCratePreview(player, crateLocation.getCrate());
-            } else {
-                Messages.preview_disabled.sendMessage(player, "{crate}", crate.getName());
-            }
-        }
+        preview(player, crateLocation.getCrate(), false);
     }
-    
+
     // This must run as highest, so it doesn't cause other plugins to check
     // the items that were added to the players inventory and replaced the item in the player's hand.
     // This is only an issue with QuickCrate
@@ -138,11 +120,15 @@ public void onRightClick(PlayerInteractEvent event) {
 
         final Crate crate = crateLocation.getCrate();
 
-        if (crate.getCrateType() == CrateType.menu) return;
-
         event.setUseInteractedBlock(Event.Result.DENY);
         event.setUseItemInHand(Event.Result.DENY);
 
+        if (crate.getCrateType() == CrateType.menu) {
+            preview(player, crate, true);
+
+            return;
+        }
+
         final KeyCheckEvent key = new KeyCheckEvent(player, crateLocation);
         player.getServer().getPluginManager().callEvent(key);
 
@@ -278,7 +264,7 @@ private void lackingKey(final Player player, final Crate crate, final Location l
         }};
 
         if (crate.getCrateType() != CrateType.crate_on_the_go) {
-            if (this.config.getProperty(ConfigKeys.knock_back)) knockBack(player, location);
+            if (this.config.getProperty(ConfigKeys.knock_back)) knockback(player, location);
 
             if (this.config.getProperty(ConfigKeys.need_key_sound_toggle)) {
                 net.kyori.adventure.sound.Sound sound = net.kyori.adventure.sound.Sound.sound(Key.key(this.config.getProperty(ConfigKeys.need_key_sound)), Sound.Source.PLAYER, 1f, 1f);
@@ -289,8 +275,8 @@ private void lackingKey(final Player player, final Crate crate, final Location l
             if (sendMessage) Messages.no_keys.sendMessage(player, placeholders);
         }
     }
-    
-    private void knockBack(final Player player, final Location location) {
+
+    private void knockback(final Player player, final Location location) {
         final Vector vector = player.getLocation().toVector().subtract(location.toVector()).normalize().multiply(1).setY(.1);
 
         if (player.isInsideVehicle() && player.getVehicle() != null) {
@@ -301,4 +287,24 @@ private void knockBack(final Player player, final Location location) {
 
         player.setVelocity(vector);
     }
+
+    private void preview(final Player player, final Crate crate, boolean skipTypeCheck) {
+        if (skipTypeCheck || crate.getCrateType() == CrateType.menu) {
+            // this is to stop players in QuadCrate to not be able to try and open a crate set to menu.
+            if (!this.crateManager.isInOpeningList(player) && this.config.getProperty(ConfigKeys.enable_crate_menu)) {
+                final CrateMainMenu crateMainMenu = new CrateMainMenu(player, this.config.getProperty(ConfigKeys.inventory_name), this.config.getProperty(ConfigKeys.inventory_size));
+
+                player.openInventory(crateMainMenu.build().getInventory());
+            } else {
+                Messages.feature_disabled.sendMessage(player);
+            }
+        } else {
+            if (crate.isPreviewEnabled()) {
+                this.inventoryManager.addViewer(player);
+                this.inventoryManager.openNewCratePreview(player, crate);
+            } else {
+                Messages.preview_disabled.sendMessage(player, "{crate}", crate.getName());
+            }
+        }
+    }
 }