Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-09 22:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream

Browse Source 
609c7b8 Scrapped Logging Framework 4 Java

Closes #997
Closes #998
Closes #999
Closes #1000
Closes #1001
Closes #1002
This commit is contained in:
NotMyFault
2021-03-29 15:29:16 +02:00
parent 2dc89f735d
commit b96cea75b8
118 changed files with 700 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
worldedit-bukkit/src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java
View File

@ -22,9 +22,8 @@ package com.sk89q.wepif;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import org.apache.logging.log4j.Logger;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@ -38,7 +37,7 @@ import java.util.Set;
public class FlatFilePermissionsResolver implements PermissionsResolver {
private static final Logger log = LoggerFactory.getLogger(FlatFilePermissionsResolver.class);
private static final Logger LOGGER = LogManagerCompat.getLogger();
private Map<String, Set<String>> userPermissionsCache;
private Set<String> defaultPermissionsCache;
@ -99,7 +98,7 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
}
}
} catch (IOException e) {
log.warn("Failed to load permissions", e);
LOGGER.warn("Failed to load permissions", e);
} finally {
try {
if (buff != null) {
@ -165,7 +164,7 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
}
}
} catch (IOException e) {
log.warn("Failed to load permissions", e);
LOGGER.warn("Failed to load permissions", e);
} finally {
try {
if (buff != null) {

16
worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java
View File

@ -21,6 +21,8 @@ package com.sk89q.wepif;
import com.nijikokun.bukkit.Permissions.Permissions;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import org.apache.logging.log4j.Logger;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
@ -28,12 +30,10 @@ import org.bukkit.command.PluginCommand;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NijiPermissionsResolver implements PermissionsResolver {
private static final Logger log = LoggerFactory.getLogger(NijiPermissionsResolver.class);
private static final Logger LOGGER = LogManagerCompat.getLogger();
private final Server server;
private final Permissions api;
@ -85,7 +85,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
return api.Security.permission(player, permission);
}
} catch (Throwable t) {
log.warn("Failed to check permissions", t);
LOGGER.warn("Failed to check permissions", t);
return false;
}
}
@ -99,7 +99,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
return api.getHandler().has(server.getPlayerExact(name), permission);
}
} catch (Throwable t) {
log.warn("Failed to check permissions", t);
LOGGER.warn("Failed to check permissions", t);
return false;
}
}
@ -118,7 +118,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
return api.Security.inGroup(name, group);
}
} catch (Throwable t) {
log.warn("Failed to check groups", t);
LOGGER.warn("Failed to check groups", t);
return false;
}
}
@ -137,7 +137,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
} catch (Throwable t) {
String group = api.Security.getGroup(player.getWorld().getName(), player.getName());
if (group != null) {
groups = new String[] { group };
groups = new String[]{group};
}
}
if (groups == null) {
@ -146,7 +146,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
return groups;
}
} catch (Throwable t) {
log.warn("Failed to get groups", t);
LOGGER.warn("Failed to get groups", t);
return new String[0];
}
}

23
worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java
View File

@ -21,14 +21,14 @@ package com.sk89q.wepif;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import org.apache.logging.log4j.Logger;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@ -59,6 +59,8 @@ public class PermissionsResolverManager implements PermissionsResolver {
+ "# - Lines starting with # are comments and so they are ignored.\r\n"
+ "\r\n";
private static final Logger LOGGER = LogManagerCompat.getLogger();
private static PermissionsResolverManager instance;
public static void initialize(Plugin plugin) {
@ -81,7 +83,6 @@ public class PermissionsResolverManager implements PermissionsResolver {
private final Server server;
private PermissionsResolver permissionResolver;
private YAMLProcessor config;
private final Logger logger = LoggerFactory.getLogger(getClass());
private final List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<>();
@SuppressWarnings("unchecked")
@ -115,7 +116,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
break;
}
} catch (Throwable e) {
logger.warn("Error in factory method for " + resolverClass.getSimpleName(), e);
LOGGER.warn("Error in factory method for " + resolverClass.getSimpleName(), e);
continue;
}
}
@ -123,7 +124,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
permissionResolver = new ConfigurationPermissionsResolver(config);
}
permissionResolver.load();
logger.info("WEPIF: " + permissionResolver.getDetectionMessage());
LOGGER.info("WEPIF: " + permissionResolver.getDetectionMessage());
}
public void setPluginPermissionsResolver(Plugin plugin) {
@ -132,7 +133,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
}
permissionResolver = new PluginPermissionsResolver((PermissionsProvider) plugin, plugin);
logger.info("WEPIF: " + permissionResolver.getDetectionMessage());
LOGGER.info("WEPIF: " + permissionResolver.getDetectionMessage());
}
@Override
@ -191,14 +192,14 @@ public class PermissionsResolverManager implements PermissionsResolver {
try {
file.createNewFile();
} catch (IOException e) {
logger.warn("Failed to create new configuration file", e);
LOGGER.warn("Failed to create new configuration file", e);
}
}
config = new YAMLProcessor(file, false, YAMLFormat.EXTENDED);
try {
config.load();
} catch (IOException e) {
logger.warn("Error loading WEPIF configuration", e);
LOGGER.warn("Error loading WEPIF configuration", e);
}
List<String> keys = config.getKeys(null);
config.setHeader(CONFIG_HEADER);
@ -229,7 +230,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
}
if (next == null || !PermissionsResolver.class.isAssignableFrom(next)) {
logger.warn("WEPIF: Invalid or unknown class found in enabled resolvers: "
LOGGER.warn("WEPIF: Invalid or unknown class found in enabled resolvers: "
+ nextName + ". Moving to disabled resolvers list.");
i.remove();
disabledResolvers.add(nextName);
@ -243,7 +244,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
if (!stagedEnabled.contains(clazz.getSimpleName())
&& !disabledResolvers.contains(clazz.getSimpleName())) {
disabledResolvers.add(clazz.getSimpleName());
logger.info("New permissions resolver: "
LOGGER.info("New permissions resolver: "
+ clazz.getSimpleName() + " detected. "
+ "Added to disabled resolvers list.");
isUpdated = true;
@ -264,7 +265,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
isUpdated = true;
}
if (isUpdated) {
logger.info("WEPIF: Updated config file");
LOGGER.info("WEPIF: Updated config file");
config.save();
}
return isUpdated;