SteamWar/FastAsyncWorldEdit
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved YAML classes from RegionBook from WorldGuard into WorldEdit and made everything use those.

Browse Source
This commit is contained in:
zml2008
2011-10-22 22:22:50 -07:00
parent a928349b1a
commit 52982c7c0f
13 changed files with 1126 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/sk89q/bukkit/migration/ConfigurationPermissionsResolver.java
View File

@@ -21,27 +21,27 @@ package com.sk89q.bukkit.migration;
import java.util.*;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.ConfigurationSection;
import com.sk89q.util.yaml.YAMLNode;
import com.sk89q.util.yaml.YAMLProcessor;
public class ConfigurationPermissionsResolver implements PermissionsResolver {
private Configuration config;
private YAMLProcessor config;
private Map<String, Set<String>> userPermissionsCache;
private Set<String> defaultPermissionsCache;
private Map<String, Set<String>> userGroups;
public ConfigurationPermissionsResolver(Configuration config) {
public ConfigurationPermissionsResolver(YAMLProcessor config) {
this.config = config;
}
public static ConfigurationSection generateDefaultPerms(ConfigurationSection section) {
section.set("permissions.groups.default.permissions", Arrays.asList(
public static YAMLNode generateDefaultPerms(YAMLNode section) {
section.setProperty("permissions.groups.default.permissions", new String[] {
"worldedit.reload",
"worldedit.selection",
"worlds.creative.worldedit.region"));
section.set("permissions.groups.admins.permissions", Arrays.asList("*"));
section.set("permissions.users.sk89q.permissions", Arrays.asList("worldedit"));
section.set("permissions.users.sk89q.groups", Arrays.asList("admins"));
"worlds.creative.worldedit.region"});
section.setProperty("permissions.groups.admins.permissions", new String[]{"*"});
section.setProperty("permissions.users.sk89q.permissions", new String[]{"worldedit"});
section.setProperty("permissions.users.sk89q.groups", new String[]{"admins"});
return section;
}
@@ -52,12 +52,12 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
Map<String, Set<String>> userGroupPermissions = new HashMap<String, Set<String>>();
List<String> groupKeys = config.getList("permissions.groups");
List<String> groupKeys = config.getStringList("permissions.groups", null);
if (groupKeys != null) {
for (String key : groupKeys) {
List<String> permissions =
config.getList("permissions.groups." + key + ".permissions", null);
config.getStringList("permissions.groups." + key + ".permissions", null);
if (permissions.size() > 0) {
Set<String> groupPerms = new HashSet<String>(permissions);
@@ -70,21 +70,21 @@ public class ConfigurationPermissionsResolver implements PermissionsResolver {
}
}
List<String> userKeys = config.getList("permissions.users");
List<String> userKeys = config.getStringList("permissions.users", null);
if (userKeys != null) {
for (String key : userKeys) {
Set<String> permsCache = new HashSet<String>();
List<String> permissions =
config.getList("permissions.users." + key + ".permissions", null);
config.getStringList("permissions.users." + key + ".permissions", null);
if (permissions.size() > 0) {
permsCache.addAll(permissions);
}
List<String> groups =
config.getList("permissions.users." + key + ".groups", null);
config.getStringList("permissions.users." + key + ".groups", null);
groups.add("default");
if (groups.size() > 0) {