Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-03-02 11:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Some misc cleanup for migration commands

Browse Source
This commit is contained in:
Luck 2020-07-25 16:56:52 +01:00
parent d8020e77fe
commit 9659333d0e
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationParentCommand.java
View File

@ -25,7 +25,7 @@
package me.lucko.luckperms.common.commands.migration;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableMap;
import me.lucko.luckperms.common.command.CommandResult;
import me.lucko.luckperms.common.command.abstraction.ChildCommand;
@ -47,17 +47,17 @@ import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
public class MigrationParentCommand extends ParentCommand<Object, Void> {
private static final Map<String, String> PLUGINS = ImmutableBiMap.<String, String>builder()
private static final Map<String, String> PLUGINS = ImmutableMap.<String, String>builder()
// bukkit
.put("me.lucko.luckperms.bukkit.migration.MigrationGroupManager", "org.anjocaido.groupmanager.GroupManager")
.put("me.lucko.luckperms.bukkit.migration.MigrationPermissionsEx", "ru.tehkode.permissions.bukkit.PermissionsEx")
.put("me.lucko.luckperms.bukkit.migration.MigrationPowerfulPerms", "com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin")
.put("me.lucko.luckperms.bukkit.migration.MigrationZPermissions", "org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService")
.put("me.lucko.luckperms.bukkit.migration.MigrationBPermissions", "de.bananaco.bpermissions.api.WorldManager")
.put("me.lucko.luckperms.bukkit.migration.MigrationPermissionsBukkit", "com.platymuus.bukkit.permissions.PermissionsPlugin")
.put("org.anjocaido.groupmanager.GroupManager", "me.lucko.luckperms.bukkit.migration.MigrationGroupManager")
.put("ru.tehkode.permissions.bukkit.PermissionsEx", "me.lucko.luckperms.bukkit.migration.MigrationPermissionsEx")
.put("com.github.gustav9797.PowerfulPermsAPI.PowerfulPermsPlugin", "me.lucko.luckperms.bukkit.migration.MigrationPowerfulPerms")
.put("org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService", "me.lucko.luckperms.bukkit.migration.MigrationZPermissions")
.put("de.bananaco.bpermissions.api.WorldManager", "me.lucko.luckperms.bukkit.migration.MigrationBPermissions")
.put("com.platymuus.bukkit.permissions.PermissionsPlugin", "me.lucko.luckperms.bukkit.migration.MigrationPermissionsBukkit")
// bungee
.put("me.lucko.luckperms.bungee.migration.MigrationBungeePerms", "net.alpenblock.bungeeperms.BungeePerms")
.build().inverse();
.put("net.alpenblock.bungeeperms.BungeePerms", "me.lucko.luckperms.bungee.migration.MigrationBungeePerms")
.build();
private final ReentrantLock lock = new ReentrantLock();
private List<Command<Object>> commands = null;

26
common/src/main/java/me/lucko/luckperms/common/commands/migration/MigrationUtils.java
View File

@ -37,20 +37,14 @@ public final class MigrationUtils {
private MigrationUtils() {}
public static NodeBuilder<?, ?> parseNode(String permission, boolean value) {
if (permission.startsWith("-") || permission.startsWith("!")) {
if (permission.length() == 1) {
return NodeBuilders.determineMostApplicable(permission).value(value);
if (permission.length() > 1) {
if (permission.charAt(0) == '-' || permission.charAt(0) == '!') {
permission = permission.substring(1);
value = false;
} else if (permission.charAt(0) == '+') {
permission = permission.substring(1);
value = true;
}
permission = permission.substring(1);
value = false;
} else if (permission.startsWith("+")) {
if (permission.length() == 1) {
return NodeBuilders.determineMostApplicable(permission).value(value);
}
permission = permission.substring(1);
value = true;
}
return NodeBuilders.determineMostApplicable(permission).value(value);
@ -62,7 +56,11 @@ public final class MigrationUtils {
}
public static String standardizeName(String string) {
return string.trim().replace(':', '-').replace(' ', '-').replace('.', '-').toLowerCase();
return string.trim()
.replace(':', '-')
.replace(' ', '-')
.replace('.', '-')
.toLowerCase();
}
}