Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-16 22:03:53 +00:00
Code Issues 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) {

4
src/main/java/com/sk89q/bukkit/migration/DinnerPermsResolver.java
View File

@ -19,6 +19,7 @@
package com.sk89q.bukkit.migration;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Server;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
@ -26,7 +27,6 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.configuration.Configuration;
public class DinnerPermsResolver implements PermissionsResolver {
@ -37,7 +37,7 @@ public class DinnerPermsResolver implements PermissionsResolver {
this.server = server;
}
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
return new DinnerPermsResolver(server);
}

5
src/main/java/com/sk89q/bukkit/migration/FlatFilePermissionsResolver.java
View File

@ -28,8 +28,9 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.HashMap;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Server;
import org.bukkit.configuration.Configuration;
public class FlatFilePermissionsResolver implements PermissionsResolver {
private Map<String, Set<String>> userPermissionsCache;
@ -39,7 +40,7 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
protected File groupFile;
protected File userFile;
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
File groups = new File("perms_groups.txt");
File users = new File("perms_users.txt");

28
src/main/java/com/sk89q/bukkit/migration/NijiPermissionsResolver.java
View File

@ -19,6 +19,7 @@
package com.sk89q.bukkit.migration;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.command.PluginCommand;
@ -26,13 +27,12 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import com.nijikokun.bukkit.Permissions.Permissions;
import org.bukkit.configuration.Configuration;
public class NijiPermissionsResolver implements PermissionsResolver {
private Server server;
private Permissions api;
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
PluginManager pluginManager = server.getPluginManager();
Plugin plugin = pluginManager.getPlugin("Permissions");
@ -62,7 +62,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public boolean hasPermission(String name, String permission) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return false;
try {
return api.getHandler().has(player, permission);
@ -80,7 +80,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
try {
return api.getHandler().has(worldName, name, permission);
} catch (Throwable t) {
return api.getHandler().has(server.getPlayer(name), permission);
return api.getHandler().has(server.getPlayerExact(name), permission);
}
} catch (Throwable t) {
t.printStackTrace();
@ -91,7 +91,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public boolean inGroup(String name, String group) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return false;
try {
return api.getHandler().inGroup(player.getWorld().getName(), name, group);
@ -107,7 +107,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
@SuppressWarnings("static-access")
public String[] getGroups(String name) {
try {
Player player = server.getPlayer(name);
Player player = server.getPlayerExact(name);
if (player == null) return new String[0];
String[] groups = null;
try {
@ -127,22 +127,6 @@ public class NijiPermissionsResolver implements PermissionsResolver {
}
}
public static class PluginAccessException extends Exception {
private static final long serialVersionUID = 7044832912491608706L;
}
@Deprecated
public static boolean checkRealNijiPerms(boolean ignoreBridges) {
if (!ignoreBridges) {
return true;
}
PluginCommand permsCommand = Bukkit.getServer().getPluginCommand("permissions");
if (permsCommand == null) {
return false;
}
return permsCommand.getPlugin().getDescription().getName().equals("Permissions");
}
public static boolean isFakeNijiPerms(Plugin plugin) {
PluginCommand permsCommand = Bukkit.getServer().getPluginCommand("permissions");

5
src/main/java/com/sk89q/bukkit/migration/PermissionsExResolver.java
View File

@ -19,19 +19,18 @@
package com.sk89q.bukkit.migration;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import ru.tehkode.permissions.PermissionManager;
import ru.tehkode.permissions.PermissionUser;
import org.bukkit.configuration.Configuration;
public class PermissionsExResolver implements PermissionsResolver {
private final PermissionManager manager;
private final Server server;
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
PermissionManager manager = server.getServicesManager().load(PermissionManager.class);
if (manager == null) {

52
src/main/java/com/sk89q/bukkit/migration/PermissionsResolverManager.java
View File

@ -23,14 +23,12 @@ import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Server;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.file.YamlConfigurationOptions;
import org.bukkit.plugin.Plugin;
import org.bukkit.configuration.Configuration;
public class PermissionsResolverManager implements PermissionsResolver {
private static final String CONFIG_HEADER = "#\r\n" +
@ -59,7 +57,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
private Server server;
private PermissionsResolver permissionResolver;
private PermissionsResolverServerListener listener;
private FileConfiguration config;
private YAMLProcessor config;
private String name;
private Logger logger;
private List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<Class<? extends PermissionsResolver>>();
@ -95,7 +93,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
public void findResolver() {
for (Class<? extends PermissionsResolver> resolverClass : enabledResolvers) {
try {
Method factoryMethod = resolverClass.getMethod("factory", Server.class, Configuration.class);
Method factoryMethod = resolverClass.getMethod("factory", Server.class, YAMLProcessor.class);
this.permissionResolver = (PermissionsResolver) factoryMethod.invoke(null, this.server, this.config);
@ -153,27 +151,33 @@ public class PermissionsResolverManager implements PermissionsResolver {
e.printStackTrace();
}
}
config = YamlConfiguration.loadConfiguration(file);
((YamlConfigurationOptions)config.options()).indent(4);
Set<String> keys = config.getKeys(true);
config.options().header(CONFIG_HEADER);
config = new YAMLProcessor(file, false, YAMLFormat.EXTENDED);
try {
config.load();
} catch (IOException e) {
logger.severe("Error loading WEPIF Config: " + e);
e.printStackTrace();
}
List<String> keys = config.getKeys(null);
config.setHeader(CONFIG_HEADER);
if (!keys.contains("ignore-nijiperms-bridges")) {
config.set("ignore-nijiperms-bridges", true);
config.setProperty("ignore-nijiperms-bridges", true);
isUpdated = true;
}
if (!keys.contains("resolvers.enabled")) {
if (!keys.contains("resolvers")) {
List<String> resolverKeys = config.getKeys("resolvers");
List<String> resolvers = new ArrayList<String>();
for (Class<?> clazz : availableResolvers) {
resolvers.add(clazz.getSimpleName());
}
enabledResolvers.addAll(Arrays.asList(availableResolvers));
config.set("resolvers.enabled", resolvers);
config.setProperty("resolvers.enabled", resolvers);
isUpdated = true;
} else {
List<String> disabledResolvers = config.getList("resolvers.disabled", new ArrayList<String>());
List<String> stagedEnabled = config.getList("resolvers.enabled");
List<String> disabledResolvers = config.getStringList("resolvers.disabled", new ArrayList<String>());
List<String> stagedEnabled = config.getStringList("resolvers.enabled", null);
for (Iterator<String> i = stagedEnabled.iterator(); i.hasNext();) {
String nextName = i.next();
Class<?> next = null;
@ -202,27 +206,23 @@ public class PermissionsResolverManager implements PermissionsResolver {
isUpdated = true;
}
}
config.set("resolvers.disabled", disabledResolvers);
config.set("resolvers.enabled", stagedEnabled);
config.setProperty("resolvers.disabled", disabledResolvers);
config.setProperty("resolvers.enabled", stagedEnabled);
}
if (keys.contains("dinner-perms") || keys.contains("dinnerperms")) {
config.set("dinner-perms", null);
config.set("dinnerperms", null);
config.setProperty("dinner-perms", null);
config.setProperty("dinnerperms", null);
isUpdated = true;
}
if (!keys.contains("permissions")) {
ConfigurationPermissionsResolver.generateDefaultPerms(
config.createSection("permissions"));
config.addNode("permissions"));
isUpdated = true;
}
if (isUpdated) {
logger.info("WEPIF: Updated config file");
try {
config.save(file);
} catch (IOException e) {
logger.log(Level.SEVERE, "WEPIF: Unable to save config file", e);
}
config.save();
}
return isUpdated;
}

4
src/main/java/com/sk89q/bukkit/migration/PluginPermissionsResolver.java
View File

@ -19,17 +19,17 @@
package com.sk89q.bukkit.migration;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.Server;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.configuration.Configuration;
public class PluginPermissionsResolver implements PermissionsResolver {
protected PermissionsProvider resolver;
protected Plugin plugin;
public static PermissionsResolver factory(Server server, Configuration config) {
public static PermissionsResolver factory(Server server, YAMLProcessor config) {
// Looking for service
RegisteredServiceProvider<PermissionsProvider> serviceProvider = server.getServicesManager().getRegistration(PermissionsProvider.class);