API changes for 3.1

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>luckperms</artifactId>
         <groupId>me.lucko.luckperms</groupId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,6 +13,7 @@
     <packaging>jar</packaging>
 
     <build>
+        <finalName>LuckPerms-Common-${release.version}.${patch.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

common/src/main/java/me/lucko/luckperms/common/api/ApiProvider.java

@@ -79,7 +79,7 @@ public class ApiProvider implements LuckPermsApi {
 
     @Override
     public double getApiVersion() {
-        return 3.0;
+        return 3.1;
     }
 
     @Override

common/src/main/java/me/lucko/luckperms/common/api/delegates/LPConfigurationDelegate.java

@@ -36,105 +36,105 @@ import java.util.Map;
  */
 @AllArgsConstructor
 public class LPConfigurationDelegate implements LPConfiguration {
-    private final LuckPermsConfiguration master;
+    private final LuckPermsConfiguration handle;
 
     @Override
     public String getServer() {
-        return master.get(ConfigKeys.SERVER);
+        return handle.get(ConfigKeys.SERVER);
     }
 
     @Override
     public int getSyncTime() {
-        return master.get(ConfigKeys.SYNC_TIME);
+        return handle.get(ConfigKeys.SYNC_TIME);
     }
 
     @Override
     public boolean getIncludeGlobalPerms() {
-        return master.get(ConfigKeys.INCLUDING_GLOBAL_PERMS);
+        return handle.get(ConfigKeys.INCLUDING_GLOBAL_PERMS);
     }
 
     @Override
     public boolean getIncludeGlobalWorldPerms() {
-        return master.get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS);
+        return handle.get(ConfigKeys.INCLUDING_GLOBAL_WORLD_PERMS);
     }
 
     @Override
     public boolean getApplyGlobalGroups() {
-        return master.get(ConfigKeys.APPLYING_GLOBAL_GROUPS);
+        return handle.get(ConfigKeys.APPLYING_GLOBAL_GROUPS);
     }
 
     @Override
     public boolean getApplyGlobalWorldGroups() {
-        return master.get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS);
+        return handle.get(ConfigKeys.APPLYING_GLOBAL_WORLD_GROUPS);
     }
 
     @Override
     public boolean getOnlineMode() {
-        return master.get(ConfigKeys.USE_SERVER_UUIDS);
+        return handle.get(ConfigKeys.USE_SERVER_UUIDS);
     }
 
     @Override
     public boolean getApplyWildcards() {
-        return master.get(ConfigKeys.APPLYING_WILDCARDS);
+        return handle.get(ConfigKeys.APPLYING_WILDCARDS);
     }
 
     @Override
     public boolean getApplyRegex() {
-        return master.get(ConfigKeys.APPLYING_REGEX);
+        return handle.get(ConfigKeys.APPLYING_REGEX);
     }
 
     @Override
     public boolean getApplyShorthand() {
-        return master.get(ConfigKeys.APPLYING_SHORTHAND);
+        return handle.get(ConfigKeys.APPLYING_SHORTHAND);
     }
 
     @Override
     public boolean getLogNotify() {
-        return master.get(ConfigKeys.LOG_NOTIFY);
+        return handle.get(ConfigKeys.LOG_NOTIFY);
     }
 
     @Override
     public boolean getEnableOps() {
-        return master.get(ConfigKeys.OPS_ENABLED);
+        return handle.get(ConfigKeys.OPS_ENABLED);
     }
 
     @Override
     public boolean getCommandsAllowOp() {
-        return master.get(ConfigKeys.COMMANDS_ALLOW_OP);
+        return handle.get(ConfigKeys.COMMANDS_ALLOW_OP);
     }
 
     @Override
     public boolean getAutoOp() {
-        return master.get(ConfigKeys.AUTO_OP);
+        return handle.get(ConfigKeys.AUTO_OP);
     }
 
     @Override
     public String getVaultServer() {
-        return master.get(ConfigKeys.VAULT_SERVER);
+        return handle.get(ConfigKeys.VAULT_SERVER);
     }
 
     @Override
     public boolean getVaultIncludeGlobal() {
-        return master.get(ConfigKeys.VAULT_INCLUDING_GLOBAL);
+        return handle.get(ConfigKeys.VAULT_INCLUDING_GLOBAL);
     }
 
     @Override
     public DatastoreConfiguration getDatastoreConfig() {
-        return master.get(ConfigKeys.DATABASE_VALUES);
+        return handle.get(ConfigKeys.DATABASE_VALUES);
     }
 
     @Override
     public String getStorageMethod() {
-        return master.get(ConfigKeys.STORAGE_METHOD);
+        return handle.get(ConfigKeys.STORAGE_METHOD);
     }
 
     @Override
     public boolean getSplitStorage() {
-        return master.get(ConfigKeys.SPLIT_STORAGE);
+        return handle.get(ConfigKeys.SPLIT_STORAGE);
     }
 
     @Override
     public Map<String, String> getSplitStorageOptions() {
-        return master.get(ConfigKeys.SPLIT_STORAGE_OPTIONS);
+        return handle.get(ConfigKeys.SPLIT_STORAGE_OPTIONS);
     }
 }

