worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

constants do not need getters

Browse Source
This commit is contained in:
Luck
2017-01-12 21:14:27 +00:00
Unverified
parent 0fe251b6ec
commit 2b96b656a9
15 changed files with 74 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PermissionInfo extends SharedSubCommand {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, PermissionHolder holder, List<String> args, String label) throws CommandException {
if (sender.getUuid().equals(Constants.getConsoleUUID())) {
if (sender.getUuid().equals(Constants.CONSOLE_UUID)) {
Message.LISTNODES.send(sender, holder.getFriendlyName());
sender.sendMessage(Util.color(Util.permNodesToStringConsole(holder.getPermissions(false))));
} else {
common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java
+2 -2
View File
@@ -118,12 +118,12 @@ public class MigrationMainCommand extends MainCommand<Object> {
@Override
public boolean isAuthorized(Sender sender) {
return sender.getUuid().equals(Constants.getConsoleUUID());
return sender.getUuid().equals(Constants.CONSOLE_UUID);
}
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, Void v, List<String> args, String label) throws CommandException {
if (!sender.getUuid().equals(Constants.getConsoleUUID())) {
if (!sender.getUuid().equals(Constants.CONSOLE_UUID)) {
Message.MIGRATION_NOT_CONSOLE.send(sender);
return CommandResult.NO_PERMISSION;
}
common/src/main/java/me/lucko/luckperms/common/commands/misc/ExportCommand.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class ExportCommand extends SingleCommand {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, List<String> args, String label) {
final Logger log = plugin.getLog();
if (!sender.getUuid().equals(Constants.getConsoleUUID())) {
if (!sender.getUuid().equals(Constants.CONSOLE_UUID)) {
Message.MIGRATION_NOT_CONSOLE.send(sender);
return CommandResult.NO_PERMISSION;
}
@@ -224,7 +224,7 @@ public class ExportCommand extends SingleCommand {
@Override
public boolean isAuthorized(Sender sender) {
return sender.getUuid().equals(Constants.getConsoleUUID());
return sender.getUuid().equals(Constants.CONSOLE_UUID);
}
}
common/src/main/java/me/lucko/luckperms/common/commands/sender/AbstractSender.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class AbstractSender<T> implements Sender {
}
private boolean isConsole() {
return this.uuid.equals(Constants.getConsoleUUID()) || this.uuid.equals(Constants.getImporterUUID());
return this.uuid.equals(Constants.CONSOLE_UUID) || this.uuid.equals(Constants.IMPORT_UUID);
}
}
common/src/main/java/me/lucko/luckperms/common/constants/Constants.java
+5 -15
View File
@@ -22,7 +22,6 @@
package me.lucko.luckperms.common.constants;
import lombok.Getter;
import lombok.experimental.UtilityClass;
import java.util.UUID;
@@ -30,19 +29,10 @@ import java.util.UUID;
@UtilityClass
public class Constants {
@Getter
private static final UUID consoleUUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
@Getter
private static final String consoleName = "Console";
@Getter
private static final UUID importerUUID = UUID.fromString("11111111-1111-1111-1111-111111111111");
@Getter
private static final String importerName = "Import";
@Getter
private static final String logFormat = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
public static final UUID CONSOLE_UUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
public static final String CONSOLE_NAME = "Console";
public static final UUID IMPORT_UUID = UUID.fromString("11111111-1111-1111-1111-111111111111");
public static final String IMPORT_NAME = "Import";
public static final String LOG_FORMAT = "&8(&e%s&8) [&a%s&8] (&b%s&8) &7--> &f%s";
}
common/src/main/java/me/lucko/luckperms/common/data/Importer.java
+2 -2
View File
@@ -201,12 +201,12 @@ public class Importer {
@Override
public String getName() {
return Constants.getImporterName();
return Constants.IMPORT_NAME;
}
@Override
public UUID getUuid() {
return Constants.getImporterUUID();
return Constants.IMPORT_UUID;
}
@Override
common/src/main/java/me/lucko/luckperms/common/storage/backing/FlatfileBacking.java
+1 -1
View File
@@ -121,7 +121,7 @@ abstract class FlatfileBacking extends AbstractBacking {
@Override
public boolean logAction(LogEntry entry) {
actionLogger.info(String.format(LOG_FORMAT,
(entry.getActor().equals(Constants.getConsoleUUID()) ? "" : entry.getActor() + " "),
(entry.getActor().equals(Constants.CONSOLE_UUID) ? "" : entry.getActor() + " "),
entry.getActorName(),
Character.toString(entry.getType()),
(entry.getActed() == null ? "" : entry.getActed().toString() + " "),