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

Implement default contexts - closes #241

Browse Source
This commit is contained in:
Luck
2017-05-09 13:36:43 +01:00
Unverified
parent e835b31277
commit 1fee47e087
41 changed files with 139 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class OptionClear extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
subjectData.clearOptions();
Util.sendPluginMessage(sender, "&aCleared options matching contexts &bANY&a.");
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class OptionInfo extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
Util.sendPluginMessage(sender, "&aShowing options matching contexts &bANY&a.");
Map<ImmutableContextSet, ImmutableMap<String, String>> options = subjectData.getAllOptions();
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class OptionSet extends SubCommand<LPSubjectData> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
String key = args.get(0);
String value = args.get(1);
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(2, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(2, args);
if (subjectData.setOption(contextSet, key, value).join()) {
Util.sendPluginMessage(sender, "&aSet &f\"" + key + "&f\"&a to &f\"" + value + "&f\"&a in context " + SpongeUtils.contextToString(contextSet));
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class OptionUnset extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
String key = args.get(0);
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(1, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(1, args);
if (subjectData.unsetOption(contextSet, key).join()) {
Util.sendPluginMessage(sender, "&aUnset &f\"" + key + "&f\"&a in context " + SpongeUtils.contextToString(contextSet));
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class ParentAdd extends SubCommand<LPSubjectData> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
String collection = args.get(0);
String name = args.get(1);
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(2, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(2, args);
LuckPermsService service = Sponge.getServiceManager().provideUnchecked(LuckPermsService.class);
if (service.getLoadedCollections().keySet().stream().map(String::toLowerCase).noneMatch(s -> s.equalsIgnoreCase(collection))) {
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class ParentClear extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
subjectData.clearParents();
Util.sendPluginMessage(sender, "&aCleared parents matching contexts &bANY&a.");
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ParentInfo extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
Util.sendPluginMessage(sender, "&aShowing parents matching contexts &bANY&a.");
Map<ImmutableContextSet, ImmutableList<SubjectReference>> parents = subjectData.getAllParents();
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class ParentRemove extends SubCommand<LPSubjectData> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
String collection = args.get(0);
String name = args.get(1);
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(2, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(2, args);
LuckPermsService service = Sponge.getServiceManager().provideUnchecked(LuckPermsService.class);
if (service.getLoadedCollections().keySet().stream().map(String::toLowerCase).noneMatch(s -> s.equalsIgnoreCase(collection))) {
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class PermissionClear extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
subjectData.clearPermissions();
Util.sendPluginMessage(sender, "&aCleared permissions matching contexts &bANY&a.");
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PermissionInfo extends SubCommand<LPSubjectData> {
@Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(0, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(0, args);
if (contextSet.isEmpty()) {
Util.sendPluginMessage(sender, "&aShowing permissions matching contexts &bANY&a.");
Map<ImmutableContextSet, ImmutableMap<String, Boolean>> permissions = subjectData.getAllPermissions();
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PermissionSet extends SubCommand<LPSubjectData> {
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, LPSubjectData subjectData, List<String> args, String label) throws CommandException {
String node = args.get(0);
Tristate tristate = SpongeUtils.parseTristate(1, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContexts(2, args);
ImmutableContextSet contextSet = ArgumentUtils.handleContextSponge(2, args);
if (subjectData.setPermission(contextSet, node, tristate).join()) {
Util.sendPluginMessage(sender, "&aSet &b" + node + "&a to &b" + tristate.toString().toLowerCase() + "&a in context " + SpongeUtils.contextToString(contextSet));