common/src/main/java/me/lucko/luckperms/common/api/delegates/LogDelegate.java

@@ -39,100 +39,100 @@ import static me.lucko.luckperms.common.api.ApiUtils.checkName;
  */
 @AllArgsConstructor
 public class LogDelegate implements Log {
-    private final me.lucko.luckperms.common.data.Log master;
+    private final me.lucko.luckperms.common.data.Log handle;
 
     @Override
     public SortedSet<LogEntry> getContent() {
-        return master.getContent();
+        return handle.getContent();
     }
 
     @Override
     public SortedSet<LogEntry> getRecent() {
-        return master.getRecent();
+        return handle.getRecent();
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getRecent(int pageNo) {
-        return master.getRecent(pageNo);
+        return handle.getRecent(pageNo);
     }
 
     @Override
     public int getRecentMaxPages() {
-        return master.getRecentMaxPages();
+        return handle.getRecentMaxPages();
     }
 
     @Override
     public SortedSet<LogEntry> getRecent(@NonNull UUID actor) {
-        return master.getRecent(actor);
+        return handle.getRecent(actor);
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getRecent(int pageNo, @NonNull UUID actor) {
-        return master.getRecent(pageNo, actor);
+        return handle.getRecent(pageNo, actor);
     }
 
     @Override
     public int getRecentMaxPages(@NonNull UUID actor) {
-        return master.getRecentMaxPages(actor);
+        return handle.getRecentMaxPages(actor);
     }
 
     @Override
     public SortedSet<LogEntry> getUserHistory(@NonNull UUID uuid) {
-        return master.getUserHistory(uuid);
+        return handle.getUserHistory(uuid);
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getUserHistory(int pageNo, @NonNull UUID uuid) {
-        return master.getUserHistory(pageNo, uuid);
+        return handle.getUserHistory(pageNo, uuid);
     }
 
     @Override
     public int getUserHistoryMaxPages(@NonNull UUID uuid) {
-        return master.getUserHistoryMaxPages(uuid);
+        return handle.getUserHistoryMaxPages(uuid);
     }
 
     @Override
     public SortedSet<LogEntry> getGroupHistory(@NonNull String name) {
-        return master.getGroupHistory(checkName(name));
+        return handle.getGroupHistory(checkName(name));
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getGroupHistory(int pageNo, @NonNull String name) {
-        return master.getGroupHistory(pageNo, checkName(name));
+        return handle.getGroupHistory(pageNo, checkName(name));
     }
 
     @Override
     public int getGroupHistoryMaxPages(@NonNull String name) {
-        return master.getGroupHistoryMaxPages(checkName(name));
+        return handle.getGroupHistoryMaxPages(checkName(name));
     }
 
     @Override
     public SortedSet<LogEntry> getTrackHistory(@NonNull String name) {
-        return master.getTrackHistory(checkName(name));
+        return handle.getTrackHistory(checkName(name));
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getTrackHistory(int pageNo, @NonNull String name) {
-        return master.getTrackHistory(pageNo, checkName(name));
+        return handle.getTrackHistory(pageNo, checkName(name));
     }
 
     @Override
     public int getTrackHistoryMaxPages(@NonNull String name) {
-        return master.getTrackHistoryMaxPages(checkName(name));
+        return handle.getTrackHistoryMaxPages(checkName(name));
     }
 
     @Override
     public SortedSet<LogEntry> getSearch(@NonNull String query) {
-        return master.getSearch(query);
+        return handle.getSearch(query);
     }
 
     @Override
     public SortedMap<Integer, LogEntry> getSearch(int pageNo, @NonNull String query) {
-        return master.getSearch(pageNo, query);
+        return handle.getSearch(pageNo, query);
     }
 
     @Override
     public int getSearchMaxPages(@NonNull String query) {
-        return master.getSearchMaxPages(query);
+        return handle.getSearchMaxPages(query);
     }
 }

common/src/main/java/me/lucko/luckperms/common/api/delegates/NodeFactoryDelegate.java

@@ -24,6 +24,7 @@ package me.lucko.luckperms.common.api.delegates;
 
 import lombok.NonNull;
 
+import me.lucko.luckperms.api.Group;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.common.core.NodeFactory;
 
@@ -50,6 +51,11 @@ public class NodeFactoryDelegate implements me.lucko.luckperms.api.NodeFactory {
         return NodeFactory.builderFromSerializedNode(serialisedPermission, value);
     }
 
+    @Override
+    public Node.Builder makeGroupNode(Group group) {
+        return NodeFactory.newBuilder("group." + GroupDelegate.cast(group).getName());
+    }
+
     @Override
     public Node.Builder makeMetaNode(@NonNull String key, @NonNull String value) {
         return NodeFactory.makeMetaNode(key, value);

common/src/main/java/me/lucko/luckperms/common/api/delegates/PermissionHolderDelegate.java

@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 
 import me.lucko.luckperms.api.Contexts;
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.LocalizedNode;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.PermissionHolder;
@@ -53,201 +54,221 @@ import static me.lucko.luckperms.common.api.ApiUtils.checkTime;
  */
 @AllArgsConstructor
 public class PermissionHolderDelegate implements PermissionHolder {
-    private final me.lucko.luckperms.common.core.model.PermissionHolder master;
+    private final me.lucko.luckperms.common.core.model.PermissionHolder handle;
 
     @Override
     public String getObjectName() {
-        return master.getObjectName();
+        return handle.getObjectName();
     }
 
     @Override
     public SortedSet<? extends Node> getPermissions() {
-        return ImmutableSortedSet.copyOfSorted(master.mergePermissionsToSortedSet());
+        return ImmutableSortedSet.copyOfSorted(handle.mergePermissionsToSortedSet());
     }
 
     @Override
     public Set<Node> getEnduringPermissions() {
-        return ImmutableSet.copyOf(master.getNodes().values());
+        return ImmutableSet.copyOf(handle.getNodes().values());
     }
 
     @Override
     public Set<Node> getTransientPermissions() {
-        return ImmutableSet.copyOf(master.getTransientNodes().values());
+        return ImmutableSet.copyOf(handle.getTransientNodes().values());
     }
 
     @Override
     public SortedSet<LocalizedNode> getAllNodes(@NonNull Contexts contexts) {
-        return new TreeSet<>(master.resolveInheritancesAlmostEqual(ExtractedContexts.generate(contexts)));
+        return new TreeSet<>(handle.resolveInheritancesAlmostEqual(ExtractedContexts.generate(contexts)));
     }
 
     @Override
     public Set<LocalizedNode> getAllNodesFiltered(@NonNull Contexts contexts) {
-        return new HashSet<>(master.getAllNodes(ExtractedContexts.generate(contexts)));
+        return new HashSet<>(handle.getAllNodes(ExtractedContexts.generate(contexts)));
     }
 
     @Override
     public Map<String, Boolean> exportNodes(Contexts contexts, boolean lowerCase) {
-        return new HashMap<>(master.exportNodes(ExtractedContexts.generate(contexts), lowerCase));
+        return new HashMap<>(handle.exportNodes(ExtractedContexts.generate(contexts), lowerCase));
     }
 
     @Override
     public Tristate hasPermission(@NonNull Node node) {
-        return master.hasPermission(node, false);
+        return handle.hasPermission(node, false);
     }
 
     @Override
     public Tristate hasTransientPermission(@NonNull Node node) {
-        return master.hasPermission(node, true);
+        return handle.hasPermission(node, true);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b) {
-        return master.hasPermission(node, b);
+        return handle.hasPermission(node, b);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b, @NonNull String server) {
-        return master.hasPermission(node, b, server);
+        return handle.hasPermission(node, b, server);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull String world) {
-        return master.hasPermission(node, b, server, world);
+        return handle.hasPermission(node, b, server, world);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b, @NonNull boolean temporary) {
-        return master.hasPermission(node, b, temporary);
+        return handle.hasPermission(node, b, temporary);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull boolean temporary) {
-        return master.hasPermission(node, b, server, temporary);
+        return handle.hasPermission(node, b, server, temporary);
     }
 
     @Override
     public boolean hasPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull String world, @NonNull boolean temporary) {
-        return master.hasPermission(node, b, server, world, temporary);
+        return handle.hasPermission(node, b, server, world, temporary);
     }
 
     @Override
     public Tristate inheritsPermission(@NonNull Node node) {
-        return master.inheritsPermission(node);
+        return handle.inheritsPermission(node);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b) {
-        return master.inheritsPermission(node, b);
+        return handle.inheritsPermission(node, b);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b, @NonNull String server) {
-        return master.inheritsPermission(node, b, server);
+        return handle.inheritsPermission(node, b, server);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull String world) {
-        return master.inheritsPermission(node, b, server, world);
+        return handle.inheritsPermission(node, b, server, world);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b, @NonNull boolean temporary) {
-        return master.inheritsPermission(node, b, temporary);
+        return handle.inheritsPermission(node, b, temporary);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull boolean temporary) {
-        return master.inheritsPermission(node, b, server, temporary);
+        return handle.inheritsPermission(node, b, server, temporary);
     }
 
     @Override
     public boolean inheritsPermission(@NonNull String node, @NonNull boolean b, @NonNull String server, @NonNull String world, @NonNull boolean temporary) {
-        return master.inheritsPermission(node, b, server, world, temporary);
+        return handle.inheritsPermission(node, b, server, world, temporary);
     }
 
     @Override
     public void setPermission(@NonNull Node node) throws ObjectAlreadyHasException {
-        master.setPermission(node).throwException();
+        handle.setPermission(node).throwException();
+    }
+
+    @Override
+    public DataMutateResult setPermissionUnchecked(Node node) {
+        return handle.setPermission(node);
     }
 
     @Override
     public void setTransientPermission(@NonNull Node node) throws ObjectAlreadyHasException {
-        master.setTransientPermission(node).throwException();
+        handle.setTransientPermission(node).throwException();
+    }
+
+    @Override
+    public DataMutateResult setTransientPermissionUnchecked(Node node) {
+        return handle.setTransientPermission(node);
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value)).throwException();
+        handle.setPermission(NodeFactory.make(node, value)).throwException();
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value, @NonNull String server) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value, server)).throwException();
+        handle.setPermission(NodeFactory.make(node, value, server)).throwException();
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value, @NonNull String server, @NonNull String world) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value, server, world)).throwException();
+        handle.setPermission(NodeFactory.make(node, value, server, world)).throwException();
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value, @NonNull long expireAt) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value, checkTime(expireAt))).throwException();
+        handle.setPermission(NodeFactory.make(node, value, checkTime(expireAt))).throwException();
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value, @NonNull String server, @NonNull long expireAt) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value, server, checkTime(expireAt))).throwException();
+        handle.setPermission(NodeFactory.make(node, value, server, checkTime(expireAt))).throwException();
     }
 
     @Override
     public void setPermission(@NonNull String node, @NonNull boolean value, @NonNull String server, @NonNull String world, @NonNull long expireAt) throws ObjectAlreadyHasException {
-        master.setPermission(NodeFactory.make(node, value, server, world, checkTime(expireAt))).throwException();
+        handle.setPermission(NodeFactory.make(node, value, server, world, checkTime(expireAt))).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull Node node) throws ObjectLacksException {
-        master.unsetPermission(node).throwException();
+        handle.unsetPermission(node).throwException();
+    }
+
+    @Override
+    public DataMutateResult unsetPermissionUnchecked(Node node) {
+        return handle.unsetPermission(node);
     }
 
     @Override
     public void unsetTransientPermission(@NonNull Node node) throws ObjectLacksException {
-        master.unsetTransientPermission(node).throwException();
+        handle.unsetTransientPermission(node).throwException();
+    }
+
+    @Override
+    public DataMutateResult unsetTransientPermissionUnchecked(Node node) {
+        return handle.unsetTransientPermission(node);
     }
 
     @Override
     public void unsetPermission(@NonNull String node, @NonNull boolean temporary) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node, temporary)).throwException();
