bumped version to 1.1.1 + Fixed Permission related bugs

Author: BuddySirJava

README.md

@@ -58,7 +58,7 @@ Modules are documented by category (config keys, permissions, and previews where
 | `/mint help` / `about` | Show plugin info | — |
 | `/mint admin reload` | Reload configuration | `mint.admin`, `mint.reload` |
 | `/mint admin modules` | List all module states | `mint.admin` |
-| `/mint admin toggle <mod> [player]` | Toggle a module | `mint.toggle`; `mint.toggle.others` when `[player]` is set |
+| `/mint admin toggle <mod> [player]` | Toggle a module (self or another player) | `mint.admin`, `mint.toggle` |
 | `/mint admin global <mod> <on/off>` | Globally toggle a module in config | `mint.admin.global` |
 | `/mint admin profile list` | List saved module presets | `mint.admin.profile` |
 | `/mint admin profile save <name> [player]` | Snapshot a player's enabled modules | `mint.admin.profile` |
@@ -68,6 +68,16 @@ Modules are documented by category (config keys, permissions, and previews where
 
 *Bypass protection checks in supported plugins with permission `mint.bypass.protection`.*
 
+### Module permissions
+
+Personal modules use two optional permission layers (configured per module in `config.yml`):
+
+| Layer | Default node | Config key | Purpose |
+| --- | --- | --- | --- |
+| **Use** | `mint.module.<module-key>` | `permission` | Whether the module's features apply for the player |
+| **Toggle** | `mint.toggle.<module-key>` | `toggle-permission` | Whether the player can enable or disable the module (GUI and `/mint admin toggle` for themselves) |
+
+
 ## Technical details
 
 - **Storage:** YAML (default), H2, MySQL, MariaDB, MongoDB.

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>ir.buddy</groupId>
     <artifactId>Mint</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
 
     <name>Mint</name>

src/main/java/ir/buddy/mint/command/MintCommand.java

@@ -163,10 +163,6 @@ private void handleToggle(CommandSender sender, String label, String[] args, Min
 
         Player targetPlayer;
         if (args.length >= 4) {
-            if (!sender.hasPermission("mint.toggle.others")) {
-                lang.send(sender, "errors.no-permission", Map.of("label", label));
-                return;
-            }
             targetPlayer = plugin.getServer().getPlayerExact(args[3]);
             if (targetPlayer == null) {
                 lang.send(sender, "errors.player-not-found", Map.of("label", label, "player", args[3]));
@@ -185,7 +181,17 @@ private void handleToggle(CommandSender sender, String label, String[] args, Min
             return;
         }
 
-        boolean enabledAfterToggle = plugin.getPlayerModulePreferences().toggleFor(targetPlayer, module);
+        boolean togglingOther = args.length >= 4;
+        boolean bypassTogglePermission = togglingOther;
+        if (!bypassTogglePermission
+                && sender instanceof Player self
+                && self.getUniqueId().equals(targetPlayer.getUniqueId())
+                && !plugin.getPlayerModulePreferences().hasTogglePermission(self, module)) {
+            lang.send(sender, "errors.no-module-toggle-permission", Map.of("label", label, "module", module.getName()));
+            return;
+        }
+
+        boolean enabledAfterToggle = plugin.getPlayerModulePreferences().toggleFor(targetPlayer, module, bypassTogglePermission);
 
         Map<String, String> ph = new HashMap<>();
         ph.put("label", label);
@@ -430,7 +436,7 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
             }
         }
         if (args.length == 4 && args[0].equalsIgnoreCase("admin") && args[1].equalsIgnoreCase("toggle")
-                && sender.hasPermission("mint.toggle.others")) {
+                && sender.hasPermission("mint.admin")) {
             return filterPrefix(
                     plugin.getServer().getOnlinePlayers().stream()
                             .map(Player::getName)

src/main/java/ir/buddy/mint/gui/ModuleToggleGui.java

@@ -249,7 +249,7 @@ private void handleModuleGuiClick(InventoryClickEvent event, Player player) {
         }
 
         if (rawSlot == nextSlot) {
-            List<Module> modules = getModulesForCategory(guiHolder.categoryKey);
+            List<Module> modules = getModulesForCategory(player, guiHolder.categoryKey);
             List<Integer> moduleSlots = layout.moduleSlots();
             int pageSize = Math.max(1, moduleSlots.size());
             int maxPage = Math.max(0, (int) Math.ceil((double) modules.size() / pageSize) - 1);
@@ -284,7 +284,7 @@ private void handleModuleGuiClick(InventoryClickEvent event, Player player) {
         if (isSinglePage) {
             int catIdx = layout.categorySlots().indexOf(rawSlot);
             if (catIdx >= 0) {
-                List<CategoryEntry> categories = getVisibleCategories();
+                List<CategoryEntry> categories = getVisibleCategories(player);
 
                 if (catIdx < categories.size()) {
                     openGui(player, categories.get(catIdx).key(), 0, GuiView.MODULES);
@@ -302,7 +302,7 @@ private void handleModuleGuiClick(InventoryClickEvent event, Player player) {
                 syncInventory(player);
                 return;
             }
-            List<CategoryEntry> categories = getVisibleCategories();
+            List<CategoryEntry> categories = getVisibleCategories(player);
             int categoryIndex = guiHolder.page * contentSlots.size() + idxInPage;
             if (categoryIndex < 0 || categoryIndex >= categories.size()) {
                 syncInventory(player);
@@ -314,14 +314,20 @@ private void handleModuleGuiClick(InventoryClickEvent event, Player player) {
         }
 
         if (guiHolder.view == GuiView.MODULES) {
-            List<Module> modules = getModulesForCategory(guiHolder.categoryKey);
+            List<Module> modules = getModulesForCategory(player, guiHolder.categoryKey);
             Integer globalIdx = guiHolder.slotToGlobalModuleIndex.get(rawSlot);
             if (globalIdx == null || globalIdx < 0 || globalIdx >= modules.size()) {
                 syncInventory(player);
                 return;
             }
 
             Module module = modules.get(globalIdx);
+            if (!plugin.getPlayerModulePreferences().hasTogglePermission(player, module)) {
+                player.sendMessage(color(getString("messages.no-module-toggle-permission", "&cYou do not have permission to toggle this module.")));
+                syncInventory(player);
+                return;
+            }
+
             boolean enabled = plugin.getPlayerModulePreferences().toggleFor(player, module);
 
             String msg = color(getString("messages.toggle", "&e%module% &7-> %state%"))
@@ -459,13 +465,13 @@ private void openGui(Player player, String categoryKey, int requestedPage, GuiVi
         String activeCategory = categoryKey;
         if (view == GuiView.MODULES && isCategoriesEnabled()) {
             if (activeCategory == null || activeCategory.isBlank() || "all".equalsIgnoreCase(activeCategory)) {
-                activeCategory = resolveDefaultCategoryKey();
+                activeCategory = resolveDefaultCategoryKey(player);
             }
         }
 
         int entryCount = (view == GuiView.CATEGORIES && !isSinglePage)
-                ? getVisibleCategories().size()
-                : getModulesForCategory(activeCategory).size();
+                ? getVisibleCategories(player).size()
+                : getModulesForCategory(player, activeCategory).size();
         int totalPages = Math.max(1, (int) Math.ceil((double) entryCount / pageSize));
         int page = Math.max(0, Math.min(requestedPage, totalPages - 1));
 
@@ -480,7 +486,7 @@ private void openGui(Player player, String categoryKey, int requestedPage, GuiVi
         int start = page * pageSize;
 
         List<Module> modulesForView = view == GuiView.MODULES
-                ? getModulesForCategory(activeCategory)
+                ? getModulesForCategory(player, activeCategory)
                 : List.of();
         Map<Integer, Integer> moduleSlotIndexMap = view == GuiView.MODULES
                 ? computeModulePlacements(modulesForView, start, pageSize, contentSlots, readModuleSlotOverrides())
@@ -495,7 +501,7 @@ private void openGui(Player player, String categoryKey, int requestedPage, GuiVi
         }
 
         if (isSinglePage) {
-            List<CategoryEntry> categories = getVisibleCategories();
+            List<CategoryEntry> categories = getVisibleCategories(player);
 
             for (int i = 0; i < layout.categorySlots().size(); i++) {
                 if (i >= categories.size()) {
@@ -521,7 +527,7 @@ private void openGui(Player player, String categoryKey, int requestedPage, GuiVi
                 inv.setItem(invSlot, buildModuleItem(player, modulesForView.get(modIdx)));
             }
         } else if (view == GuiView.CATEGORIES) {
-            List<CategoryEntry> categories = getVisibleCategories();
+            List<CategoryEntry> categories = getVisibleCategories(player);
             for (int i = 0; i < pageSize; i++) {
                 int categoryIndex = start + i;
                 if (categoryIndex >= categories.size()) {
@@ -982,29 +988,30 @@ private boolean isModuleGui(Inventory inventory) {
         return inventory != null && inventory.getHolder() instanceof ModuleGuiHolder;
     }
 
-    private List<Module> getModules() {
+    private List<Module> getModules(Player player) {
         return plugin.getModuleManager().getPlayerScopedModules().stream()
                 .filter(module -> module.isEnabledByConfig(plugin.getConfig()))
+                .filter(module -> plugin.getPlayerModulePreferences().hasTogglePermission(player, module))
                 .sorted(Comparator.comparing(Module::getName, String.CASE_INSENSITIVE_ORDER))
                 .collect(Collectors.toList());
     }
 
-    public List<Module> getModulesForCategory(String categoryKey) {
+    public List<Module> getModulesForCategory(Player player, String categoryKey) {
         if (!isCategoriesEnabled()) {
             if (categoryKey == null || categoryKey.isBlank() || "all".equalsIgnoreCase(categoryKey)) {
-                return getModules();
+                return getModules(player);
             }
         } else {
             if (categoryKey == null || categoryKey.isBlank() || "all".equalsIgnoreCase(categoryKey)) {
-                String def = resolveDefaultCategoryKey();
+                String def = resolveDefaultCategoryKey(player);
                 if (def == null) {
                     return List.of();
                 }
                 categoryKey = def;
             }
         }
         final String resolvedKey = categoryKey;
-        return getModules().stream()
+        return getModules(player).stream()
                 .filter(module -> resolveModuleCategoryKey(module).equalsIgnoreCase(resolvedKey))
                 .collect(Collectors.toList());
     }
@@ -1018,17 +1025,13 @@ public String getCategoryDisplayName(String categoryKey) {
             if (!isCategoriesEnabled()) {
                 return color(getString("gui.modules-aggregate-display", "&fModules"));
             }
-            String def = resolveDefaultCategoryKey();
-            if (def != null) {
-                return color(getString("gui.categories.items." + def + ".display-name", toTitleCase(def.replace('-', ' '))));
-            }
             return color(getString("gui.modules-empty-display", "&fModules"));
         }
         return color(getString("gui.categories.items." + categoryKey + ".display-name", toTitleCase(categoryKey.replace('-', ' '))));
     }
 
-    private String resolveDefaultCategoryKey() {
-        List<CategoryEntry> visible = getVisibleCategories();
+    private String resolveDefaultCategoryKey(Player player) {
+        List<CategoryEntry> visible = getVisibleCategories(player);
         return visible.isEmpty() ? null : visible.get(0).key();
     }
 
@@ -1055,9 +1058,9 @@ private String normalizeCategoryKey(String value) {
         return value.toLowerCase(Locale.ROOT).replaceAll("[^a-z0-9-]", "-");
     }
 
-    public List<CategoryEntry> getVisibleCategories() {
+    public List<CategoryEntry> getVisibleCategories(Player player) {
         Map<String, Long> counts = new HashMap<>();
-        for (Module module : getModules()) {
+        for (Module module : getModules(player)) {
             counts.merge(resolveModuleCategoryKey(module), 1L, Long::sum);
         }
 

src/main/java/ir/buddy/mint/player/PlayerModulePreferences.java

@@ -67,7 +67,7 @@ public boolean isPersonalModuleEnabled(Player player, Module module) {
         if (!isToggleEnabledFor(player, module)) {
             return false;
         }
-        if (!hasModulePermission(player, module)) {
+        if (!hasModulePermissionInternal(player, module)) {
             return false;
         }
         if (!isAllowedInWorld(player, module)) {
@@ -108,14 +108,35 @@ public boolean setEnabledFor(Player player, Module module, boolean enabled) {
     }
 
     public boolean toggleFor(Player player, Module module) {
+        return toggleFor(player, module, false);
+    }
+
+    public boolean toggleFor(Player player, Module module, boolean bypassTogglePermission) {
         if (module.isServerScoped()) {
             return module.isEnabledByConfig(plugin.getConfig());
         }
-        boolean next = !isPersonalModuleEnabled(player, module);
+        if (!bypassTogglePermission && !hasTogglePermission(player, module)) {
+            return isToggleEnabledFor(player, module);
+        }
+        boolean next = !isToggleEnabledFor(player, module);
         setEnabledFor(player, module, next);
         return next;
     }
 
+    public boolean hasModulePermission(Player player, Module module) {
+        if (player == null) {
+            return true;
+        }
+        return hasModulePermissionInternal(player, module);
+    }
+
+    public boolean hasTogglePermission(Player player, Module module) {
+        if (player == null) {
+            return true;
+        }
+        return hasTogglePermissionInternal(player, module);
+    }
+
     public void clearCachedToggles(UUID playerUuid) {
         toggleCache.remove(playerUuid);
     }
@@ -147,17 +168,26 @@ private String getModuleKey(Module module) {
         return module.getConfigPath().replaceFirst("^modules\\.", "");
     }
 
-    private boolean hasModulePermission(Player player, Module module) {
+    private boolean hasModulePermissionInternal(Player player, Module module) {
+        return resolvesPermission(player, module, "permission", "mint.module.");
+    }
+
+    private boolean hasTogglePermissionInternal(Player player, Module module) {
+        return resolvesPermission(player, module, "toggle-permission", "mint.toggle.");
+    }
+
+    private boolean resolvesPermission(Player player, Module module, String configKey, String defaultPrefix) {
         String moduleKey = getModuleKey(module);
-        String path = module.getConfigPath() + ".permission";
+        String path = module.getConfigPath() + "." + configKey;
         String configured = plugin.getConfig().getString(path, "");
         String permission = (configured == null || configured.isBlank())
-                ? "mint.module." + moduleKey
+                ? defaultPrefix + moduleKey
                 : configured.trim();
         if (permission.equalsIgnoreCase("none") || permission.equalsIgnoreCase("disabled")) {
             return true;
         }
-        return player.hasPermission(permission) || player.hasPermission("mint.module.*");
+        String wildcard = defaultPrefix + "*";
+        return player.hasPermission(permission) || player.hasPermission(wildcard);
     }
 
     private boolean isAllowedInWorld(Player player, Module module) {

src/main/resources/config.yml

@@ -49,8 +49,10 @@ modules:
       brightness:
         block: 15
         sky: 15
-    # Permission defaults to mint.module.<module-key> when omitted.
+    # Use permission defaults to mint.module.<module-key> when omitted.
     permission: mint.module.reacharound-placement
+    # Toggle permission defaults to mint.toggle.<module-key> when omitted.
+    # toggle-permission: mint.toggle.reacharound-placement
     # Per-world controls:
     # mode: all | whitelist | blacklist
     worlds:

src/main/resources/gui.yml

@@ -160,3 +160,5 @@ messages:
   state-enabled: "&aEnabled"
   state-disabled: "&cDisabled"
   toggle: "&e%module% &7-> %state%"
+  no-module-permission: "&cYou do not have permission to use this module."
+  no-module-toggle-permission: "&cYou do not have permission to toggle this module."

src/main/resources/lang.yml

@@ -7,6 +7,7 @@ prefix: "<gradient:#00AA55:#55FF88><bold>Mint</bold></gradient><gray> » </gray>
 
 errors:
   no-permission: "<mint_prefix><red>You do not have permission.</red>"
+  no-module-toggle-permission: "<mint_prefix><red>You do not have permission to toggle </red><yellow><module></yellow><red>.</red>"
   players-only: "<mint_prefix><red>Only players can open the module GUI.</red>"
   no-gui-permission: "<mint_prefix><red>You cannot open the module GUI.</red>"
   unknown-subcommand: "<mint_prefix><gray>Unknown. Try </gray><yellow>/<label> help</yellow><gray>.</gray>"

src/main/resources/plugin.yml

@@ -24,10 +24,10 @@ permissions:
     description: Allows reloading Mint
     default: op
   mint.toggle:
-    description: Allows toggling personal Mint modules
+    description: Allows using /mint admin toggle for your own modules
     default: op
-  mint.toggle.others:
-    description: Allows toggling Mint modules for other players
+  mint.toggle.*:
+    description: Allows toggling any personal Mint module for yourself (GUI and per-module nodes)
     default: op
   mint.bypass.protection:
     description: Bypass protection plugin checks for Mint features