Upstream/ChestCommands
1
0
Fork 0
mirror of https://github.com/filoghost/ChestCommands.git synced 2025-02-19 21:11:42 +01:00
Code Issues Projects Releases Wiki Activity

Refactor permission checking

Browse Source
This commit is contained in:
filoghost 2020-06-13 19:42:03 +02:00
parent e9961833ae
commit da14e8bbc9
2 changed files with 83 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Plugin/src/main/java/me/filoghost/chestcommands/menu/AdvancedIcon.java
View File

@ -27,16 +27,13 @@ import me.filoghost.chestcommands.action.OpenMenuAction;
import me.filoghost.chestcommands.api.impl.ConfigurableIconImpl;
import me.filoghost.chestcommands.bridge.EconomyBridge;
import me.filoghost.chestcommands.util.MaterialsHelper;
import me.filoghost.chestcommands.util.StringUtils;
public class AdvancedIcon extends ConfigurableIconImpl {
private String permission;
private boolean permissionNegated;
private String permissionMessage;
private PermissionChecker clickPermissionChecker;
private String clickNoPermissionMessage;
private String viewPermission;
private boolean viewPermissionNegated;
private PermissionChecker viewPermissionChecker;
private double moneyPrice;
private int expLevelsPrice;
@ -44,67 +41,31 @@ public class AdvancedIcon extends ConfigurableIconImpl {
private List<Action> clickActions;
private boolean canClickIcon(Player player) {
if (permission == null) {
return true;
}
if (permissionNegated) {
return !player.hasPermission(permission);
} else {
return player.hasPermission(permission);
}
return clickPermissionChecker == null || clickPermissionChecker.hasPermission(player);
}
public boolean canViewIcon(Player player) {
return viewPermissionChecker == null || viewPermissionChecker.hasPermission(player);
}
public boolean hasViewPermission() {
return viewPermissionChecker != null && !viewPermissionChecker.isEmpty();
}
public void setPermission(String permission) {
if (StringUtils.isNullOrEmpty(permission)) {
permission = null;
}
if (permission != null) {
if (permission.startsWith("-")) {
permissionNegated = true;
permission = permission.substring(1, permission.length()).trim();
}
}
this.permission = permission;
clickPermissionChecker = new PermissionChecker(permission);
}
public String getPermissionMessage() {
return permissionMessage;
return clickNoPermissionMessage;
}
public void setPermissionMessage(String permissionMessage) {
this.permissionMessage = permissionMessage;
public void setPermissionMessage(String clickNoPermissionMessage) {
this.clickNoPermissionMessage = clickNoPermissionMessage;
}
public boolean hasViewPermission() {
return viewPermission != null;
}
public boolean canViewIcon(Player player) {
if (viewPermission == null) {
return true;
}
if (viewPermissionNegated) {
return !player.hasPermission(viewPermission);
} else {
return player.hasPermission(viewPermission);
}
}
public void setViewPermission(String viewPermission) {
if (StringUtils.isNullOrEmpty(viewPermission)) {
viewPermission = null;
}
if (viewPermission != null) {
if (viewPermission.startsWith("-")) {
viewPermissionNegated = true;
viewPermission = viewPermission.substring(1, viewPermission.length()).trim();
}
}
this.viewPermission = viewPermission;
viewPermissionChecker = new PermissionChecker(viewPermission);
}
public double getMoneyPrice() {
@ -145,8 +106,8 @@ public class AdvancedIcon extends ConfigurableIconImpl {
// Check all the requirements
if (!canClickIcon(player)) {
if (permissionMessage != null) {
player.sendMessage(permissionMessage);
if (clickNoPermissionMessage != null) {
player.sendMessage(clickNoPermissionMessage);
} else {
player.sendMessage(ChestCommands.getLang().default_no_icon_permission);
}

63
Plugin/src/main/java/me/filoghost/chestcommands/menu/PermissionChecker.java Normal file
View File

@ -0,0 +1,63 @@
/*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package me.filoghost.chestcommands.menu;
import org.bukkit.entity.Player;
import me.filoghost.chestcommands.util.StringUtils;
public class PermissionChecker {
private final String permission;
private final boolean negated;
public PermissionChecker(String permission) {
if (permission != null) {
permission = permission.trim();
}
if (StringUtils.isNullOrEmpty(permission)) {
this.permission = null;
negated = false;
} else {
if (permission.startsWith("-")) {
this.permission = permission.substring(1, permission.length());
negated = true;
} else {
this.permission = permission;
negated = false;
}
}
}
public boolean hasPermission(Player player) {
if (isEmpty()) {
return true;
}
if (negated) {
return !player.hasPermission(permission);
} else {
return player.hasPermission(permission);
}
}
public boolean isEmpty() {
return this.permission == null;
}
}