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

Refactoring & misc cleanup

Browse Source
This commit is contained in:
Luck
2017-08-12 19:34:11 +02:00
Unverified
parent 07eb17f5d5
commit 1d5e3205ac
255 changed files with 1241 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java
+14 -15
View File
@@ -35,50 +35,51 @@ import me.lucko.luckperms.api.PlatformType;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.api.ApiHandler;
import me.lucko.luckperms.common.api.ApiProvider;
import me.lucko.luckperms.common.buffers.BufferedRequest;
import me.lucko.luckperms.common.caching.handlers.CachedStateManager;
import me.lucko.luckperms.common.calculators.CalculatorFactory;
import me.lucko.luckperms.common.commands.abstraction.Command;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.config.LuckPermsConfiguration;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.contexts.ContextManager;
import me.lucko.luckperms.common.contexts.StaticCalculator;
import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.contexts.LuckPermsCalculator;
import me.lucko.luckperms.common.dependencies.DependencyManager;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.locale.NoopLocaleManager;
import me.lucko.luckperms.common.locale.SimpleLocaleManager;
import me.lucko.luckperms.common.logging.SenderLogger;
import me.lucko.luckperms.common.managers.GenericTrackManager;
import me.lucko.luckperms.common.managers.TrackManager;
import me.lucko.luckperms.common.managers.impl.GenericTrackManager;
import me.lucko.luckperms.common.messaging.InternalMessagingService;
import me.lucko.luckperms.common.messaging.NoopMessagingService;
import me.lucko.luckperms.common.messaging.RedisMessagingService;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.plugin.LuckPermsScheduler;
import me.lucko.luckperms.common.storage.Storage;
import me.lucko.luckperms.common.storage.StorageFactory;
import me.lucko.luckperms.common.storage.StorageType;
import me.lucko.luckperms.common.storage.backing.file.FileWatcher;
import me.lucko.luckperms.common.tasks.CacheHousekeepingTask;
import me.lucko.luckperms.common.tasks.ExpireTemporaryTask;
import me.lucko.luckperms.common.tasks.UpdateTask;
import me.lucko.luckperms.common.treeview.PermissionVault;
import me.lucko.luckperms.common.utils.BufferedRequest;
import me.lucko.luckperms.common.utils.FakeSender;
import me.lucko.luckperms.common.utils.FileWatcher;
import me.lucko.luckperms.common.utils.SenderLogger;
import me.lucko.luckperms.common.utils.UuidCache;
import me.lucko.luckperms.common.verbose.VerboseHandler;
import me.lucko.luckperms.sponge.calculators.SpongeCalculatorFactory;
import me.lucko.luckperms.sponge.commands.SpongeMainCommand;
import me.lucko.luckperms.sponge.contexts.WorldCalculator;
import me.lucko.luckperms.sponge.managers.SpongeGroupManager;
import me.lucko.luckperms.sponge.managers.SpongeUserManager;
import me.lucko.luckperms.sponge.messaging.BungeeMessagingService;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import me.lucko.luckperms.sponge.service.ServiceCacheHousekeepingTask;
import me.lucko.luckperms.sponge.service.model.LPPermissionService;
import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;
import me.lucko.luckperms.sponge.service.persisted.PersistedCollection;
import me.lucko.luckperms.sponge.tasks.ServiceCacheHousekeepingTask;
import me.lucko.luckperms.sponge.timings.LPTimings;
import me.lucko.luckperms.sponge.utils.VersionData;
@@ -273,7 +274,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
groupManager = new SpongeGroupManager(this);
trackManager = new GenericTrackManager(this);
calculatorFactory = new SpongeCalculatorFactory(this);
cachedStateManager = new CachedStateManager(this);
cachedStateManager = new CachedStateManager();
contextManager = new ContextManager<Subject>() {
@Override
@@ -292,7 +293,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
contextManager.registerCalculator(new WorldCalculator(this));
StaticCalculator<Subject> staticCalculator = new StaticCalculator<>(getConfiguration());
LuckPermsCalculator<Subject> staticCalculator = new LuckPermsCalculator<>(getConfiguration());
contextManager.registerCalculator(staticCalculator, true);
// register the PermissionService with Sponge
@@ -373,10 +374,8 @@ public class LPSpongePlugin implements LuckPermsPlugin {
return;
}
for (Permission perm : Permission.values()) {
for (String node : perm.getNodes()) {
registerPermission(service, node);
}
for (CommandPermission perm : CommandPermission.values()) {
registerPermission(service, perm.getPermission());
}
}
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeListener.java
+2 -2
View File
@@ -29,10 +29,10 @@ import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.api.caching.UserData;
import me.lucko.luckperms.api.context.MutableContextSet;
import me.lucko.luckperms.common.core.UuidCache;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.locale.Message;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.utils.LoginHelper;
import me.lucko.luckperms.common.utils.UuidCache;
import me.lucko.luckperms.sponge.timings.LPTiming;
import org.spongepowered.api.command.CommandSource;
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCalculatorFactory.java → sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeCalculatorFactory.java
+9 -8
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge;
package me.lucko.luckperms.sponge.calculators;
import lombok.AllArgsConstructor;
@@ -32,14 +32,15 @@ import com.google.common.collect.ImmutableList;
import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.common.calculators.AbstractCalculatorFactory;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.calculators.processors.MapProcessor;
import me.lucko.luckperms.common.calculators.processors.RegexProcessor;
import me.lucko.luckperms.common.calculators.processors.WildcardProcessor;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.sponge.calculators.DefaultsProcessor;
import me.lucko.luckperms.sponge.calculators.SpongeWildcardProcessor;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.processors.MapProcessor;
import me.lucko.luckperms.common.processors.PermissionProcessor;
import me.lucko.luckperms.common.processors.RegexProcessor;
import me.lucko.luckperms.common.processors.WildcardProcessor;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.processors.DefaultsProcessor;
import me.lucko.luckperms.sponge.processors.SpongeWildcardProcessor;
import java.util.List;
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionClear.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -43,7 +43,7 @@ import java.util.List;
public class OptionClear extends SubCommand<LPSubjectData> {
public OptionClear(LocaleManager locale) {
super(CommandSpec.SPONGE_OPTION_CLEAR.spec(locale), "clear", Permission.SPONGE_OPTION_CLEAR, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_OPTION_CLEAR.spec(locale), "clear", CommandPermission.SPONGE_OPTION_CLEAR, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionInfo.java
+2 -2
View File
@@ -34,7 +34,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -46,7 +46,7 @@ import java.util.Map;
public class OptionInfo extends SubCommand<LPSubjectData> {
public OptionInfo(LocaleManager locale) {
super(CommandSpec.SPONGE_OPTION_INFO.spec(locale), "info", Permission.SPONGE_OPTION_INFO, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_OPTION_INFO.spec(locale), "info", CommandPermission.SPONGE_OPTION_INFO, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionSet.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -43,7 +43,7 @@ import java.util.List;
public class OptionSet extends SubCommand<LPSubjectData> {
public OptionSet(LocaleManager locale) {
super(CommandSpec.SPONGE_OPTION_SET.spec(locale), "set", Permission.SPONGE_OPTION_SET, Predicates.inRange(0, 1));
super(CommandSpec.SPONGE_OPTION_SET.spec(locale), "set", CommandPermission.SPONGE_OPTION_SET, Predicates.inRange(0, 1));
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/OptionUnset.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -43,7 +43,7 @@ import java.util.List;
public class OptionUnset extends SubCommand<LPSubjectData> {
public OptionUnset(LocaleManager locale) {
super(CommandSpec.SPONGE_OPTION_UNSET.spec(locale), "unset", Permission.SPONGE_OPTION_UNSET, Predicates.is(0));
super(CommandSpec.SPONGE_OPTION_UNSET.spec(locale), "unset", CommandPermission.SPONGE_OPTION_UNSET, Predicates.is(0));
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentAdd.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -48,7 +48,7 @@ import java.util.List;
public class ParentAdd extends SubCommand<LPSubjectData> {
public ParentAdd(LocaleManager locale) {
super(CommandSpec.SPONGE_PARENT_ADD.spec(locale), "add", Permission.SPONGE_PARENT_ADD, Predicates.inRange(0, 1));
super(CommandSpec.SPONGE_PARENT_ADD.spec(locale), "add", CommandPermission.SPONGE_PARENT_ADD, Predicates.inRange(0, 1));
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentClear.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -43,7 +43,7 @@ import java.util.List;
public class ParentClear extends SubCommand<LPSubjectData> {
public ParentClear(LocaleManager locale) {
super(CommandSpec.SPONGE_PARENT_CLEAR.spec(locale), "clear", Permission.SPONGE_PARENT_CLEAR, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_PARENT_CLEAR.spec(locale), "clear", CommandPermission.SPONGE_PARENT_CLEAR, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentInfo.java
+2 -2
View File
@@ -34,7 +34,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -47,7 +47,7 @@ import java.util.Map;
public class ParentInfo extends SubCommand<LPSubjectData> {
public ParentInfo(LocaleManager locale) {
super(CommandSpec.SPONGE_PARENT_INFO.spec(locale), "info", Permission.SPONGE_PARENT_INFO, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_PARENT_INFO.spec(locale), "info", CommandPermission.SPONGE_PARENT_INFO, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/ParentRemove.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -48,7 +48,7 @@ import java.util.List;
public class ParentRemove extends SubCommand<LPSubjectData> {
public ParentRemove(LocaleManager locale) {
super(CommandSpec.SPONGE_PARENT_REMOVE.spec(locale), "remove", Permission.SPONGE_PARENT_REMOVE, Predicates.inRange(0, 1));
super(CommandSpec.SPONGE_PARENT_REMOVE.spec(locale), "remove", CommandPermission.SPONGE_PARENT_REMOVE, Predicates.inRange(0, 1));
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionClear.java
+2 -2
View File
@@ -32,7 +32,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -43,7 +43,7 @@ import java.util.List;
public class PermissionClear extends SubCommand<LPSubjectData> {
public PermissionClear(LocaleManager locale) {
super(CommandSpec.SPONGE_PERMISSION_CLEAR.spec(locale), "clear", Permission.SPONGE_PERMISSION_CLEAR, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_PERMISSION_CLEAR.spec(locale), "clear", CommandPermission.SPONGE_PERMISSION_CLEAR, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionInfo.java
+2 -2
View File
@@ -34,7 +34,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -46,7 +46,7 @@ import java.util.Map;
public class PermissionInfo extends SubCommand<LPSubjectData> {
public PermissionInfo(LocaleManager locale) {
super(CommandSpec.SPONGE_PERMISSION_INFO.spec(locale), "info", Permission.SPONGE_PERMISSION_INFO, Predicates.alwaysFalse());
super(CommandSpec.SPONGE_PERMISSION_INFO.spec(locale), "info", CommandPermission.SPONGE_PERMISSION_INFO, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/commands/PermissionSet.java
+2 -2
View File
@@ -33,7 +33,7 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.ArgumentUtils;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
@@ -44,7 +44,7 @@ import java.util.List;
public class PermissionSet extends SubCommand<LPSubjectData> {
public PermissionSet(LocaleManager locale) {
super(CommandSpec.SPONGE_PERMISSION_SET.spec(locale), "set", Permission.SPONGE_PERMISSION_SET, Predicates.inRange(0, 1));
super(CommandSpec.SPONGE_PERMISSION_SET.spec(locale), "set", CommandPermission.SPONGE_PERMISSION_SET, Predicates.inRange(0, 1));
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeGroupManager.java
+1 -1
View File
@@ -41,8 +41,8 @@ import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.api.event.cause.CreationCause;
import me.lucko.luckperms.common.constants.DataConstraints;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.managers.GroupManager;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.model.SpongeGroup;
sponge/src/main/java/me/lucko/luckperms/sponge/managers/SpongeUserManager.java
+3 -3
View File
@@ -39,10 +39,10 @@ import com.google.common.collect.Maps;
import me.lucko.luckperms.api.HeldPermission;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.core.UserIdentifier;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.managers.GenericUserManager;
import me.lucko.luckperms.common.managers.UserManager;
import me.lucko.luckperms.common.managers.impl.GenericUserManager;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.references.UserIdentifier;
import me.lucko.luckperms.common.utils.ImmutableCollectors;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.model.SpongeUser;
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionManager.java
+5 -5
View File
@@ -32,14 +32,14 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.logging.ProgressLogger;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.ProgressLogger;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.LuckPermsService;
@@ -60,7 +60,7 @@ import static me.lucko.luckperms.sponge.migration.SpongeMigrationUtils.migrateSu
public class MigrationPermissionManager extends SubCommand<Object> {
public MigrationPermissionManager(LocaleManager locale) {
super(CommandSpec.MIGRATION_COMMAND.spec(locale), "permissionmanager", Permission.MIGRATION, Predicates.alwaysFalse());
super(CommandSpec.MIGRATION_COMMAND.spec(locale), "permissionmanager", CommandPermission.MIGRATION, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/migration/MigrationPermissionsEx.java
+6 -6
View File
@@ -32,15 +32,15 @@ import me.lucko.luckperms.common.commands.abstraction.SubCommand;
import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
import me.lucko.luckperms.common.commands.sender.Sender;
import me.lucko.luckperms.common.commands.utils.Util;
import me.lucko.luckperms.common.constants.Permission;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.Track;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.constants.CommandPermission;
import me.lucko.luckperms.common.locale.CommandSpec;
import me.lucko.luckperms.common.locale.LocaleManager;
import me.lucko.luckperms.common.logging.ProgressLogger;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.Track;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.common.utils.ProgressLogger;
import me.lucko.luckperms.exceptions.ObjectAlreadyHasException;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.LuckPermsService;
@@ -66,7 +66,7 @@ import static me.lucko.luckperms.sponge.migration.SpongeMigrationUtils.migrateSu
public class MigrationPermissionsEx extends SubCommand<Object> {
public MigrationPermissionsEx(LocaleManager locale) {
super(CommandSpec.MIGRATION_COMMAND.spec(locale), "permissionsex", Permission.MIGRATION, Predicates.alwaysFalse());
super(CommandSpec.MIGRATION_COMMAND.spec(locale), "permissionsex", CommandPermission.MIGRATION, Predicates.alwaysFalse());
}
@Override
sponge/src/main/java/me/lucko/luckperms/sponge/migration/SpongeMigrationUtils.java
+3 -3
View File
@@ -29,9 +29,9 @@ import lombok.experimental.UtilityClass;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.common.commands.impl.migration.MigrationUtils;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.PermissionHolder;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.node.NodeFactory;
import me.lucko.luckperms.sponge.service.model.CompatibilityUtil;
import org.spongepowered.api.service.context.Context;
sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
+2 -2
View File
@@ -38,8 +38,8 @@ import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.caching.MetaAccumulator;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.utils.ExtractedContexts;
import me.lucko.luckperms.common.contexts.ExtractedContexts;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import me.lucko.luckperms.sponge.service.LuckPermsSubjectData;
sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java
+1 -1
View File
@@ -33,7 +33,7 @@ import com.google.common.collect.ImmutableSet;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.caching.MetaData;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import me.lucko.luckperms.sponge.service.LuckPermsSubjectData;
sponge/src/main/java/me/lucko/luckperms/sponge/calculators/DefaultsProcessor.java → sponge/src/main/java/me/lucko/luckperms/sponge/processors/DefaultsProcessor.java
+2 -2
View File
@@ -23,13 +23,13 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge.calculators;
package me.lucko.luckperms.sponge.processors;
import lombok.AllArgsConstructor;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.processors.PermissionProcessor;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import java.util.Map;
sponge/src/main/java/me/lucko/luckperms/sponge/calculators/SpongeWildcardProcessor.java → sponge/src/main/java/me/lucko/luckperms/sponge/processors/SpongeWildcardProcessor.java
+2 -2
View File
@@ -23,10 +23,10 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge.calculators;
package me.lucko.luckperms.sponge.processors;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.processors.PermissionProcessor;
import java.util.Map;
sponge/src/main/java/me/lucko/luckperms/sponge/service/SimpleDescription.java → sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsPermissionDescription.java
+1 -1
View File
@@ -47,7 +47,7 @@ import java.util.concurrent.CompletableFuture;
@RequiredArgsConstructor
@EqualsAndHashCode(of = {"id", "description", "owner"})
@ToString(of = {"id", "description", "owner"})
public final class SimpleDescription implements LPPermissionDescription {
public final class LuckPermsPermissionDescription implements LPPermissionDescription {
@Getter
private final LPPermissionService service;
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsService.java
+4 -4
View File
@@ -41,8 +41,8 @@ import me.lucko.luckperms.api.Contexts;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.caching.UserCache;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.utils.Predicates;
import me.lucko.luckperms.sponge.LPSpongePlugin;
import me.lucko.luckperms.sponge.contexts.SpongeCalculatorLink;
@@ -52,7 +52,7 @@ import me.lucko.luckperms.sponge.model.SpongeGroup;
import me.lucko.luckperms.sponge.service.calculated.CalculatedSubjectData;
import me.lucko.luckperms.sponge.service.calculated.OptionLookup;
import me.lucko.luckperms.sponge.service.calculated.PermissionLookup;
import me.lucko.luckperms.sponge.service.legacystorage.LegacyDataMigrator;
import me.lucko.luckperms.sponge.service.legacy.LegacyDataMigrator;
import me.lucko.luckperms.sponge.service.model.LPPermissionDescription;
import me.lucko.luckperms.sponge.service.model.LPPermissionService;
import me.lucko.luckperms.sponge.service.model.LPSubject;
@@ -184,7 +184,7 @@ public class LuckPermsService implements LPPermissionService {
@Override
public LPPermissionDescription registerPermissionDescription(String id, Text description, PluginContainer owner) {
SimpleDescription desc = new SimpleDescription(this, id, description, owner);
LuckPermsPermissionDescription desc = new LuckPermsPermissionDescription(this, id, description, owner);
descriptionSet.add(desc);
return desc;
}
sponge/src/main/java/me/lucko/luckperms/sponge/service/LuckPermsSubjectData.java
+5 -5
View File
@@ -38,11 +38,11 @@ import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.caching.MetaAccumulator;
import me.lucko.luckperms.common.core.NodeFactory;
import me.lucko.luckperms.common.core.model.Group;
import me.lucko.luckperms.common.core.model.PermissionHolder;
import me.lucko.luckperms.common.core.model.User;
import me.lucko.luckperms.common.utils.ExtractedContexts;
import me.lucko.luckperms.common.contexts.ExtractedContexts;
import me.lucko.luckperms.common.model.Group;
import me.lucko.luckperms.common.model.PermissionHolder;
import me.lucko.luckperms.common.model.User;
import me.lucko.luckperms.common.node.NodeFactory;
import me.lucko.luckperms.sponge.service.model.LPSubject;
import me.lucko.luckperms.sponge.service.model.LPSubjectData;
import me.lucko.luckperms.sponge.service.model.SubjectReference;
sponge/src/main/java/me/lucko/luckperms/sponge/service/calculated/CalculatedSubjectData.java
+3 -3
View File
@@ -39,9 +39,9 @@ import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ContextSet;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.calculators.PermissionCalculator;
import me.lucko.luckperms.common.calculators.PermissionProcessor;
import me.lucko.luckperms.common.calculators.processors.MapProcessor;
import me.lucko.luckperms.sponge.calculators.SpongeWildcardProcessor;
import me.lucko.luckperms.common.processors.MapProcessor;
import me.lucko.luckperms.common.processors.PermissionProcessor;
import me.lucko.luckperms.sponge.processors.SpongeWildcardProcessor;
import me.lucko.luckperms.sponge.service.model.LPPermissionService;
import me.lucko.luckperms.sponge.service.model.LPSubject;
import me.lucko.luckperms.sponge.service.model.LPSubjectData;
sponge/src/main/java/me/lucko/luckperms/sponge/service/legacystorage/LegacyDataMigrator.java → sponge/src/main/java/me/lucko/luckperms/sponge/service/legacy/LegacyDataMigrator.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge.service.legacystorage;
package me.lucko.luckperms.sponge.service.legacy;
import lombok.RequiredArgsConstructor;
sponge/src/main/java/me/lucko/luckperms/sponge/service/legacystorage/SubjectDataHolder.java → sponge/src/main/java/me/lucko/luckperms/sponge/service/legacy/SubjectDataHolder.java
+1 -1
View File
@@ -23,7 +23,7 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge.service.legacystorage;
package me.lucko.luckperms.sponge.service.legacy;
import lombok.ToString;
sponge/src/main/java/me/lucko/luckperms/sponge/service/persisted/PersistedSubject.java
+1 -1
View File
@@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableList;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.utils.BufferedRequest;
import me.lucko.luckperms.common.buffers.BufferedRequest;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import me.lucko.luckperms.sponge.service.ProxyFactory;
import me.lucko.luckperms.sponge.service.calculated.CalculatedSubjectData;
sponge/src/main/java/me/lucko/luckperms/sponge/service/storage/SubjectStorageModel.java
+5 -5
View File
@@ -35,9 +35,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import me.lucko.luckperms.api.context.ImmutableContextSet;
import me.lucko.luckperms.common.core.ContextSetComparator;
import me.lucko.luckperms.common.core.NodeModel;
import me.lucko.luckperms.common.core.PriorityComparator;
import me.lucko.luckperms.common.contexts.ContextSetComparator;
import me.lucko.luckperms.common.node.NodeModel;
import me.lucko.luckperms.common.node.NodePriorityComparator;
import me.lucko.luckperms.sponge.service.calculated.CalculatedSubjectData;
import me.lucko.luckperms.sponge.service.model.LPPermissionService;
import me.lucko.luckperms.sponge.service.model.SubjectReference;
@@ -194,7 +194,7 @@ public class SubjectStorageModel {
// sort alphabetically.
List<Map.Entry<String, Boolean>> perms = new ArrayList<>(e.getValue().entrySet());
perms.sort((o1, o2) -> PriorityComparator.get().compareStrings(o1.getKey(), o2.getKey()));
perms.sort((o1, o2) -> NodePriorityComparator.get().compareStrings(o1.getKey(), o2.getKey()));
for (Map.Entry<String, Boolean> ent : perms) {
data.addProperty(ent.getKey(), ent.getValue());
@@ -218,7 +218,7 @@ public class SubjectStorageModel {
// sort alphabetically.
List<Map.Entry<String, String>> opts = new ArrayList<>(e.getValue().entrySet());
opts.sort((o1, o2) -> PriorityComparator.get().compareStrings(o1.getKey(), o2.getKey()));
opts.sort((o1, o2) -> NodePriorityComparator.get().compareStrings(o1.getKey(), o2.getKey()));
for (Map.Entry<String, String> ent : opts) {
data.addProperty(ent.getKey(), ent.getValue());
sponge/src/main/java/me/lucko/luckperms/sponge/service/ServiceCacheHousekeepingTask.java → sponge/src/main/java/me/lucko/luckperms/sponge/tasks/ServiceCacheHousekeepingTask.java
+2 -1
View File
@@ -23,10 +23,11 @@
* SOFTWARE.
*/
package me.lucko.luckperms.sponge.service;
package me.lucko.luckperms.sponge.tasks;
import lombok.RequiredArgsConstructor;
import me.lucko.luckperms.sponge.service.LuckPermsService;
import me.lucko.luckperms.sponge.service.model.LPSubject;
import me.lucko.luckperms.sponge.service.model.LPSubjectCollection;