EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Generify permissions thru Permission class

Browse Source 
- Fixed a few improper permissions
- Fixed a couple of typos
This commit is contained in:
N0tMyFaultOG
2020-11-02 00:55:58 +01:00
parent bc32581cbd
commit aefa629509
15 changed files with 120 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/main/java/com/plotsquared/core/command/Alias.java
View File

@ -95,7 +95,7 @@ public class Alias extends SubCommand {
return true;
} else {
player.sendMessage(TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.alias.set"));
Template.of("node", Permission.PERMISSION_ALIAS_SET));
}
break;
@ -110,7 +110,7 @@ public class Alias extends SubCommand {
result = removeAlias(player, plot);
} else {
player.sendMessage(TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.alias.remove"));
Template.of("node", Permission.PERMISSION_ALIAS_REMOVE));
}
break;
default:
@ -172,7 +172,7 @@ public class Alias extends SubCommand {
private boolean removeAlias(PlotPlayer<?> player, Plot plot) {
plot.setAlias(null);
player.sendMessage(TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.alias.remove"));
Template.of("node", Permission.PERMISSION_ALIAS_REMOVE));
return true;
}

25
Core/src/main/java/com/plotsquared/core/command/Area.java
View File

@ -40,6 +40,7 @@ import com.plotsquared.core.inject.annotations.WorldConfig;
import com.plotsquared.core.inject.annotations.WorldFile;
import com.plotsquared.core.inject.factory.HybridPlotWorldFactory;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.ConsolePlayer;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.PlotArea;
@ -136,8 +137,8 @@ public class Area extends SubCommand {
player.sendMessage(RequiredType.CONSOLE.getErrorMessage());
return false;
}
if (!Permissions.hasPermission(player, "plots.area.create")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.create"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_CREATE));
return false;
}
if (args.length < 2) {
@ -258,8 +259,8 @@ public class Area extends SubCommand {
case "c":
case "setup":
case "create":
if (!Permissions.hasPermission(player, "plots.area.create")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.create"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_CREATE)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_CREATE));
return false;
}
switch (args.length) {
@ -491,8 +492,8 @@ public class Area extends SubCommand {
return true;
case "i":
case "info": {
if (!Permissions.hasPermission(player, "plots.area.info")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.info"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_INFO)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_INFO));
return false;
}
PlotArea area;
@ -550,8 +551,8 @@ public class Area extends SubCommand {
}
case "l":
case "list":
if (!Permissions.hasPermission(player, "plots.area.list")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.list"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_LIST)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_LIST));
return false;
}
int page;
@ -615,8 +616,8 @@ public class Area extends SubCommand {
case "clear":
case "reset":
case "regenerate": {
if (!Permissions.hasPermission(player, "plots.area.regen")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.regen"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_REGEN)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_REGEN));
return false;
}
final PlotArea area = player.getApplicablePlotArea();
@ -640,8 +641,8 @@ public class Area extends SubCommand {
case "teleport":
case "visit":
case "tp":
if (!Permissions.hasPermission(player, "plots.area.tp")) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", "plots.area.tp"));
if (!Permissions.hasPermission(player, Permission.PERMISSION_AREA_TP)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"), Template.of("node", Permission.PERMISSION_AREA_TP));
return false;
}
if (args.length != 2) {

4
Core/src/main/java/com/plotsquared/core/command/Auto.java
View File

@ -236,9 +236,9 @@ public class Auto extends SubCommand {
size_x = event.getSize_x();
size_z = event.getSize_z();
schematic = event.getSchematic();
if (!force && mega && !Permissions.hasPermission(player, "plots.auto.mega")) {
if (!force && mega && !Permissions.hasPermission(player, Permission.PERMISSION_AUTO_MEGA)) {
player.sendMessage(TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.auto.mega"));
Template.of("node", Permission.PERMISSION_AUTO_MEGA));
}
if (!force && size_x * size_z > Settings.Claim.MAX_AUTO_AREA) {
player.sendMessage(TranslatableCaption.of("permission.cant_claim_more_plots_num"),

13
Core/src/main/java/com/plotsquared/core/command/Backup.java
View File

@ -31,6 +31,7 @@ import com.plotsquared.core.backup.BackupProfile;
import com.plotsquared.core.backup.NullBackupProfile;
import com.plotsquared.core.backup.PlayerBackupProfile;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.util.Permissions;
@ -142,10 +143,10 @@ public final class Backup extends Command {
Template.of("plot", "generic.generic_merged")
);
} else if (!plot.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, "plots.admin.backup.other")) {
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.admin.backup.other")
Template.of("node", Permission.PERMISSION_ADMIN_BACKUP_OTHER)
);
} else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
@ -192,10 +193,10 @@ public final class Backup extends Command {
Template.of("plot", "generic.generic_merged")
);
} else if (!plot.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, "plots.admin.backup.other")) {
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.admin.backup.other")
Template.of("node", Permission.PERMISSION_ADMIN_BACKUP_OTHER)
);
} else {
final BackupProfile backupProfile = Objects.requireNonNull(this.backupManager.getProfile(plot));
@ -262,10 +263,10 @@ public final class Backup extends Command {
Template.of("plot", "generic.generic_merged")
);
} else if (!plot.isOwner(player.getUUID()) && !Permissions
.hasPermission(player, "plots.admin.backup.other")) {
.hasPermission(player, Permission.PERMISSION_ADMIN_BACKUP_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.admin.backup.other")
Template.of("node", Permission.PERMISSION_ADMIN_BACKUP_OTHER)
);
} else if (args.length == 0) {
player.sendMessage(

5
Core/src/main/java/com/plotsquared/core/command/Caps.java
View File

@ -26,6 +26,7 @@
package com.plotsquared.core.command;
import com.plotsquared.core.configuration.caption.TranslatableCaption;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.flag.PlotFlag;
@ -57,10 +58,10 @@ public class Caps extends SubCommand {
return false;
}
if (!plot.isAdded(player.getUUID()) && !Permissions
.hasPermission(player, "plots.admin.caps.other")) {
.hasPermission(player, Permission.PERMISSION_ADMIN_CAPS_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.admin.caps.other"));
Template.of("node", Permission.PERMISSION_ADMIN_CAPS_OTHER));
return false;
}
player.sendMessage(TranslatableCaption.of("info.plot_caps_header"));

28
Core/src/main/java/com/plotsquared/core/command/Cluster.java
View File

@ -68,10 +68,10 @@ public class Cluster extends SubCommand {
switch (sub) {
case "l":
case "list": {
if (!Permissions.hasPermission(player, "plots.cluster.list")) {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_LIST)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.list")
Template.of("node", Permission.PERMISSION_CLUSTER_LIST)
);
return false;
}
@ -121,10 +121,10 @@ public class Cluster extends SubCommand {
}
case "c":
case "create": {
if (!Permissions.hasPermission(player, "plots.cluster.create")) {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.create")
Template.of("node", Permission.PERMISSION_CLUSTER_CREATE)
);
return false;
}
@ -187,13 +187,13 @@ public class Cluster extends SubCommand {
Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2);
if (!plots.isEmpty()) {
if (!Permissions
.hasPermission(player, "plots.cluster.create.other")) {
.hasPermission(player, Permission.PERMISSION_CLUSTER_CREATE_OTHER)) {
UUID uuid = player.getUUID();
for (Plot plot : plots) {
if (!plot.isOwner(uuid)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.create.other")
Template.of("node", Permission.PERMISSION_CLUSTER_CREATE_OTHER)
);
return false;
}
@ -240,7 +240,7 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.delete")
Template.of("node", Permission.PERMISSION_CLUSTER_DELETE)
);
return false;
}
@ -278,7 +278,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_DELETE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.delete.other"));
Template.of("node", Permission.PERMISSION_CLUSTER_DELETE_OTHER));
return false;
}
}
@ -291,7 +291,7 @@ public class Cluster extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.resize"));
Template.of("node", Permission.PERMISSION_CLUSTER_RESIZE));
return false;
}
if (args.length != 3) {
@ -331,7 +331,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.resize.other"));
Template.of("node", Permission.PERMISSION_CLUSTER_RESIZE_OTHER));
return false;
}
}
@ -356,7 +356,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.resize.shrink")
Template.of("node", Permission.PERMISSION_CLUSTER_RESIZE_SHRINK)
);
return false;
}
@ -367,7 +367,7 @@ public class Cluster extends SubCommand {
.hasPermission(player, Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.resize.expand")
Template.of("node", Permission.PERMISSION_CLUSTER_RESIZE_EXPAND)
);
return false;
}
@ -397,10 +397,10 @@ public class Cluster extends SubCommand {
case "add":
case "inv":
case "invite": {
if (!Permissions.hasPermission(player, "plots.cluster.invite")) {
if (!Permissions.hasPermission(player, Permission.PERMISSION_CLUSTER_INVITE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.cluster.invite")
Template.of("node", Permission.PERMISSION_CLUSTER_INVITE)
);
return false;
}

2
Core/src/main/java/com/plotsquared/core/command/FlagCommand.java
View File

@ -163,7 +163,7 @@ public final class FlagCommand extends Command {
.hasPermission(player, Permission.PERMISSION_SET_FLAG_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.set.flag.other")
Template.of("node", Permission.PERMISSION_SET_FLAG_OTHER)
);
return false;
}

2
Core/src/main/java/com/plotsquared/core/command/Info.java
View File

@ -101,7 +101,7 @@ public class Info extends SubCommand {
.hasPermission(Permission.PERMISSION_AREA_INFO_FORCE.toString())) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.area.info.force")
Template.of("node", Permission.PERMISSION_AREA_INFO_FORCE.toString())
);
return true;
}

6
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@ -176,7 +176,7 @@ public class Merge extends SubCommand {
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.merge.keeproad")
Template.of("node", Permission.PERMISSION_MERGE_KEEP_ROAD)
);
return true;
}
@ -220,7 +220,7 @@ public class Merge extends SubCommand {
.hasPermission(player, Permission.PERMISSION_MERGE_KEEP_ROAD)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.merge.keeproad")
Template.of("node", Permission.PERMISSION_MERGE_KEEP_ROAD)
);
return true;
}
@ -244,7 +244,7 @@ public class Merge extends SubCommand {
if (!force && !Permissions.hasPermission(player, Permission.PERMISSION_MERGE_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.merge.other")
Template.of("node", Permission.PERMISSION_MERGE_OTHER)
);
return false;
}

5
Core/src/main/java/com/plotsquared/core/command/Music.java
View File

@ -31,6 +31,7 @@ import com.plotsquared.core.events.PlotFlagAddEvent;
import com.plotsquared.core.events.PlotFlagRemoveEvent;
import com.plotsquared.core.events.Result;
import com.plotsquared.core.location.Location;
import com.plotsquared.core.permissions.Permission;
import com.plotsquared.core.player.PlotPlayer;
import com.plotsquared.core.plot.Plot;
import com.plotsquared.core.plot.PlotInventory;
@ -73,10 +74,10 @@ public class Music extends SubCommand {
return false;
}
if (!plot.isAdded(player.getUUID()) && !Permissions
.hasPermission(player, "plots.admin.music.other")) {
.hasPermission(player, Permission.PERMISSION_ADMIN_MUSIC_OTHER)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.admin.music.other"));
Template.of("node", Permission.PERMISSION_ADMIN_MUSIC_OTHER));
return true;
}
PlotInventory inv = new PlotInventory(this.inventoryUtil, player, 2, "Plot Jukebox") {

6
Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java
View File

@ -81,7 +81,7 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_PASTE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.schematic.paste")
Template.of("node", Permission.PERMISSION_SCHEMATIC_PASTE)
);
return false;
}
@ -212,7 +212,7 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_SAVE)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.schematic.save")
Template.of("node", Permission.PERMISSION_SCHEMATIC_SAVE)
);
return false;
}
@ -251,7 +251,7 @@ public class SchematicCmd extends SubCommand {
if (!Permissions.hasPermission(player, Permission.PERMISSION_SCHEMATIC_LIST)) {
player.sendMessage(
TranslatableCaption.of("permission.no_permission"),
Template.of("node", "plots.schematic.list")
Template.of("node", Permission.PERMISSION_SCHEMATIC_LIST)
);
return false;
}

6
Core/src/main/java/com/plotsquared/core/permissions/Permission.java
View File

@ -58,7 +58,13 @@ public enum Permission {
PERMISSION_ADMIN_DESTROY_GROUNDLEVEL("plots.admin.destroy.groundlevel"),
PERMISSION_ADMIN_DESTROY_OTHER("plots.admin.destroy.other"),
PERMISSION_ADMIN_DESTROY_ROAD("plots.admin.destroy.road"),
PERMISSION_ADMIN_DESTROY_VEHICLE_ROAD("plots.admin.vehicle.break.road"),
PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),
PERMISSION_ADMIN_PROJECTILE_UNOWNED("plots.admin.projectile.unowned"),
PERMISSION_ADMIN_PROJECTILE_OTHER("plots.admin.projectile.other"),
PERMISSION_ADMIN_BUILD_UNOWNED("plots.admin.build.unowned"),
PERMISSION_ADMIN_BUILD_OTHER("plots.admin.build.other"),
PERMISSION_ADMIN_INTERACT_ROAD("plots.admin.interact.road"),