Added a Vault resolver to WEPIF. Means any Vault-enabled perm plugin will theoretically work with it

Dieser Commit ist enthalten in:
Matthew Miller 2018-11-18 15:58:15 +10:00 committet von IronApollo
Ursprung f3c633582e
Commit 10484eb58b
4 geänderte Dateien mit 124 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -30,6 +30,7 @@
<allow pkg="com.nijiko"/> <allow pkg="com.nijiko"/>
<allow pkg="com.nijikokun"/> <allow pkg="com.nijikokun"/>
<allow pkg="ru.tehkode"/> <allow pkg="ru.tehkode"/>
<allow pkg="net.milkbowl"/>
</subpackage> </subpackage>
<subpackage name="worldedit"> <subpackage name="worldedit">

Datei anzeigen

@ -13,7 +13,7 @@ dependencies {
compile 'com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT' compile 'com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT'
compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT' compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT'
testCompile 'org.mockito:mockito-core:1.9.0-rc1' testCompile 'org.mockito:mockito-core:1.9.0-rc1'
compile 'net.milkbowl.vault:VaultAPI:1.5.6' compile 'net.milkbowl.vault:VaultAPI:1.7'
compile 'com.massivecraft:factions:2.8.0' compile 'com.massivecraft:factions:2.8.0'
compile 'com.drtshock:factions:1.6.9.5' compile 'com.drtshock:factions:1.6.9.5'
compile 'com.factionsone:FactionsOne:1.2.2' compile 'com.factionsone:FactionsOne:1.2.2'
@ -87,4 +87,4 @@ shadowJar {
build.dependsOn(shadowJar) build.dependsOn(shadowJar)
build.finalizedBy(copyFiles) build.finalizedBy(copyFiles)
copyFiles.dependsOn(createPom) copyFiles.dependsOn(createPom)

Datei anzeigen

@ -95,6 +95,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
bPermissionsResolver.class, bPermissionsResolver.class,
GroupManagerResolver.class, GroupManagerResolver.class,
NijiPermissionsResolver.class, NijiPermissionsResolver.class,
VaultResolver.class,
DinnerPermsResolver.class, DinnerPermsResolver.class,
FlatFilePermissionsResolver.class FlatFilePermissionsResolver.class
}; };
@ -283,7 +284,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
if (plugin instanceof PermissionsProvider) { if (plugin instanceof PermissionsProvider) {
setPluginPermissionsResolver(plugin); setPluginPermissionsResolver(plugin);
} else if ("permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name) } else if ("permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name)
|| "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)) { || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)
|| "vault".equalsIgnoreCase(name)) {
load(); load();
} }
} }
@ -294,7 +296,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
if (event.getPlugin() instanceof PermissionsProvider if (event.getPlugin() instanceof PermissionsProvider
|| "permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name) || "permissions".equalsIgnoreCase(name) || "permissionsex".equalsIgnoreCase(name)
|| "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)) { || "bpermissions".equalsIgnoreCase(name) || "groupmanager".equalsIgnoreCase(name)
|| "vault".equalsIgnoreCase(name)) {
load(); load();
} }
} }

Datei anzeigen

@ -0,0 +1,116 @@
/*
* WorldEdit, a Minecraft world manipulation toolkit
* Copyright (C) sk89q <http://www.sk89q.com>
* Copyright (C) WorldEdit team and contributors
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.sk89q.wepif;
import com.sk89q.util.yaml.YAMLProcessor;
import net.milkbowl.vault.permission.Permission;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.plugin.RegisteredServiceProvider;
public class VaultResolver implements PermissionsResolver {
private static Permission perms = null;
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
if (server.getPluginManager().getPlugin("Vault") == null) {
return null;
}
RegisteredServiceProvider<Permission> rsp = server.getServicesManager().getRegistration(Permission.class);
perms = rsp.getProvider();
if (perms == null) {
return null;
}
return new VaultResolver(server);
}
private final Server server;
public VaultResolver(Server server) {
this.server = server;
}
@Override
public void load() {
}
@Override
public String getDetectionMessage() {
return "Vault detected! Using Vault for permissions";
}
@Override
public boolean hasPermission(String name, String permission) {
return hasPermission(server.getOfflinePlayer(name), permission);
}
@Override
public boolean hasPermission(String worldName, String name, String permission) {
return hasPermission(worldName, server.getOfflinePlayer(name), permission);
}
@Override
public boolean inGroup(String player, String group) {
return inGroup(server.getOfflinePlayer(player), group);
}
@Override
public String[] getGroups(String player) {
return getGroups(server.getOfflinePlayer(player));
}
@Override
public boolean hasPermission(OfflinePlayer player, String permission) {
Player onlinePlayer = player.getPlayer();
if (onlinePlayer == null) {
return perms.playerHas(null, player, permission);
} else {
return perms.playerHas(onlinePlayer.getWorld().getName(), player, permission);
}
}
@Override
public boolean hasPermission(String worldName, OfflinePlayer player, String permission) {
return hasPermission(worldName, player.getName(), permission);
}
@Override
public boolean inGroup(OfflinePlayer player, String group) {
Player onlinePlayer = player.getPlayer();
if (onlinePlayer == null) {
return perms.playerInGroup(null, player, group);
} else {
return perms.playerInGroup(onlinePlayer, group);
}
}
@Override
public String[] getGroups(OfflinePlayer player) {
Player onlinePlayer = player.getPlayer();
if (onlinePlayer == null) {
return perms.getPlayerGroups(null, player);
} else {
return perms.getPlayerGroups(onlinePlayer);
}
}
}