Add method for checking a toggle with permissions

Author: Jikoo

api/src/main/java/com/lishid/openinv/util/Permissions.java

@@ -125,9 +125,4 @@ public boolean hasPermission(@NotNull Permissible permissible) {
     return permissible.hasPermission(permission);
   }
 
-  public boolean hasPermission(@NotNull Permissible permissible, @NotNull Permissions parent) {
-    if (permissible.hasPermission(permission)) return true;
-    if (permissible.isPermissionSet(permission) && !permissible.hasPermission(permission)) return false;
-    return permissible.hasPermission(parent.permission);
-  }
 }

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggle.java

@@ -1,5 +1,6 @@
 package com.lishid.openinv.util.setting;
 
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
@@ -24,6 +25,15 @@ public interface PlayerToggle {
    */
   boolean is(@NotNull UUID uuid);
 
+  /**
+   * Get the state of the toggle for a particular {@link Player},
+   * accounting for permissions required to use the feature.
+   *
+   * @param player the player
+   * @return true if the setting is enabled and the player has the required permissions
+   */
+  boolean is(@NotNull Player player);
+
   /**
    * Set the state of the toggle for a particular player ID.
    *

api/src/main/java/com/lishid/openinv/util/setting/PlayerToggles.java

@@ -1,5 +1,7 @@
 package com.lishid.openinv.util.setting;
 
+import com.lishid.openinv.util.Permissions;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
@@ -19,8 +21,20 @@
 public final class PlayerToggles {
 
   private static final Map<String, PlayerToggle> TOGGLES = new HashMap<>();
-  private static final PlayerToggle ANY = add(new MemoryToggle("AnyContainer"));
-  private static final PlayerToggle SILENT = add(new MemoryToggle("SilentContainer"));
+  private static final PlayerToggle ANY = add(new MemoryToggle("AnyContainer") {
+    @Override
+    public boolean is(@NotNull Player player) {
+      return is(player.getUniqueId())
+          && (Permissions.CONTAINER_ANY.hasPermission(player) || Permissions.CONTAINER_ANY_USE.hasPermission(player));
+    }
+  });
+  private static final PlayerToggle SILENT = add(new MemoryToggle("SilentContainer") {
+    @Override
+    public boolean is(@NotNull Player player) {
+      return is(player.getUniqueId())
+          && (Permissions.CONTAINER_SILENT.hasPermission(player) || Permissions.CONTAINER_SILENT_USE.hasPermission(player));
+    }
+  });
 
   /**
    * Get the AnyContainer toggle.
@@ -72,7 +86,7 @@ private PlayerToggles() {
     throw new IllegalStateException("Cannot create instance of utility class.");
   }
 
-  private static class MemoryToggle implements PlayerToggle {
+  private static abstract class MemoryToggle implements PlayerToggle {
 
     private final @NotNull Set<UUID> enabled;
     private final @NotNull String name;

plugin/src/main/java/com/lishid/openinv/listener/ContainerListener.java

@@ -39,8 +39,6 @@
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.UUID;
-
 /**
  * A listener managing AnyContainer, SilentContainer, and more.
  */
@@ -71,15 +69,14 @@ private void onPlayerInteract(@NotNull PlayerInteractEvent event) {
     }
 
     Player player = event.getPlayer();
-    UUID playerId = player.getUniqueId();
-    boolean any = Permissions.CONTAINER_ANY_USE.hasPermission(player, Permissions.CONTAINER_ANY) && PlayerToggles.any().is(playerId);
+    boolean any = PlayerToggles.any().is(player);
     boolean needsAny = accessor.getAnySilentContainer().isAnyContainerNeeded(event.getClickedBlock());
 
     if (!any && needsAny) {
       return;
     }
 
-    boolean silent = Permissions.CONTAINER_SILENT_USE.hasPermission(player, Permissions.CONTAINER_SILENT) && PlayerToggles.silent().is(playerId);
+    boolean silent = PlayerToggles.silent().is(player);
 
     // If anycontainer or silentcontainer is active
     if (any || silent) {
@@ -104,7 +101,7 @@ private void onInventoryClose(@NotNull final InventoryCloseEvent event) {
     }
 
     InventoryHolder holder = event.getInventory().getHolder();
-    if (PlayerToggles.silent().is(player.getUniqueId())
+    if (PlayerToggles.silent().is(player)
         && holder != null
         && this.accessor.getAnySilentContainer().isAnySilentContainer(holder)) {
       this.accessor.getAnySilentContainer().deactivateContainer(player);