+        handle.unsetPermission(NodeFactory.make(node, temporary)).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull String node) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node)).throwException();
+        handle.unsetPermission(NodeFactory.make(node)).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull String node, @NonNull String server) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node, server)).throwException();
+        handle.unsetPermission(NodeFactory.make(node, server)).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull String node, @NonNull String server, @NonNull String world) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node, server, world)).throwException();
+        handle.unsetPermission(NodeFactory.make(node, server, world)).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull String node, @NonNull String server, @NonNull boolean temporary) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node, server, temporary)).throwException();
+        handle.unsetPermission(NodeFactory.make(node, server, temporary)).throwException();
     }
 
     @Override
     public void unsetPermission(@NonNull String node, @NonNull String server, @NonNull String world, @NonNull boolean temporary) throws ObjectLacksException {
-        master.unsetPermission(NodeFactory.make(node, server, world, temporary)).throwException();
+        handle.unsetPermission(NodeFactory.make(node, server, world, temporary)).throwException();
     }
 
     @Override
     public void clearNodes() {
-        master.clearNodes();
+        handle.clearNodes();
     }
 
     @Override
@@ -257,7 +278,7 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("server", server);
         }
 
-        master.clearNodes(set);
+        handle.clearNodes(set);
     }
 
     @Override
