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

Reorganise some packages

Browse Source
This commit is contained in:
Luck
2018-11-10 23:16:21 +00:00
Unverified
parent 26973461e7
commit 9809e591ad
351 changed files with 740 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/me/lucko/luckperms/common/actionlog/Log.java
+1 -1
View File
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.actionlog;
import com.google.common.collect.ImmutableSortedSet;
import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import java.util.Comparator;
import java.util.SortedSet;
common/src/main/java/me/lucko/luckperms/common/api/LuckPermsApiProvider.java
+10 -10
View File
@@ -40,16 +40,16 @@ import me.lucko.luckperms.api.manager.UserManager;
import me.lucko.luckperms.api.messenger.MessengerProvider;
import me.lucko.luckperms.api.metastacking.MetaStackFactory;
import me.lucko.luckperms.api.platform.PlatformInfo;
import me.lucko.luckperms.common.api.delegates.manager.ApiContextManager;
import me.lucko.luckperms.common.api.delegates.manager.ApiGroupManager;
import me.lucko.luckperms.common.api.delegates.manager.ApiTrackManager;
import me.lucko.luckperms.common.api.delegates.manager.ApiUserManager;
import me.lucko.luckperms.common.api.delegates.misc.ApiActionLogger;
import me.lucko.luckperms.common.api.delegates.misc.ApiMessagingService;
import me.lucko.luckperms.common.api.delegates.misc.ApiMetaStackFactory;
import me.lucko.luckperms.common.api.delegates.misc.ApiNodeFactory;
import me.lucko.luckperms.common.api.delegates.misc.ApiPlatformInfo;
import me.lucko.luckperms.common.api.delegates.misc.NoopUuidCache;
import me.lucko.luckperms.common.api.implementation.ApiActionLogger;
import me.lucko.luckperms.common.api.implementation.ApiContextManager;
import me.lucko.luckperms.common.api.implementation.ApiGroupManager;
import me.lucko.luckperms.common.api.implementation.ApiMessagingService;
import me.lucko.luckperms.common.api.implementation.ApiMetaStackFactory;
import me.lucko.luckperms.common.api.implementation.ApiNodeFactory;
import me.lucko.luckperms.common.api.implementation.ApiPlatformInfo;
import me.lucko.luckperms.common.api.implementation.ApiTrackManager;
import me.lucko.luckperms.common.api.implementation.ApiUserManager;
import me.lucko.luckperms.common.api.implementation.NoopUuidCache;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.messaging.LuckPermsMessagingService;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiAbstractManager.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiAbstractManager.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.manager;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiActionLogger.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiActionLogger.java
+1 -2
View File
@@ -23,13 +23,12 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.ActionLogger;
import me.lucko.luckperms.api.Log;
import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.api.delegates.model.ApiLog;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiConfiguration.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiConfiguration.java
+2 -2
View File
@@ -23,14 +23,14 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.LPConfiguration;
import me.lucko.luckperms.api.LookupSetting;
import me.lucko.luckperms.common.config.ConfigKey;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.config.LuckPermsConfiguration;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiContextManager.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
+2 -3
View File
@@ -23,15 +23,14 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.manager;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.User;
import me.lucko.luckperms.api.context.ContextCalculator;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.api.context.StaticContextCalculator;
import me.lucko.luckperms.common.api.delegates.model.ApiUser;
import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.common.context.ContextManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiGroup.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroup.java
+2 -2
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import com.google.common.base.Preconditions;
@@ -37,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Objects;
import java.util.OptionalInt;
public final class ApiGroup extends ApiPermissionHolder implements me.lucko.luckperms.api.Group {
public class ApiGroup extends ApiPermissionHolder implements me.lucko.luckperms.api.Group {
public static Group cast(me.lucko.luckperms.api.Group group) {
Objects.requireNonNull(group, "group");
Preconditions.checkState(group instanceof ApiGroup, "Illegal instance " + group.getClass() + " cannot be handled by this implementation.");
common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiGroupManager.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiGroupManager.java
+5 -6
View File
@@ -23,20 +23,19 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.manager;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.HeldPermission;
import me.lucko.luckperms.api.event.cause.CreationCause;
import me.lucko.luckperms.api.event.cause.DeletionCause;
import me.lucko.luckperms.common.api.ApiUtils;
import me.lucko.luckperms.common.api.delegates.model.ApiGroup;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison;
import me.lucko.luckperms.common.managers.group.GroupManager;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.manager.group.GroupManager;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiLog.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiLog.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.LogEntry;
import me.lucko.luckperms.common.actionlog.Log;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMessagingService.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMessagingService.java
+1 -2
View File
@@ -23,11 +23,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.MessagingService;
import me.lucko.luckperms.api.User;
import me.lucko.luckperms.common.api.delegates.model.ApiUser;
import me.lucko.luckperms.common.messaging.InternalMessagingService;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiMetaStackFactory.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiMetaStackFactory.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import com.google.common.collect.ImmutableList;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiNodeFactory.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiNodeFactory.java
+1 -2
View File
@@ -23,12 +23,11 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.ChatMetaType;
import me.lucko.luckperms.api.Group;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.common.api.delegates.model.ApiGroup;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiPermissionHolder.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPermissionHolder.java
+2 -2
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -51,7 +51,7 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.utils.MetaType;
import me.lucko.luckperms.common.node.utils.NodeTools;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/ApiPlatformInfo.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiPlatformInfo.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.platform.PlatformInfo;
import me.lucko.luckperms.api.platform.PlatformType;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiStorage.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiStorage.java
+3 -3
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.Group;
import me.lucko.luckperms.api.HeldPermission;
@@ -33,8 +33,8 @@ import me.lucko.luckperms.api.Track;
import me.lucko.luckperms.api.User;
import me.lucko.luckperms.api.event.cause.CreationCause;
import me.lucko.luckperms.api.event.cause.DeletionCause;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.storage.Storage;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiTrack.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrack.java
+3 -3
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import com.google.common.base.Preconditions;
@@ -34,14 +34,14 @@ import me.lucko.luckperms.api.PromotionResult;
import me.lucko.luckperms.api.User;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.List;
import java.util.Objects;
public final class ApiTrack implements me.lucko.luckperms.api.Track {
public class ApiTrack implements me.lucko.luckperms.api.Track {
public static Track cast(me.lucko.luckperms.api.Track track) {
Objects.requireNonNull(track, "track");
Preconditions.checkState(track instanceof ApiTrack, "Illegal instance " + track.getClass() + " cannot be handled by this implementation.");
common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiTrackManager.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiTrackManager.java
+3 -4
View File
@@ -23,16 +23,15 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.manager;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.event.cause.CreationCause;
import me.lucko.luckperms.api.event.cause.DeletionCause;
import me.lucko.luckperms.common.api.ApiUtils;
import me.lucko.luckperms.common.api.delegates.model.ApiTrack;
import me.lucko.luckperms.common.managers.track.TrackManager;
import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.model.manager.track.TrackManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/api/delegates/model/ApiUser.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUser.java
+2 -2
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.model;
package me.lucko.luckperms.common.api.implementation;
import com.google.common.base.Preconditions;
@@ -39,7 +39,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.Objects;
import java.util.UUID;
public final class ApiUser extends ApiPermissionHolder implements me.lucko.luckperms.api.User {
public class ApiUser extends ApiPermissionHolder implements me.lucko.luckperms.api.User {
public static User cast(me.lucko.luckperms.api.User u) {
Preconditions.checkState(u instanceof ApiUser, "Illegal instance " + u.getClass() + " cannot be handled by this implementation.");
return ((ApiUser) u).getHandle();
common/src/main/java/me/lucko/luckperms/common/api/delegates/manager/ApiUserManager.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiUserManager.java
+5 -6
View File
@@ -23,19 +23,18 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.manager;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.HeldPermission;
import me.lucko.luckperms.api.PlayerSaveResult;
import me.lucko.luckperms.common.api.ApiUtils;
import me.lucko.luckperms.common.api.delegates.model.ApiUser;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison;
import me.lucko.luckperms.common.managers.user.UserManager;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.model.UserIdentifier;
import me.lucko.luckperms.common.model.manager.user.UserManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.common.util.ImmutableCollectors;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
common/src/main/java/me/lucko/luckperms/common/api/delegates/misc/NoopUuidCache.java → common/src/main/java/me/lucko/luckperms/common/api/implementation/NoopUuidCache.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.api.delegates.misc;
package me.lucko.luckperms.common.api.implementation;
import me.lucko.luckperms.api.UuidCache;
common/src/main/java/me/lucko/luckperms/common/backup/Exporter.java
+1 -1
View File
@@ -35,7 +35,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.utils.ProgressLogger;
import me.lucko.luckperms.common.util.ProgressLogger;
import java.io.BufferedWriter;
import java.io.IOException;
common/src/main/java/me/lucko/luckperms/common/buffers/BufferedRequest.java → common/src/main/java/me/lucko/luckperms/common/buffer/BufferedRequest.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.buffers;
package me.lucko.luckperms.common.buffer;
import me.lucko.luckperms.common.plugin.scheduler.SchedulerAdapter;
import me.lucko.luckperms.common.plugin.scheduler.SchedulerTask;
common/src/main/java/me/lucko/luckperms/common/buffers/Cache.java → common/src/main/java/me/lucko/luckperms/common/buffer/Cache.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.buffers;
package me.lucko.luckperms.common.buffer;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/buffers/ExpiringCache.java → common/src/main/java/me/lucko/luckperms/common/buffer/ExpiringCache.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.buffers;
package me.lucko.luckperms.common.buffer;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Comparison.java → common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Comparison.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.bulkupdate.comparisons;
package me.lucko.luckperms.common.bulkupdate.comparison;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Constraint.java → common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/Constraint.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.bulkupdate.comparisons;
package me.lucko.luckperms.common.bulkupdate.comparison;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/StandardComparison.java → common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparison/StandardComparison.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.bulkupdate.comparisons;
package me.lucko.luckperms.common.bulkupdate.comparison;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java
+1 -1
View File
@@ -26,7 +26,7 @@
package me.lucko.luckperms.common.bulkupdate.query;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
/**
common/src/main/java/me/lucko/luckperms/common/caching/AbstractCachedData.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/AbstractCachedData.java
+6 -6
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching;
package me.lucko.luckperms.common.cacheddata;
import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
import com.github.benmanes.caffeine.cache.CacheLoader;
@@ -34,11 +34,11 @@ import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.FullySatisfiedContexts;
import me.lucko.luckperms.api.caching.CachedData;
import me.lucko.luckperms.api.caching.MetaContexts;
import me.lucko.luckperms.common.caching.type.MetaAccumulator;
import me.lucko.luckperms.common.caching.type.MetaCache;
import me.lucko.luckperms.common.caching.type.PermissionCache;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator;
import me.lucko.luckperms.common.cacheddata.type.MetaCache;
import me.lucko.luckperms.common.cacheddata.type.PermissionCache;
import me.lucko.luckperms.common.calculator.CalculatorFactory;
import me.lucko.luckperms.common.calculator.PermissionCalculator;
import me.lucko.luckperms.common.metastacking.SimpleMetaStack;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
common/src/main/java/me/lucko/luckperms/common/caching/CacheMetadata.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/CacheMetadata.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching;
package me.lucko.luckperms.common.cacheddata;
import me.lucko.luckperms.api.caching.CachedDataContainer;
import me.lucko.luckperms.api.context.ContextSet;
common/src/main/java/me/lucko/luckperms/common/caching/GroupCachedData.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/GroupCachedData.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching;
package me.lucko.luckperms.common.cacheddata;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.caching.GroupData;
common/src/main/java/me/lucko/luckperms/common/caching/HolderCachedData.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/HolderCachedData.java
+3 -3
View File
@@ -23,12 +23,12 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching;
package me.lucko.luckperms.common.cacheddata;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.caching.MetaContexts;
import me.lucko.luckperms.common.caching.type.MetaAccumulator;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator;
import me.lucko.luckperms.common.calculator.CalculatorFactory;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.model.PermissionHolder;
common/src/main/java/me/lucko/luckperms/common/caching/UserCachedData.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/UserCachedData.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching;
package me.lucko.luckperms.common.cacheddata;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.caching.UserData;
common/src/main/java/me/lucko/luckperms/common/caching/type/MetaAccumulator.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaAccumulator.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching.type;
package me.lucko.luckperms.common.cacheddata.type;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
common/src/main/java/me/lucko/luckperms/common/caching/type/MetaCache.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/type/MetaCache.java
+2 -2
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching.type;
package me.lucko.luckperms.common.cacheddata.type;
import com.google.common.collect.ForwardingListMultimap;
import com.google.common.collect.ForwardingMap;
@@ -36,7 +36,7 @@ import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.caching.MetaContexts;
import me.lucko.luckperms.api.caching.MetaData;
import me.lucko.luckperms.api.metastacking.MetaStackDefinition;
import me.lucko.luckperms.common.caching.CacheMetadata;
import me.lucko.luckperms.common.cacheddata.CacheMetadata;
import me.lucko.luckperms.common.metastacking.MetaStack;
import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.verbose.VerboseHandler;
common/src/main/java/me/lucko/luckperms/common/caching/type/PermissionCache.java → common/src/main/java/me/lucko/luckperms/common/cacheddata/type/PermissionCache.java
+4 -4
View File
@@ -23,14 +23,14 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.caching.type;
package me.lucko.luckperms.common.cacheddata.type;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.caching.PermissionData;
import me.lucko.luckperms.common.caching.CacheMetadata;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.cacheddata.CacheMetadata;
import me.lucko.luckperms.common.calculator.CalculatorFactory;
import me.lucko.luckperms.common.calculator.PermissionCalculator;
import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/calculators/CalculatorFactory.java → common/src/main/java/me/lucko/luckperms/common/calculator/CalculatorFactory.java
+2 -2
View File
@@ -23,10 +23,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.calculators;
package me.lucko.luckperms.common.calculator;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.common.caching.CacheMetadata;
import me.lucko.luckperms.common.cacheddata.CacheMetadata;
/**
* Creates a calculator instance given a set of contexts
common/src/main/java/me/lucko/luckperms/common/calculators/PermissionCalculator.java → common/src/main/java/me/lucko/luckperms/common/calculator/PermissionCalculator.java
+3 -3
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.calculators;
package me.lucko.luckperms.common.calculator;
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.github.benmanes.caffeine.cache.Caffeine;
@@ -31,9 +31,9 @@ import com.github.benmanes.caffeine.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.caching.CacheMetadata;
import me.lucko.luckperms.common.cacheddata.CacheMetadata;
import me.lucko.luckperms.common.calculator.processor.PermissionProcessor;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.processors.PermissionProcessor;
import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/processors/AbstractPermissionProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculator/processor/AbstractPermissionProcessor.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.processors;
package me.lucko.luckperms.common.calculator.processor;
import java.util.Collections;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/processors/MapProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculator/processor/MapProcessor.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.processors;
package me.lucko.luckperms.common.calculator.processor;
import me.lucko.luckperms.api.Tristate;
common/src/main/java/me/lucko/luckperms/common/processors/PermissionProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculator/processor/PermissionProcessor.java
+2 -2
View File
@@ -23,10 +23,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.processors;
package me.lucko.luckperms.common.calculator.processor;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculator.PermissionCalculator;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/processors/RegexProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculator/processor/RegexProcessor.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.processors;
package me.lucko.luckperms.common.calculator.processor;
import com.google.common.collect.ImmutableMap;
common/src/main/java/me/lucko/luckperms/common/processors/WildcardProcessor.java → common/src/main/java/me/lucko/luckperms/common/calculator/processor/WildcardProcessor.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.common.processors;
package me.lucko.luckperms.common.calculator.processor;
import com.google.common.collect.ImmutableMap;
common/src/main/java/me/lucko/luckperms/common/command/CommandManager.java
+1 -1
View File
@@ -63,7 +63,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.ClickEvent;
common/src/main/java/me/lucko/luckperms/common/command/abstraction/MainCommand.java
+1 -1
View File
@@ -31,7 +31,7 @@ import me.lucko.luckperms.common.locale.command.LocalizedCommandSpec;
import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/command/abstraction/SharedMainCommand.java
+1 -1
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.ArrayList;
import java.util.Collections;
common/src/main/java/me/lucko/luckperms/common/command/access/ArgumentPermissions.java
+1 -1
View File
@@ -28,7 +28,7 @@ package me.lucko.luckperms.common.command.access;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.caching.type.PermissionCache;
import me.lucko.luckperms.common.cacheddata.type.PermissionCache;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder;
common/src/main/java/me/lucko/luckperms/common/command/utils/ArgumentParser.java
+1 -1
View File
@@ -34,7 +34,7 @@ import me.lucko.luckperms.common.commands.user.UserMainCommand;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.DateParser;
import me.lucko.luckperms.common.util.DateParser;
import java.util.ArrayList;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddChatMeta.java
+2 -2
View File
@@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaAddTempChatMeta.java
+3 -3
View File
@@ -46,9 +46,9 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaClear.java
+1 -1
View File
@@ -43,7 +43,7 @@ import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.node.utils.MetaType;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java
+2 -2
View File
@@ -43,8 +43,8 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.BuildableComponent;
import net.kyori.text.TextComponent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveChatMeta.java
+2 -2
View File
@@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaRemoveTempChatMeta.java
+2 -2
View File
@@ -44,8 +44,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSet.java
+2 -2
View File
@@ -45,8 +45,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetChatMeta.java
+3 -3
View File
@@ -30,7 +30,7 @@ import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.DataMutateResult;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.caching.type.MetaAccumulator;
import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator;
import me.lucko.luckperms.common.command.CommandResult;
import me.lucko.luckperms.common.command.abstraction.CommandException;
import me.lucko.luckperms.common.command.abstraction.SharedSubCommand;
@@ -47,8 +47,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTemp.java
+3 -3
View File
@@ -47,9 +47,9 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaSetTempChatMeta.java
+4 -4
View File
@@ -31,7 +31,7 @@ import me.lucko.luckperms.api.TemporaryDataMutateResult;
import me.lucko.luckperms.api.TemporaryMergeBehaviour;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.caching.type.MetaAccumulator;
import me.lucko.luckperms.common.cacheddata.type.MetaAccumulator;
import me.lucko.luckperms.common.command.CommandResult;
import me.lucko.luckperms.common.command.abstraction.CommandException;
import me.lucko.luckperms.common.command.abstraction.SharedSubCommand;
@@ -49,9 +49,9 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.TextComponent;
import net.kyori.text.event.HoverEvent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnset.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaUnsetTemp.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderClear.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderEditor.java
+1 -1
View File
@@ -39,7 +39,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.web.StandardPastebin;
import me.lucko.luckperms.common.web.WebEditor;
common/src/main/java/me/lucko/luckperms/common/commands/generic/other/HolderShowTracks.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.ArrayList;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAdd.java
+1 -1
View File
@@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentAddTemp.java
+2 -2
View File
@@ -48,8 +48,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClear.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentClearTrack.java
+1 -1
View File
@@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentInfo.java
+4 -4
View File
@@ -44,10 +44,10 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Iterators;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Iterators;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.BuildableComponent;
import net.kyori.text.TextComponent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemove.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentRemoveTemp.java
+1 -1
View File
@@ -45,7 +45,7 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSet.java
+1 -1
View File
@@ -46,7 +46,7 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/ParentSetTrack.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/parent/UserSwitchPrimaryGroup.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheck.java
+1 -1
View File
@@ -45,7 +45,7 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionCheckInherits.java
+1 -1
View File
@@ -44,7 +44,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.utils.InheritanceInfo;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionClear.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionInfo.java
+4 -4
View File
@@ -44,10 +44,10 @@ import me.lucko.luckperms.common.node.comparator.NodeWithContextComparator;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Iterators;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Iterators;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.BuildableComponent;
import net.kyori.text.TextComponent;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSet.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionSetTemp.java
+2 -2
View File
@@ -49,8 +49,8 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnset.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/generic/permission/PermissionUnsetTemp.java
+1 -1
View File
@@ -47,7 +47,7 @@ import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.node.model.NodeTypes;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/CreateGroup.java
+1 -1
View File
@@ -37,7 +37,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/DeleteGroup.java
+1 -1
View File
@@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupClone.java
+1 -1
View File
@@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.NodeMapType;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupInfo.java
+2 -2
View File
@@ -37,8 +37,8 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Set;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupListMembers.java
+6 -6
View File
@@ -31,8 +31,8 @@ import com.google.common.collect.Maps;
import me.lucko.luckperms.api.HeldPermission;
import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.command.CommandManager;
import me.lucko.luckperms.common.command.CommandResult;
import me.lucko.luckperms.common.command.abstraction.SubCommand;
@@ -50,10 +50,10 @@ import me.lucko.luckperms.common.node.comparator.HeldPermissionComparator;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Iterators;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.TextUtils;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Iterators;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.TextUtils;
import net.kyori.text.BuildableComponent;
import net.kyori.text.TextComponent;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupRename.java
+1 -1
View File
@@ -40,7 +40,7 @@ import me.lucko.luckperms.common.model.NodeMapType;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetDisplayName.java
+1 -1
View File
@@ -43,7 +43,7 @@ import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/GroupSetWeight.java
+1 -1
View File
@@ -41,7 +41,7 @@ import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
common/src/main/java/me/lucko/luckperms/common/commands/group/ListGroups.java
+1 -1
View File
@@ -35,7 +35,7 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import net.kyori.text.TextComponent;
import net.kyori.text.event.ClickEvent;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogGroupHistory.java
+3 -3
View File
@@ -39,9 +39,9 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Paginated;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Paginated;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogNotify.java
+1 -1
View File
@@ -38,7 +38,7 @@ import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.factory.NodeFactory;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Optional;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogRecent.java
+3 -3
View File
@@ -36,9 +36,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec;
import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Paginated;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Paginated;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogSearch.java
+3 -3
View File
@@ -35,9 +35,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec;
import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Paginated;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Paginated;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogTrackHistory.java
+3 -3
View File
@@ -39,9 +39,9 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.storage.misc.DataConstraints;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Paginated;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Paginated;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/commands/log/LogUserHistory.java
+3 -3
View File
@@ -36,9 +36,9 @@ import me.lucko.luckperms.common.locale.command.CommandSpec;
import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Paginated;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Paginated;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.Map;
common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationMainCommand.java
+1 -1
View File
@@ -36,7 +36,7 @@ import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.locale.command.CommandSpec;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import org.checkerframework.checker.nullness.qual.NonNull;
common/src/main/java/me/lucko/luckperms/common/commands/misc/ApplyEditsCommand.java
+2 -2
View File
@@ -46,8 +46,8 @@ import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.DurationFormatter;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.DurationFormatter;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.web.WebEditor;
import java.util.HashSet;
common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java
+4 -4
View File
@@ -33,9 +33,9 @@ import me.lucko.luckperms.common.bulkupdate.BulkUpdateBuilder;
import me.lucko.luckperms.common.bulkupdate.DataType;
import me.lucko.luckperms.common.bulkupdate.action.DeleteAction;
import me.lucko.luckperms.common.bulkupdate.action.UpdateAction;
import me.lucko.luckperms.common.bulkupdate.comparisons.Comparison;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparisons.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.comparison.Comparison;
import me.lucko.luckperms.common.bulkupdate.comparison.Constraint;
import me.lucko.luckperms.common.bulkupdate.comparison.StandardComparison;
import me.lucko.luckperms.common.bulkupdate.query.Query;
import me.lucko.luckperms.common.bulkupdate.query.QueryField;
import me.lucko.luckperms.common.command.CommandResult;
@@ -48,7 +48,7 @@ import me.lucko.luckperms.common.locale.command.CommandSpec;
import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.util.Predicates;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
common/src/main/java/me/lucko/luckperms/common/commands/misc/CheckCommand.java
+2 -2
View File
@@ -39,8 +39,8 @@ import me.lucko.luckperms.common.locale.message.Message;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.sender.Sender;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.Uuids;
import me.lucko.luckperms.common.util.Predicates;
import me.lucko.luckperms.common.util.Uuids;
import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent;
import java.util.List;

Some files were not shown because too many files have changed in this diff Show More