Skip to content

unregister permissions on disable #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zefir-git wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

unregister permissions on disable #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/pro/cloudnode/smp/enchantbookplus/EnchantBookPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void reload() {

@Override
public void onEnable() {
Permissions.init(this);
Permissions.register(this);
Objects.requireNonNull(getCommand("enchantbookplus")).setExecutor(new MainCommand(this));

registerEvents();
Expand All @@ -99,5 +99,6 @@ public void onEnable() {
public void onDisable() {
allConfigEnchantment = null;
configEnchantments.clear();
Permissions.unregister(this);
}
}
24 changes: 18 additions & 6 deletions src/main/java/pro/cloudnode/smp/enchantbookplus/Permissions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,39 @@
import org.bukkit.plugin.PluginManager;
import org.jspecify.annotations.NullMarked;

import java.util.function.Consumer;

@NullMarked
public final class Permissions {
public final static String RELOAD = "enchantbookplus.reload";
public static final String RELOAD = "enchantbookplus.reload";

public static String enchant(final Enchantment enchantment) {
return "enchantbookplus.enchant." + enchantment.getKey().getKey();
}

public static void init(final EnchantBookPlus plugin) {

public static void register(final EnchantBookPlus plugin) {
final PluginManager pm = plugin.getServer().getPluginManager();
forEach(pm::addPermission);
}

public static void unregister(final EnchantBookPlus plugin) {
final PluginManager pm = plugin.getServer().getPluginManager();
forEach(pm::removePermission);
}

pm.addPermission(new Permission(
private static void forEach(final Consumer<Permission> consumer) {
consumer.accept(new Permission(
RELOAD,
"Reload plugin config using ‘/enchantbookplus reload’",
PermissionDefault.OP
));

for (Enchantment enchantment : Registry.ENCHANTMENT) {
pm.addPermission(new Permission(
for (final Enchantment enchantment : Registry.ENCHANTMENT) {
consumer.accept(new Permission(
enchant(enchantment),
"Allow enchanting " + enchantment.getKey() + "above the vanilla level, as configured in the plugin",
"Allow enchanting " + enchantment.getKey()
+ " above the vanilla level, as configured in the plugin",
PermissionDefault.TRUE
));
}
Expand Down
Loading