Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Refactor Vault provider world rewriting

Browse Source
This commit is contained in:
Luck 2020-01-14 15:18:45 +00:00
parent 352f3bd263
commit 4c83d439af
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 139 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultChat.java
View File

@ -33,7 +33,6 @@ import org.bukkit.entity.Player;
import java.util.Objects;
import java.util.UUID;
import java.util.function.Function;
/**
* An extended abstraction of the Vault {@link Chat} API.
@ -53,10 +52,6 @@ import java.util.function.Function;
@SuppressWarnings("deprecation")
public abstract class AbstractVaultChat extends Chat {
// when upgrading and forwarding requests, all world strings are passed through this function.
// it lets the overriding class define some custom behaviour for world handling.
protected Function<String, String> worldMappingFunction = Function.identity();
// the permission api instance
private final AbstractVaultPermission permissionApi;
@ -87,14 +82,14 @@ public abstract class AbstractVaultChat extends Chat {
// utility methods for parsing metadata values from strings
private static String strConvert(String s, String def) {
private static String parseString(String s, String def) {
if (s == null) {
return def;
}
return s;
}
private static int intConvert(String s, int def) {
private static int parseInt(String s, int def) {
if (s == null) {
return def;
}
@ -105,7 +100,7 @@ public abstract class AbstractVaultChat extends Chat {
}
}
private static double doubleConvert(String s, double def) {
private static double parseDouble(String s, double def) {
if (s == null) {
return def;
}
@ -116,7 +111,7 @@ public abstract class AbstractVaultChat extends Chat {
}
}
private static boolean booleanConvert(String s, boolean def) {
private static boolean parseBoolean(String s, boolean def) {
if (s == null) {
return def;
}
@ -129,502 +124,503 @@ public abstract class AbstractVaultChat extends Chat {
}
}
private String world(String world) {
return this.worldMappingFunction.apply(world);
/* allow implementations to override and implement custom world remapping / handling rules */
protected String convertWorld(String world) {
return world;
}
private String world(World world) {
private String convertWorld(World world) {
if (world == null) {
return null;
}
return world(world.getName());
return convertWorld(world.getName());
}
private String world(Player player) {
private String convertWorld(Player player) {
if (player == null) {
return null;
}
return world(player.getWorld());
return convertWorld(player.getWorld());
}
@Override
public final String getPlayerPrefix(String world, String player) {
Objects.requireNonNull(player, "player");
return getUserChatPrefix(world(world), this.permissionApi.lookupUuid(player));
return getUserChatPrefix(convertWorld(world), this.permissionApi.lookupUuid(player));
}
@Override
public final String getPlayerPrefix(String world, OfflinePlayer player) {
Objects.requireNonNull(player, "player");
return getUserChatPrefix(world(world), player.getUniqueId());
return getUserChatPrefix(convertWorld(world), player.getUniqueId());
}
@Override
public final String getPlayerPrefix(World world, String player) {
Objects.requireNonNull(player, "player");
return getUserChatPrefix(world(world), this.permissionApi.lookupUuid(player));
return getUserChatPrefix(convertWorld(world), this.permissionApi.lookupUuid(player));
}
@Override
public final String getPlayerPrefix(Player player) {
Objects.requireNonNull(player, "player");
return getUserChatPrefix(world(player), ((OfflinePlayer) player).getUniqueId());
return getUserChatPrefix(convertWorld(player), ((OfflinePlayer) player).getUniqueId());
}
@Override
public final void setPlayerPrefix(String world, String player, String prefix) {
Objects.requireNonNull(player, "player");
setUserChatPrefix(world(world), this.permissionApi.lookupUuid(player), prefix);
setUserChatPrefix(convertWorld(world), this.permissionApi.lookupUuid(player), prefix);
}
@Override
public final void setPlayerPrefix(String world, OfflinePlayer player, String prefix) {
Objects.requireNonNull(player, "player");
setUserChatPrefix(world(world), player.getUniqueId(), prefix);
setUserChatPrefix(convertWorld(world), player.getUniqueId(), prefix);
}
@Override
public final void setPlayerPrefix(World world, String player, String prefix) {
Objects.requireNonNull(player, "player");
setUserChatPrefix(world(world), this.permissionApi.lookupUuid(player), prefix);
setUserChatPrefix(convertWorld(world), this.permissionApi.lookupUuid(player), prefix);
}
@Override
public final void setPlayerPrefix(Player player, String prefix) {
Objects.requireNonNull(player, "player");
setUserChatPrefix(world(player), ((OfflinePlayer) player).getUniqueId(), prefix);
setUserChatPrefix(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), prefix);
}
@Override
public final String getPlayerSuffix(String world, String player) {
Objects.requireNonNull(player, "player");
return getUserChatSuffix(world(world), this.permissionApi.lookupUuid(player));
return getUserChatSuffix(convertWorld(world), this.permissionApi.lookupUuid(player));
}
@Override
public final String getPlayerSuffix(String world, OfflinePlayer player) {
Objects.requireNonNull(player, "player");
return getUserChatSuffix(world(world), player.getUniqueId());
return getUserChatSuffix(convertWorld(world), player.getUniqueId());
}
@Override
public final String getPlayerSuffix(World world, String player) {
Objects.requireNonNull(player, "player");
return getUserChatSuffix(world(world), this.permissionApi.lookupUuid(player));
return getUserChatSuffix(convertWorld(world), this.permissionApi.lookupUuid(player));
}
@Override
public final String getPlayerSuffix(Player player) {
Objects.requireNonNull(player, "player");
return getUserChatSuffix(world(player), ((OfflinePlayer) player).getUniqueId());
return getUserChatSuffix(convertWorld(player), ((OfflinePlayer) player).getUniqueId());
}
@Override
public final void setPlayerSuffix(String world, String player, String suffix) {
Objects.requireNonNull(player, "player");
setUserChatSuffix(world(world), this.permissionApi.lookupUuid(player), suffix);
setUserChatSuffix(convertWorld(world), this.permissionApi.lookupUuid(player), suffix);
}
@Override
public final void setPlayerSuffix(String world, OfflinePlayer player, String suffix) {
Objects.requireNonNull(player, "player");
setUserChatSuffix(world(world), player.getUniqueId(), suffix);
setUserChatSuffix(convertWorld(world), player.getUniqueId(), suffix);
}
@Override
public final void setPlayerSuffix(World world, String player, String suffix) {
Objects.requireNonNull(player, "player");
setUserChatSuffix(world(world), this.permissionApi.lookupUuid(player), suffix);
setUserChatSuffix(convertWorld(world), this.permissionApi.lookupUuid(player), suffix);
}
@Override
public final void setPlayerSuffix(Player player, String suffix) {
Objects.requireNonNull(player, "player");
setUserChatSuffix(world(player), ((OfflinePlayer) player).getUniqueId(), suffix);
setUserChatSuffix(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), suffix);
}
@Override
public final String getGroupPrefix(String world, String group) {
Objects.requireNonNull(group, "group");
return getGroupChatPrefix(world(world), group);
return getGroupChatPrefix(convertWorld(world), group);
}
@Override
public final String getGroupPrefix(World world, String group) {
Objects.requireNonNull(group, "group");
return getGroupChatPrefix(world(world), group);
return getGroupChatPrefix(convertWorld(world), group);
}
@Override
public final void setGroupPrefix(String world, String group, String prefix) {
Objects.requireNonNull(group, "group");
setGroupChatPrefix(world(world), group, prefix);
setGroupChatPrefix(convertWorld(world), group, prefix);
}
@Override
public final void setGroupPrefix(World world, String group, String prefix) {
Objects.requireNonNull(group, "group");
setGroupChatPrefix(world(world), group, prefix);
setGroupChatPrefix(convertWorld(world), group, prefix);
}
@Override
public final String getGroupSuffix(String world, String group) {
Objects.requireNonNull(group, "group");
return getGroupChatSuffix(world(world), group);
return getGroupChatSuffix(convertWorld(world), group);
}
@Override
public final String getGroupSuffix(World world, String group) {
Objects.requireNonNull(group, "group");
return getGroupChatSuffix(world(world), group);
return getGroupChatSuffix(convertWorld(world), group);
}
@Override
public final void setGroupSuffix(String world, String group, String suffix) {
Objects.requireNonNull(group, "group");
setGroupChatSuffix(world(world), group, suffix);
setGroupChatSuffix(convertWorld(world), group, suffix);
}
@Override
public final void setGroupSuffix(World world, String group, String suffix) {
Objects.requireNonNull(group, "group");
setGroupChatSuffix(world(world), group, suffix);
setGroupChatSuffix(convertWorld(world), group, suffix);
}
@Override
public final int getPlayerInfoInteger(String world, OfflinePlayer player, String node, int defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return intConvert(getUserMeta(world(world), player.getUniqueId(), node), defaultValue);
return parseInt(getUserMeta(convertWorld(world), player.getUniqueId(), node), defaultValue);
}
@Override
public final int getPlayerInfoInteger(String world, String player, String node, int defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return intConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseInt(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final int getPlayerInfoInteger(World world, String player, String node, int defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return intConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseInt(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final int getPlayerInfoInteger(Player player, String node, int defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return intConvert(getUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
return parseInt(getUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
}
@Override
public final void setPlayerInfoInteger(String world, OfflinePlayer player, String node, int value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), player.getUniqueId(), node, value);
setUserMeta(convertWorld(world), player.getUniqueId(), node, value);
}
@Override
public final void setPlayerInfoInteger(String world, String player, String node, int value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoInteger(World world, String player, String node, int value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoInteger(Player player, String node, int value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node, value);
setUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node, value);
}
@Override
public final int getGroupInfoInteger(String world, String group, String node, int defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return intConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseInt(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final int getGroupInfoInteger(World world, String group, String node, int defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return intConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseInt(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final void setGroupInfoInteger(String world, String group, String node, int value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final void setGroupInfoInteger(World world, String group, String node, int value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final double getPlayerInfoDouble(String world, OfflinePlayer player, String node, double defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return doubleConvert(getUserMeta(world(world), player.getUniqueId(), node), defaultValue);
return parseDouble(getUserMeta(convertWorld(world), player.getUniqueId(), node), defaultValue);
}
@Override
public final double getPlayerInfoDouble(String world, String player, String node, double defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return doubleConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseDouble(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final double getPlayerInfoDouble(World world, String player, String node, double defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return doubleConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseDouble(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final double getPlayerInfoDouble(Player player, String node, double defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return doubleConvert(getUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
return parseDouble(getUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
}
@Override
public final void setPlayerInfoDouble(String world, OfflinePlayer player, String node, double value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), player.getUniqueId(), node, value);
setUserMeta(convertWorld(world), player.getUniqueId(), node, value);
}
@Override
public final void setPlayerInfoDouble(String world, String player, String node, double value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoDouble(World world, String player, String node, double value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoDouble(Player player, String node, double value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node, value);
setUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node, value);
}
@Override
public final double getGroupInfoDouble(String world, String group, String node, double defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return doubleConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseDouble(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final double getGroupInfoDouble(World world, String group, String node, double defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return doubleConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseDouble(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final void setGroupInfoDouble(String world, String group, String node, double value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final void setGroupInfoDouble(World world, String group, String node, double value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final boolean getPlayerInfoBoolean(String world, OfflinePlayer player, String node, boolean defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return booleanConvert(getUserMeta(world(world), player.getUniqueId(), node), defaultValue);
return parseBoolean(getUserMeta(convertWorld(world), player.getUniqueId(), node), defaultValue);
}
@Override
public final boolean getPlayerInfoBoolean(String world, String player, String node, boolean defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return booleanConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseBoolean(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final boolean getPlayerInfoBoolean(World world, String player, String node, boolean defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return booleanConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseBoolean(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final boolean getPlayerInfoBoolean(Player player, String node, boolean defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return booleanConvert(getUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
return parseBoolean(getUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
}
@Override
public final void setPlayerInfoBoolean(String world, OfflinePlayer player, String node, boolean value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), player.getUniqueId(), node, value);
setUserMeta(convertWorld(world), player.getUniqueId(), node, value);
}
@Override
public final void setPlayerInfoBoolean(String world, String player, String node, boolean value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoBoolean(World world, String player, String node, boolean value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoBoolean(Player player, String node, boolean value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node, value);
setUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node, value);
}
@Override
public final boolean getGroupInfoBoolean(String world, String group, String node, boolean defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return booleanConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseBoolean(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final boolean getGroupInfoBoolean(World world, String group, String node, boolean defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return booleanConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseBoolean(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final void setGroupInfoBoolean(String world, String group, String node, boolean value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final void setGroupInfoBoolean(World world, String group, String node, boolean value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final String getPlayerInfoString(String world, OfflinePlayer player, String node, String defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return strConvert(getUserMeta(world(world), player.getUniqueId(), node), defaultValue);
return parseString(getUserMeta(convertWorld(world), player.getUniqueId(), node), defaultValue);
}
@Override
public final String getPlayerInfoString(String world, String player, String node, String defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return strConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseString(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final String getPlayerInfoString(World world, String player, String node, String defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return strConvert(getUserMeta(world(world), this.permissionApi.lookupUuid(player), node), defaultValue);
return parseString(getUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node), defaultValue);
}
@Override
public final String getPlayerInfoString(Player player, String node, String defaultValue) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
return strConvert(getUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
return parseString(getUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node), defaultValue);
}
@Override
public final void setPlayerInfoString(String world, OfflinePlayer player, String node, String value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), player.getUniqueId(), node, value);
setUserMeta(convertWorld(world), player.getUniqueId(), node, value);
}
@Override
public final void setPlayerInfoString(String world, String player, String node, String value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoString(World world, String player, String node, String value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(world), this.permissionApi.lookupUuid(player), node, value);
setUserMeta(convertWorld(world), this.permissionApi.lookupUuid(player), node, value);
}
@Override
public final void setPlayerInfoString(Player player, String node, String value) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(node, "node");
setUserMeta(world(player), ((OfflinePlayer) player).getUniqueId(), node, value);
setUserMeta(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), node, value);
}
@Override
public final String getGroupInfoString(String world, String group, String node, String defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return strConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseString(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final String getGroupInfoString(World world, String group, String node, String defaultValue) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
return strConvert(getGroupMeta(world(world), group, node), defaultValue);
return parseString(getGroupMeta(convertWorld(world), group, node), defaultValue);
}
@Override
public final void setGroupInfoString(String world, String group, String node, String value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override
public final void setGroupInfoString(World world, String group, String node, String value) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(node, "node");
setGroupMeta(world(world), group, node, value);
setGroupMeta(convertWorld(world), group, node, value);
}
@Override

97
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/AbstractVaultPermission.java
View File

@ -34,7 +34,6 @@ import org.bukkit.plugin.java.JavaPlugin;
import java.util.Objects;
import java.util.UUID;
import java.util.function.Function;
/**
* An extended abstraction of the Vault {@link Permission} API.
@ -53,11 +52,6 @@ import java.util.function.Function;
*/
@SuppressWarnings("deprecation")
public abstract class AbstractVaultPermission extends Permission {
// when upgrading and forwarding requests, all world strings are passed through this function.
// it lets the overriding class define some custom behaviour for world handling.
protected Function<String, String> worldMappingFunction = Function.identity();
public AbstractVaultPermission() {
super.plugin = JavaPlugin.getProvidingPlugin(Permission.class);
}
@ -94,36 +88,37 @@ public abstract class AbstractVaultPermission extends Permission {
public abstract boolean groupAddPermission(String world, String name, String permission);
public abstract boolean groupRemovePermission(String world, String name, String permission);
private String world(String world) {
return this.worldMappingFunction.apply(world);
/* allow implementations to override and implement custom world remapping / handling rules */
protected String convertWorld(String world) {
return world;
}
private String world(World world) {
private String convertWorld(World world) {
if (world == null) {
return null;
}
return world(world.getName());
return convertWorld(world.getName());
}
private String world(Player player) {
private String convertWorld(Player player) {
if (player == null) {
return null;
}
return world(player.getWorld());
return convertWorld(player.getWorld());
}
@Override
public final boolean has(String world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userHasPermission(world(world), lookupUuid(player), permission);
return userHasPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean has(World world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userHasPermission(world(world), lookupUuid(player), permission);
return userHasPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
@ -137,21 +132,21 @@ public abstract class AbstractVaultPermission extends Permission {
public final boolean playerHas(String world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userHasPermission(world(world), lookupUuid(player), permission);
return userHasPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerHas(World world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userHasPermission(world(world), lookupUuid(player), permission);
return userHasPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerHas(String world, OfflinePlayer player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userHasPermission(world(world), player.getUniqueId(), permission);
return userHasPermission(convertWorld(world), player.getUniqueId(), permission);
}
@Override
@ -165,229 +160,229 @@ public abstract class AbstractVaultPermission extends Permission {
public final boolean playerAdd(String world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userAddPermission(world(world), lookupUuid(player), permission);
return userAddPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerAdd(World world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userAddPermission(world(world), lookupUuid(player), permission);
return userAddPermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerAdd(String world, OfflinePlayer player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userAddPermission(world(world), player.getUniqueId(), permission);
return userAddPermission(convertWorld(world), player.getUniqueId(), permission);
}
@Override
public final boolean playerAdd(Player player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userAddPermission(world(player), ((OfflinePlayer) player).getUniqueId(), permission);
return userAddPermission(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), permission);
}
@Override
public final boolean playerRemove(String world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userRemovePermission(world(world), lookupUuid(player), permission);
return userRemovePermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerRemove(String world, OfflinePlayer player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userRemovePermission(world(world), player.getUniqueId(), permission);
return userRemovePermission(convertWorld(world), player.getUniqueId(), permission);
}
@Override
public final boolean playerRemove(World world, String player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userRemovePermission(world(world), lookupUuid(player), permission);
return userRemovePermission(convertWorld(world), lookupUuid(player), permission);
}
@Override
public final boolean playerRemove(Player player, String permission) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(permission, "permission");
return userRemovePermission(world(player), ((OfflinePlayer) player).getUniqueId(), permission);
return userRemovePermission(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), permission);
}
@Override
public final boolean groupHas(String world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupHasPermission(world(world), group, permission);
return groupHasPermission(convertWorld(world), group, permission);
}
@Override
public final boolean groupHas(World world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupHasPermission(world(world), group, permission);
return groupHasPermission(convertWorld(world), group, permission);
}
@Override
public final boolean groupAdd(String world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupAddPermission(world(world), group, permission);
return groupAddPermission(convertWorld(world), group, permission);
}
@Override
public final boolean groupAdd(World world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupAddPermission(world(world), group, permission);
return groupAddPermission(convertWorld(world), group, permission);
}
@Override
public final boolean groupRemove(String world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupRemovePermission(world(world), group, permission);
return groupRemovePermission(convertWorld(world), group, permission);
}
@Override
public final boolean groupRemove(World world, String group, String permission) {
Objects.requireNonNull(group, "group");
Objects.requireNonNull(permission, "permission");
return groupRemovePermission(world(world), group, permission);
return groupRemovePermission(convertWorld(world), group, permission);
}
@Override
public final boolean playerInGroup(String world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userInGroup(world(world), lookupUuid(player), group);
return userInGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerInGroup(World world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userInGroup(world(world), lookupUuid(player), group);
return userInGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerInGroup(String world, OfflinePlayer player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userInGroup(world(world), player.getUniqueId(), group);
return userInGroup(convertWorld(world), player.getUniqueId(), group);
}
@Override
public final boolean playerInGroup(Player player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userInGroup(world(player), ((OfflinePlayer) player).getUniqueId(), group);
return userInGroup(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), group);
}
@Override
public final boolean playerAddGroup(String world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userAddGroup(world(world), lookupUuid(player), group);
return userAddGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerAddGroup(World world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userAddGroup(world(world), lookupUuid(player), group);
return userAddGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerAddGroup(String world, OfflinePlayer player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userAddGroup(world(world), player.getUniqueId(), group);
return userAddGroup(convertWorld(world), player.getUniqueId(), group);
}
@Override
public final boolean playerAddGroup(Player player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userAddGroup(world(player), ((OfflinePlayer) player).getUniqueId(), group);
return userAddGroup(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), group);
}
@Override
public final boolean playerRemoveGroup(String world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userRemoveGroup(world(world), lookupUuid(player), group);
return userRemoveGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerRemoveGroup(World world, String player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userRemoveGroup(world(world), lookupUuid(player), group);
return userRemoveGroup(convertWorld(world), lookupUuid(player), group);
}
@Override
public final boolean playerRemoveGroup(String world, OfflinePlayer player, String group) {
Objects.requireNonNull(player, "player");
Objects.requireNonNull(group, "group");
return userRemoveGroup(world(world), player.getUniqueId(), group);
return userRemoveGroup(convertWorld(world), player.getUniqueId(), group);
}
@Override
public final boolean playerRemoveGroup(Player player, String group) {
Objects.requireNonNull(player, "player");
return userRemoveGroup(world(player), ((OfflinePlayer) player).getUniqueId(), group);
return userRemoveGroup(convertWorld(player), ((OfflinePlayer) player).getUniqueId(), group);
}
@Override
public final String[] getPlayerGroups(String world, String player) {
Objects.requireNonNull(player, "player");
return userGetGroups(world(world), lookupUuid(player));
return userGetGroups(convertWorld(world), lookupUuid(player));
}
@Override
public final String[] getPlayerGroups(World world, String player) {
Objects.requireNonNull(player, "player");
return userGetGroups(world(world), lookupUuid(player));
return userGetGroups(convertWorld(world), lookupUuid(player));
}
@Override
public final String[] getPlayerGroups(String world, OfflinePlayer player) {
Objects.requireNonNull(player, "player");
return userGetGroups(world(world), player.getUniqueId());
return userGetGroups(convertWorld(world), player.getUniqueId());
}
@Override
public final String[] getPlayerGroups(Player player) {
Objects.requireNonNull(player, "player");
return userGetGroups(world(player), ((OfflinePlayer) player).getUniqueId());
return userGetGroups(convertWorld(player), ((OfflinePlayer) player).getUniqueId());
}
@Override
public final String getPrimaryGroup(String world, String player) {
Objects.requireNonNull(player, "player");
return userGetPrimaryGroup(world(world), lookupUuid(player));
return userGetPrimaryGroup(convertWorld(world), lookupUuid(player));
}
@Override
public final String getPrimaryGroup(World world, String player) {
Objects.requireNonNull(player, "player");
return userGetPrimaryGroup(world(world), lookupUuid(player));
return userGetPrimaryGroup(convertWorld(world), lookupUuid(player));
}
@Override
public final String getPrimaryGroup(String world, OfflinePlayer player) {
Objects.requireNonNull(player, "player");
return userGetPrimaryGroup(world(world), player.getUniqueId());
return userGetPrimaryGroup(convertWorld(world), player.getUniqueId());
}
@Override
public final String getPrimaryGroup(Player player) {
Objects.requireNonNull(player, "player");
return userGetPrimaryGroup(world(player), ((OfflinePlayer) player).getUniqueId());
return userGetPrimaryGroup(convertWorld(player), ((OfflinePlayer) player).getUniqueId());
}
}

6
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultChat.java
View File

@ -76,7 +76,6 @@ public class LuckPermsVaultChat extends AbstractVaultChat {
super(vaultPermission);
this.plugin = plugin;
this.vaultPermission = vaultPermission;
this.worldMappingFunction = world -> vaultPermission.isIgnoreWorld() ? null : world;
}
@Override
@ -84,6 +83,11 @@ public class LuckPermsVaultChat extends AbstractVaultChat {
return "LuckPerms";
}
@Override
protected String convertWorld(String world) {
return this.vaultPermission.isIgnoreWorld() ? null : super.convertWorld(world);
}
@Override
public String getUserChatPrefix(String world, UUID uuid) {
Objects.requireNonNull(uuid, "uuid");

10
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java
View File

@ -82,11 +82,6 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
public LuckPermsVaultPermission(LPBukkitPlugin plugin) {
this.plugin = plugin;
this.worldMappingFunction = world -> isIgnoreWorld() ? null : world;
}
public LPBukkitPlugin getPlugin() {
return this.plugin;
}
@Override
@ -94,6 +89,11 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
return "LuckPerms";
}
@Override
protected String convertWorld(String world) {
return isIgnoreWorld() ? null : super.convertWorld(world);
}
@Override
public UUID lookupUuid(String player) {
Objects.requireNonNull(player, "player");