Events rewrite, remove most deprecated API methods (v3.0)
This commit is contained in:
@@ -247,7 +247,7 @@ public class LPSpongePlugin implements LuckPermsPlugin {
|
||||
uuidCache = new UuidCache(this);
|
||||
userManager = new SpongeUserManager(this);
|
||||
groupManager = new SpongeGroupManager(this);
|
||||
trackManager = new GenericTrackManager();
|
||||
trackManager = new GenericTrackManager(this);
|
||||
importer = new Importer(commandManager);
|
||||
calculatorFactory = new SpongeCalculatorFactory(this);
|
||||
cachedStateManager = new CachedStateManager(this);
|
||||
|
||||
@@ -100,7 +100,7 @@ public class SpongeMainCommand extends BaseCommand<Void, SubjectData> {
|
||||
|
||||
if (args.size() < 1) {
|
||||
Util.sendPluginMessage(sender, "&aCurrent Subject Collections:\n" +
|
||||
Util.listToCommaSep(service.getKnownSubjects().keySet().stream()
|
||||
Util.listToCommaSep(service.getCollections().keySet().stream()
|
||||
.filter(s -> !s.equalsIgnoreCase("user") && !s.equalsIgnoreCase("group"))
|
||||
.collect(Collectors.toList())
|
||||
)
|
||||
@@ -115,7 +115,7 @@ public class SpongeMainCommand extends BaseCommand<Void, SubjectData> {
|
||||
return CommandResult.STATE_ERROR;
|
||||
}
|
||||
|
||||
if (service.getKnownSubjects().keySet().stream().map(String::toLowerCase).noneMatch(s -> s.equalsIgnoreCase(subjectCollection))) {
|
||||
if (service.getCollections().keySet().stream().map(String::toLowerCase).noneMatch(s -> s.equalsIgnoreCase(subjectCollection))) {
|
||||
Util.sendPluginMessage(sender, "Warning: SubjectCollection '&4" + subjectCollection + "&c' doesn't already exist. Creating it now.");
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
@AllArgsConstructor
|
||||
public class SpongeCalculatorLink extends ContextCalculator<Subject> {
|
||||
public class SpongeCalculatorLink implements ContextCalculator<Subject> {
|
||||
private final org.spongepowered.api.service.context.ContextCalculator<Subject> calculator;
|
||||
|
||||
@Override
|
||||
|
||||
@@ -38,7 +38,7 @@ import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public class WorldCalculator extends ContextCalculator<Subject> {
|
||||
public class WorldCalculator implements ContextCalculator<Subject> {
|
||||
private final LPSpongePlugin plugin;
|
||||
|
||||
@Override
|
||||
@@ -65,11 +65,7 @@ public class WorldCalculator extends ContextCalculator<Subject> {
|
||||
}
|
||||
|
||||
Optional<Player> p = plugin.getGame().getServer().getPlayer(plugin.getUuidCache().getExternalUUID(uuid));
|
||||
if (!p.isPresent()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return context.getKey().equals(Context.WORLD_KEY) && p.get().getWorld().getName().equals(context.getValue());
|
||||
return p.map(player -> context.getKey().equals(Context.WORLD_KEY) && player.getWorld().getName().equals(context.getValue())).orElse(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ import com.google.common.util.concurrent.UncheckedExecutionException;
|
||||
|
||||
import me.lucko.luckperms.api.Tristate;
|
||||
import me.lucko.luckperms.api.context.ContextSet;
|
||||
import me.lucko.luckperms.api.event.cause.CreationCause;
|
||||
import me.lucko.luckperms.common.core.model.Group;
|
||||
import me.lucko.luckperms.common.managers.GroupManager;
|
||||
import me.lucko.luckperms.common.utils.ArgumentChecker;
|
||||
@@ -81,7 +82,7 @@ public class SpongeGroupManager implements GroupManager, LPSubjectCollection {
|
||||
}
|
||||
|
||||
// Request load
|
||||
plugin.getStorage().createAndLoadGroup(s).join();
|
||||
plugin.getStorage().createAndLoadGroup(s, CreationCause.INTERNAL).join();
|
||||
|
||||
SpongeGroup group = getIfLoaded(s);
|
||||
if (group == null) {
|
||||
|
||||
+2
-1
@@ -22,6 +22,7 @@
|
||||
|
||||
package me.lucko.luckperms.sponge.migration;
|
||||
|
||||
import me.lucko.luckperms.api.event.cause.CreationCause;
|
||||
import me.lucko.luckperms.common.commands.CommandException;
|
||||
import me.lucko.luckperms.common.commands.CommandResult;
|
||||
import me.lucko.luckperms.common.commands.SubCommand;
|
||||
@@ -110,7 +111,7 @@ public class MigrationPermissionManager extends SubCommand<Object> {
|
||||
String pmName = MigrationUtils.convertName(pmGroup.getIdentifier());
|
||||
|
||||
// Make a LuckPerms group for the one being migrated
|
||||
plugin.getStorage().createAndLoadGroup(pmName).join();
|
||||
plugin.getStorage().createAndLoadGroup(pmName, CreationCause.INTERNAL).join();
|
||||
Group group = plugin.getGroupManager().getIfLoaded(pmName);
|
||||
migrateSubject(pmGroup, group, 100);
|
||||
plugin.getStorage().saveGroup(group);
|
||||
|
||||
+3
-2
@@ -22,6 +22,7 @@
|
||||
|
||||
package me.lucko.luckperms.sponge.migration;
|
||||
|
||||
import me.lucko.luckperms.api.event.cause.CreationCause;
|
||||
import me.lucko.luckperms.common.commands.CommandException;
|
||||
import me.lucko.luckperms.common.commands.CommandResult;
|
||||
import me.lucko.luckperms.common.commands.SubCommand;
|
||||
@@ -126,7 +127,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
|
||||
}
|
||||
|
||||
// Make a LuckPerms group for the one being migrated
|
||||
plugin.getStorage().createAndLoadGroup(pexName).join();
|
||||
plugin.getStorage().createAndLoadGroup(pexName, CreationCause.INTERNAL).join();
|
||||
Group group = plugin.getGroupManager().getIfLoaded(pexName);
|
||||
migrateSubject(pexGroup, group, weight);
|
||||
plugin.getStorage().saveGroup(group);
|
||||
@@ -148,7 +149,7 @@ public class MigrationPermissionsEx extends SubCommand<Object> {
|
||||
// Migrate tracks
|
||||
log.log("Starting track migration.");
|
||||
for (Map.Entry<String, TreeMap<Integer, String>> e : tracks.entrySet()) {
|
||||
plugin.getStorage().createAndLoadTrack(e.getKey()).join();
|
||||
plugin.getStorage().createAndLoadTrack(e.getKey(), CreationCause.INTERNAL).join();
|
||||
Track track = plugin.getTrackManager().getIfLoaded(e.getKey());
|
||||
for (String groupName : e.getValue().values()) {
|
||||
Group group = plugin.getGroupManager().getIfLoaded(groupName);
|
||||
|
||||
Reference in New Issue
Block a user