Release 1.6

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

@@ -27,7 +27,6 @@ import lombok.AllArgsConstructor;
 import lombok.NonNull;
 import me.lucko.luckperms.LuckPermsPlugin;
 import me.lucko.luckperms.api.*;
-import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.event.LPEvent;
 import me.lucko.luckperms.api.event.LPListener;
 import me.lucko.luckperms.api.implementation.internal.*;
@@ -77,12 +76,12 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public void registerListener(LPListener listener) {
+    public void registerListener(@NonNull LPListener listener) {
         eventBus.register(listener);
     }
 
     @Override
-    public void unregisterListener(LPListener listener) {
+    public void unregisterListener(@NonNull LPListener listener) {
         eventBus.unregister(listener);
     }
 
@@ -117,7 +116,7 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public Optional<User> getUserSafe(UUID uuid) {
+    public Optional<User> getUserSafe(@NonNull UUID uuid) {
         return Optional.ofNullable(getUser(uuid));
     }
 
@@ -132,7 +131,7 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public Optional<User> getUserSafe(String name) {
+    public Optional<User> getUserSafe(@NonNull String name) {
         return Optional.ofNullable(getUser(name));
     }
 
@@ -146,6 +145,12 @@ public class ApiProvider implements LuckPermsApi {
         return plugin.getUserManager().isLoaded(uuid);
     }
 
+    @Override
+    public void cleanupUser(@NonNull User user) {
+        Utils.checkUser(user);
+        plugin.getUserManager().cleanup(((UserLink) user).getMaster());
+    }
+
     @Override
     public Group getGroup(@NonNull String name) {
         final me.lucko.luckperms.groups.Group group = plugin.getGroupManager().get(name);
@@ -157,7 +162,7 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public Optional<Group> getGroupSafe(String name) {
+    public Optional<Group> getGroupSafe(@NonNull String name) {
         return Optional.ofNullable(getGroup(name));
     }
 
@@ -182,7 +187,7 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public Optional<Track> getTrackSafe(String name) {
+    public Optional<Track> getTrackSafe(@NonNull String name) {
         return Optional.ofNullable(getTrack(name));
     }
 
@@ -197,7 +202,7 @@ public class ApiProvider implements LuckPermsApi {
     }
 
     @Override
-    public Node.Builder buildNode(String permission) throws IllegalArgumentException {
+    public Node.Builder buildNode(@NonNull String permission) throws IllegalArgumentException {
         return new me.lucko.luckperms.utils.Node.Builder(checkNode(permission));
     }
 }

common/src/main/java/me/lucko/luckperms/api/implementation/internal/DatastoreLink.java

@@ -33,7 +33,6 @@ import me.lucko.luckperms.api.data.Callback;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 

common/src/main/java/me/lucko/luckperms/api/implementation/internal/UserLink.java

@@ -22,7 +22,6 @@
 
 package me.lucko.luckperms.api.implementation.internal;
 
-import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
@@ -43,7 +42,7 @@ import static me.lucko.luckperms.api.implementation.internal.Utils.*;
 @SuppressWarnings("unused")
 public class UserLink extends PermissionHolderLink implements User {
 
-    @Getter(AccessLevel.PACKAGE)
+    @Getter
     private final me.lucko.luckperms.users.User master;
 
     @Getter

common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java

@@ -30,7 +30,7 @@ import me.lucko.luckperms.users.User;
 
 import java.util.List;
 
-import static me.lucko.luckperms.core.PermissionHolder.*;
+import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy;
 
 public class UserListNodes extends SubCommand<User> {
     public UserListNodes() {

common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java

@@ -42,7 +42,7 @@ import java.util.logging.*;
 import java.util.logging.Formatter;
 import java.util.stream.Collectors;
 
-import static me.lucko.luckperms.core.PermissionHolder.*;
+import static me.lucko.luckperms.core.PermissionHolder.exportToLegacy;
 
 @SuppressWarnings({"ResultOfMethodCallIgnored", "UnnecessaryLocalVariable"})
 public class FlatfileDatastore extends Datastore {