@@ -270,12 +291,12 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("world", world);
         }
 
-        master.clearNodes(set);
+        handle.clearNodes(set);
     }
 
     @Override
     public void clearParents() {
-        master.clearParents(true);
+        handle.clearParents(true);
     }
 
     @Override
@@ -285,7 +306,7 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("server", server);
         }
 
-        master.clearParents(set, true);
+        handle.clearParents(set, true);
     }
 
     @Override
@@ -298,12 +319,12 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("world", world);
         }
 
-        master.clearParents(set, true);
+        handle.clearParents(set, true);
     }
 
     @Override
     public void clearMeta() {
-        master.clearMeta();
+        handle.clearMeta();
     }
 
     @Override
@@ -313,7 +334,7 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("server", server);
         }
 
-        master.clearMeta(set);
+        handle.clearMeta(set);
     }
 
     @Override
@@ -326,7 +347,7 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("world", world);
         }
 
-        master.clearMeta(set);
+        handle.clearMeta(set);
     }
 
     @Override
@@ -339,27 +360,27 @@ public class PermissionHolderDelegate implements PermissionHolder {
             set.add("world", world);
         }
 
-        master.clearMetaKeys(key, set, temporary);
+        handle.clearMetaKeys(key, set, temporary);
     }
 
     @Override
     public void clearTransientNodes() {
-        master.clearTransientNodes();
+        handle.clearTransientNodes();
     }
 
     @Override
     public Set<Node> getTemporaryPermissionNodes() {
-        return master.getTemporaryNodes();
+        return handle.getTemporaryNodes();
     }
 
     @Override
     public Set<Node> getPermanentPermissionNodes() {
-        return master.getPermanentNodes();
+        return handle.getPermanentNodes();
     }
 
     @Override
     public void auditTemporaryPermissions() {
-        master.auditTemporaryPermissions();
+        handle.auditTemporaryPermissions();
     }
 
 }

common/src/main/java/me/lucko/luckperms/common/api/delegates/StorageDelegate.java

@@ -52,16 +52,16 @@ import static me.lucko.luckperms.common.api.ApiUtils.checkUsername;
 @AllArgsConstructor
 public class StorageDelegate implements Storage {
     private final LuckPermsPlugin plugin;
-    private final me.lucko.luckperms.common.storage.Storage master;
+    private final me.lucko.luckperms.common.storage.Storage handle;
 
     @Override
     public String getName() {
-        return master.getName();
+        return handle.getName();
     }
 
     @Override
     public boolean isAcceptingLogins() {
-        return master.isAcceptingLogins();
+        return handle.isAcceptingLogins();
     }
 
     @Override
@@ -76,57 +76,57 @@ public class StorageDelegate implements Storage {
 
     @Override
     public CompletableFuture<Boolean> logAction(@NonNull LogEntry entry) {
-        return master.force().logAction(entry);
+        return handle.force().logAction(entry);
     }
 
     @Override
     public CompletableFuture<Log> getLog() {
-        return master.force().getLog().thenApply(log -> log == null ? null : new LogDelegate(log));
+        return handle.force().getLog().thenApply(log -> log == null ? null : new LogDelegate(log));
     }
 
     @Override
     public CompletableFuture<Boolean> loadUser(UUID uuid, String username) {
-        return master.force().loadUser(uuid, checkUsername(username));
+        return handle.force().loadUser(uuid, checkUsername(username));
     }
 
     @Override
     public CompletableFuture<Boolean> saveUser(User user) {
-        return master.force().saveUser(UserDelegate.cast(user));
+        return handle.force().saveUser(UserDelegate.cast(user));
     }
 
     @Override
     public CompletableFuture<Boolean> cleanupUsers() {
-        return master.force().cleanupUsers();
+        return handle.force().cleanupUsers();
     }
 
     @Override
     public CompletableFuture<Set<UUID>> getUniqueUsers() {
-        return master.force().getUniqueUsers();
+        return handle.force().getUniqueUsers();
     }
 
     @Override
     public CompletableFuture<List<HeldPermission<UUID>>> getUsersWithPermission(@NonNull String permission) {
-        return master.force().getUsersWithPermission(permission);
+        return handle.force().getUsersWithPermission(permission);
     }
 
     @Override
     public CompletableFuture<Boolean> createAndLoadGroup(String name) {
-        return master.force().createAndLoadGroup(checkName(name), CreationCause.API);
+        return handle.force().createAndLoadGroup(checkName(name), CreationCause.API);
     }
 
     @Override
     public CompletableFuture<Boolean> loadGroup(String name) {
-        return master.force().loadGroup(checkName(name));
+        return handle.force().loadGroup(checkName(name));
     }
 
     @Override
     public CompletableFuture<Boolean> loadAllGroups() {
-        return master.force().loadAllGroups();
+        return handle.force().loadAllGroups();
     }
 
     @Override
     public CompletableFuture<Boolean> saveGroup(Group group) {
-        return master.force().saveGroup(GroupDelegate.cast(group));
+        return handle.force().saveGroup(GroupDelegate.cast(group));
     }
 
     @Override
@@ -134,51 +134,51 @@ public class StorageDelegate implements Storage {
         if (group.getName().equalsIgnoreCase(plugin.getConfiguration().get(ConfigKeys.DEFAULT_GROUP_NAME))) {
             throw new IllegalArgumentException("Cannot delete the default group.");
         }
-        return master.force().deleteGroup(GroupDelegate.cast(group), DeletionCause.API);
+        return handle.force().deleteGroup(GroupDelegate.cast(group), DeletionCause.API);
     }
 
     @Override
     public CompletableFuture<List<HeldPermission<String>>> getGroupsWithPermission(@NonNull String permission) {
-        return master.force().getGroupsWithPermission(permission);
+        return handle.force().getGroupsWithPermission(permission);
     }
 
     @Override
     public CompletableFuture<Boolean> createAndLoadTrack(String name) {
-        return master.force().createAndLoadTrack(checkName(name), CreationCause.API);
+        return handle.force().createAndLoadTrack(checkName(name), CreationCause.API);
     }
 
     @Override
     public CompletableFuture<Boolean> loadTrack(String name) {
-        return master.force().loadTrack(checkName(name));
+        return handle.force().loadTrack(checkName(name));
     }
 
     @Override
     public CompletableFuture<Boolean> loadAllTracks() {
-        return master.force().loadAllTracks();
+        return handle.force().loadAllTracks();
     }
 
     @Override
     public CompletableFuture<Boolean> saveTrack(Track track) {
-        return master.force().saveTrack(TrackDelegate.cast(track));
+        return handle.force().saveTrack(TrackDelegate.cast(track));
     }
 
     @Override
     public CompletableFuture<Boolean> deleteTrack(Track track) {
-        return master.force().deleteTrack(TrackDelegate.cast(track), DeletionCause.API);
+        return handle.force().deleteTrack(TrackDelegate.cast(track), DeletionCause.API);
     }
 
     @Override
     public CompletableFuture<Boolean> saveUUIDData(String username, UUID uuid) {
-        return master.force().saveUUIDData(checkUsername(username), uuid);
+        return handle.force().saveUUIDData(checkUsername(username), uuid);
     }
 
     @Override
     public CompletableFuture<UUID> getUUID(String username) {
-        return master.force().getUUID(checkUsername(username));
+        return handle.force().getUUID(checkUsername(username));
     }
 
     @Override
     public CompletableFuture<String> getName(@NonNull UUID uuid) {
-        return master.force().getName(uuid);
+        return handle.force().getName(uuid);
     }
 }

common/src/main/java/me/lucko/luckperms/common/api/delegates/UuidCacheDelegate.java

@@ -34,15 +34,15 @@ import java.util.UUID;
  */
 @AllArgsConstructor
 public class UuidCacheDelegate implements UuidCache {
-    private final me.lucko.luckperms.common.core.UuidCache master;
+    private final me.lucko.luckperms.common.core.UuidCache handle;
 
     @Override
     public UUID getUUID(@NonNull UUID external) {
-        return master.getUUID(external);
+        return handle.getUUID(external);
     }
 
     @Override
     public UUID getExternalUUID(@NonNull UUID internal) {
-        return master.getExternalUUID(internal);
+        return handle.getExternalUUID(internal);
     }
 }

common/src/main/java/me/lucko/luckperms/common/caching/MetaAccumulator.java

@@ -28,7 +28,6 @@ import lombok.ToString;
 
 import me.lucko.luckperms.api.LocalizedNode;
 import me.lucko.luckperms.common.caching.stacking.MetaStack;
-import me.lucko.luckperms.common.caching.stacking.NoopMetaStack;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -60,10 +59,6 @@ public class MetaAccumulator {
         this.suffixStack = suffixStack;
     }
 
-    public MetaAccumulator() {
-        this(NoopMetaStack.INSTANCE, NoopMetaStack.INSTANCE);
-    }
-
     public void accumulateNode(LocalizedNode n) {
         if (n.isMeta()) {
             Map.Entry<String, String> entry = n.getMeta();

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaAddChatMeta.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.meta;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaAddTempChatMeta.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.meta;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
@@ -34,7 +35,6 @@ import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.TemporaryModifier;
 import me.lucko.luckperms.common.core.model.PermissionHolder;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaRemoveChatMeta.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.meta;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/meta/MetaRemoveTempChatMeta.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.meta;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentAdd.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.parent;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.model.Group;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentAddTemp.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.parent;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
@@ -34,7 +35,6 @@ import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.TemporaryModifier;
 import me.lucko.luckperms.common.core.model.Group;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentRemove.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.parent;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -33,7 +34,6 @@ import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.core.model.User;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/parent/ParentRemoveTemp.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.parent;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionSet.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.permission;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionSetTemp.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.permission;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
@@ -34,7 +35,6 @@ import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.TemporaryModifier;
 import me.lucko.luckperms.common.core.model.PermissionHolder;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionUnset.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.permission;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/commands/impl/generic/permission/PermissionUnsetTemp.java

@@ -22,6 +22,7 @@
 
 package me.lucko.luckperms.common.commands.impl.generic.permission;
 
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.context.MutableContextSet;
 import me.lucko.luckperms.common.commands.Arg;
 import me.lucko.luckperms.common.commands.CommandException;
@@ -32,7 +33,6 @@ import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
 import me.lucko.luckperms.common.commands.utils.Util;
 import me.lucko.luckperms.common.constants.Message;
 import me.lucko.luckperms.common.constants.Permission;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.NodeFactory;
 import me.lucko.luckperms.common.core.model.PermissionHolder;
 import me.lucko.luckperms.common.data.LogEntry;

common/src/main/java/me/lucko/luckperms/common/core/DataMutateResult.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2016 Lucko (Luck) <luck@lucko.me>
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-package me.lucko.luckperms.common.core;
-
-import lombok.AllArgsConstructor;
-
-import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
-import me.lucko.luckperms.exceptions.ObjectLacksException;
-
-import java.util.function.Supplier;
-
-@AllArgsConstructor
-public enum DataMutateResult {
-
-    SUCCESS(true, null),
-    ALREADY_HAS(false, ObjectAlreadyHasException::new),
-    LACKS(false, ObjectLacksException::new),
-    FAIL(false, RuntimeException::new);
-
-    private boolean bool;
-    private final Supplier<? extends Exception> exceptionSupplier;
-
-    public void throwException() {
-        if (exceptionSupplier != null) {
-            sneakyThrow(exceptionSupplier.get());
-        }
-    }
-
-    public boolean asBoolean() {
-        return bool;
-    }
-
-    // allows us to throw checked exceptions without declaring it, as #throwException throws a number of
-    // exception types.
-    private static void sneakyThrow(Throwable t) {
-        sneakyThrow0(t);
-    }
-
-    private static <T extends Throwable> void sneakyThrow0(Throwable t) throws T {
-        throw (T) t;
-    }
-
-}

common/src/main/java/me/lucko/luckperms/common/core/model/PermissionHolder.java

@@ -35,6 +35,7 @@ import com.google.common.collect.MultimapBuilder;
 import com.google.common.collect.SortedSetMultimap;
 
 import me.lucko.luckperms.api.Contexts;
+import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.LocalizedNode;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.Tristate;
@@ -46,7 +47,6 @@ import me.lucko.luckperms.common.caching.handlers.GroupReference;
 import me.lucko.luckperms.common.caching.handlers.HolderReference;
 import me.lucko.luckperms.common.config.ConfigKeys;
 import me.lucko.luckperms.common.core.ContextSetComparator;
-import me.lucko.luckperms.common.core.DataMutateResult;
 import me.lucko.luckperms.common.core.InheritanceInfo;
 import me.lucko.luckperms.common.core.NodeComparator;
 import me.lucko.luckperms.common.core.NodeFactory;