Migrate to SLF4J

worldedit-bukkit/build.gradle

@@ -4,6 +4,8 @@ apply plugin: 'maven'
 
 repositories {
     maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
+    maven { url "https://repo.codemc.org/repository/maven-public" }
+    maven { url 'https://papermc.io/repo/repository/maven-public/' }
 }
 
 dependencies {
@@ -12,6 +14,7 @@ dependencies {
     compile 'com.sk89q:dummypermscompat:1.10'
     compile 'com.destroystokyo.paper:paper-api:1.13.2-R0.1-SNAPSHOT'
     compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT'
+    compile 'org.slf4j:slf4j-jdk14:1.7.26'
     testCompile 'org.mockito:mockito-core:1.9.0-rc1'
     compile 'com.massivecraft:factions:2.8.0'
     compile 'com.drtshock:factions:1.6.9.5'

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java

@@ -49,20 +49,21 @@ import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;
 import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements BukkitImplAdapter<NBTBase>{
 
-    private final Logger logger = Logger.getLogger(getClass().getCanonicalName());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final Field nbtListTagListField;
     private final Method nbtCreateTagMethod;
@@ -348,7 +349,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
             return Collections.emptyMap();
         }
         if (block == null) {
-            logger.warning("Failed to find properties for " + blockType.getId());
+            logger.warn("Failed to find properties for " + blockType.getId());
             return Collections.emptyMap();
         }
         Map<String, Property<?>> properties = Maps.newLinkedHashMap();
@@ -414,7 +415,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
             try {
                 return toNativeList((NBTTagList) foreign);
             } catch (Throwable e) {
-                logger.log(Level.WARNING, "Failed to convert NBTTagList", e);
+                logger.warn("Failed to convert NBTTagList", e);
                 return new ListTag(ByteTag.class, new ArrayList<ByteTag>());
             }
         } else if (foreign instanceof NBTTagLong) {

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

@@ -22,6 +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 java.io.BufferedReader;
 import java.io.File;
@@ -32,12 +34,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class FlatFilePermissionsResolver implements PermissionsResolver {
 
-    private static final Logger log = Logger.getLogger(FlatFilePermissionsResolver.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(FlatFilePermissionsResolver.class);
 
     private Map<String, Set<String>> userPermissionsCache;
     private Set<String> defaultPermissionsCache;
@@ -98,7 +98,7 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
                 }
             }
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to load permissions", e);
+            log.warn("Failed to load permissions", e);
         } finally {
             try {
                 if (buff != null) {
@@ -164,7 +164,7 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
                 }
             }
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to load permissions", e);
+            log.warn("Failed to load permissions", e);
         } finally {
             try {
                 if (buff != null) {

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

@@ -28,13 +28,12 @@ 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 java.util.logging.Level;
+import org.slf4j.LoggerFactory;
-import java.util.logging.Logger;
 
 public class NijiPermissionsResolver implements PermissionsResolver {
 
-    private static final Logger log = Logger.getLogger(NijiPermissionsResolver.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(NijiPermissionsResolver.class);
 
     private Server server;
     private Permissions api;
@@ -84,7 +83,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
                 return api.Security.permission(player, permission);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check permissions", t);
+            log.warn("Failed to check permissions", t);
             return false;
         }
     }
@@ -98,7 +97,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
                 return api.getHandler().has(server.getPlayerExact(name), permission);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check permissions", t);
+            log.warn("Failed to check permissions", t);
             return false;
         }
     }
@@ -115,7 +114,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
                 return api.Security.inGroup(name, group);
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to check groups", t);
+            log.warn("Failed to check groups", t);
             return false;
         }
     }
@@ -139,7 +138,7 @@ public class NijiPermissionsResolver implements PermissionsResolver {
                 return groups;
             }
         } catch (Throwable t) {
-            log.log(Level.WARNING, "Failed to get groups", t);
+            log.warn("Failed to get groups", t);
             return new String[0];
         }
     }

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

@@ -27,6 +27,8 @@ 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;
@@ -35,8 +37,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class PermissionsResolverManager implements PermissionsResolver {
 
@@ -85,7 +85,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
     private Server server;
     private PermissionsResolver permissionResolver;
     private YAMLProcessor config;
-    private Logger logger = Logger.getLogger(getClass().getCanonicalName());
+    private Logger logger = LoggerFactory.getLogger(getClass());
     private List<Class<? extends PermissionsResolver>> enabledResolvers = new ArrayList<>();
 
     @SuppressWarnings("unchecked")
@@ -119,7 +119,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
                     break;
                 }
             } catch (Throwable e) {
-                logger.log(Level.WARNING, "Error in factory method for " + resolverClass.getSimpleName(), e);
+                logger.warn("Error in factory method for " + resolverClass.getSimpleName(), e);
                 continue;
             }
         }
@@ -195,14 +195,14 @@ public class PermissionsResolverManager implements PermissionsResolver {
             try {
                 file.createNewFile();
             } catch (IOException e) {
-                logger.log(Level.WARNING, "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.log(Level.WARNING, "Error loading WEPIF configuration", e);
+            logger.warn("Error loading WEPIF configuration", e);
         }
         List<String> keys = config.getKeys(null);
         config.setHeader(CONFIG_HEADER);
@@ -232,7 +232,7 @@ public class PermissionsResolverManager implements PermissionsResolver {
                 } catch (ClassNotFoundException e) {}
 
                 if (next == null || !PermissionsResolver.class.isAssignableFrom(next)) {
-                    logger.warning("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);

worldedit-bukkit/src/main/java/com/sk89q/wepif/VaultResolver.java

@@ -35,9 +35,6 @@ public class VaultResolver implements PermissionsResolver {
             return null;
         }
         RegisteredServiceProvider<Permission> rsp = server.getServicesManager().getRegistration(Permission.class);
-        if (rsp == null) {
-            return null;
-        }
         perms = rsp.getProvider();
         if (perms == null) {
             return null;

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java

@@ -54,18 +54,18 @@ public class BukkitBlockRegistry extends BundledBlockRegistry {
             BlockMaterial result = adapter.getMaterial(blockType);
             if (result != null) return result;
         }
-        Material type = BukkitAdapter.adapt(blockType);
+        Material mat = BukkitAdapter.adapt(blockType);
-        if (type == null) {
+        if (mat == null) {
             if (blockType == BlockTypes.__RESERVED__) return new PassthroughBlockMaterial(super.getMaterial(BlockTypes.AIR));
             return new PassthroughBlockMaterial(null);
         }
         if (materialMap == null) {
             materialMap = new BukkitBlockMaterial[Material.values().length];
         }
-        BukkitBlockMaterial result = materialMap[type.ordinal()];
+        BukkitBlockMaterial result = materialMap[mat.ordinal()];
         if (result == null) {
-            result = new BukkitBlockMaterial(BukkitBlockRegistry.super.getMaterial(blockType), type);
+            result = new BukkitBlockMaterial(BukkitBlockRegistry.super.getMaterial(blockType), mat);
-            materialMap[type.ordinal()] = result;
+            materialMap[mat.ordinal()] = result;
         }
         return result;
     }
@@ -84,9 +84,8 @@ public class BukkitBlockRegistry extends BundledBlockRegistry {
     @Nullable
     @Override
     public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
-        BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
+        if (WorldEditPlugin.getInstance().getBukkitImplAdapter() != null) {
-        if (adapter != null) {
+            return WorldEditPlugin.getInstance().getBukkitImplAdapter().getProperties(blockType);
-            return adapter.getProperties(blockType);
         }
         return super.getProperties(blockType);
     }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java

@@ -19,8 +19,6 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.sk89q.bukkit.util.CommandInspector;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -29,12 +27,14 @@ import com.sk89q.worldedit.util.command.Description;
 import com.sk89q.worldedit.util.command.Dispatcher;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.logging.Logger;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 class BukkitCommandInspector implements CommandInspector {
 
-    private static final Logger logger = Logger.getLogger(BukkitCommandInspector.class.getCanonicalName());
+    private static final Logger logger = LoggerFactory.getLogger(BukkitCommandInspector.class);
     private final WorldEditPlugin plugin;
     private final Dispatcher dispatcher;
 
@@ -51,7 +51,7 @@ class BukkitCommandInspector implements CommandInspector {
         if (mapping != null) {
             return mapping.getDescription().getDescription();
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return "Help text not available";
         }
     }
@@ -63,7 +63,7 @@ class BukkitCommandInspector implements CommandInspector {
             Description description = mapping.getDescription();
             return "Usage: " + description.getUsage() + (description.getHelp() != null ? "\n" + description.getHelp() : "");
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return "Help text not available";
         }
     }
@@ -76,7 +76,7 @@ class BukkitCommandInspector implements CommandInspector {
             locals.put(Actor.class, plugin.wrapCommandSender(sender));
             return mapping.getCallable().testPermission(locals);
         } else {
-            logger.warning("BukkitCommandInspector doesn't know how about the command '" + command + "'");
+            logger.warn("BukkitCommandInspector doesn't know how about the command '" + command + "'");
             return false;
         }
     }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java

@@ -22,6 +22,7 @@ package com.sk89q.worldedit.bukkit;
 import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.util.YAMLConfiguration;
 import com.sk89q.worldedit.util.report.Unreported;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
@@ -34,7 +35,7 @@ public class BukkitConfiguration extends YAMLConfiguration {
     @Unreported private final WorldEditPlugin plugin;
 
     public BukkitConfiguration(YAMLProcessor config, WorldEditPlugin plugin) {
-        super(config, plugin.getLogger());
+        super(config, LoggerFactory.getLogger(plugin.getLogger().getName()));
         this.plugin = plugin;
     }
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java

@@ -49,4 +49,4 @@ public class BukkitItemCategoryRegistry implements ItemCategoryRegistry {
     public Set<ItemType> getAll(Category<ItemType> category) {
         return getCategorisedByName(category.getId());
     }
-}
+}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

@@ -149,7 +149,7 @@ public class BukkitServerInterface implements MultiUserPlatform {
 
     @Override
     public String getPlatformName() {
-        return "bukkit";
+        return "Bukkit";
     }
 
     @Override

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -48,6 +48,7 @@ import org.bukkit.block.Chest;
 import org.bukkit.entity.Entity;
 import org.bukkit.inventory.DoubleChestInventory;
 import org.bukkit.inventory.Inventory;
+import org.slf4j.Logger;
 
 import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
@@ -56,8 +57,7 @@ import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
+
-import java.util.logging.Logger;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BukkitWorld extends AbstractWorld {
@@ -118,9 +118,9 @@ public class BukkitWorld extends AbstractWorld {
                     return null;
                 }
             } catch (Exception e) {
-                logger.warning("Corrupt entity found when creating: " + entity.getType().getId());
+                logger.warn("Corrupt entity found when creating: " + entity.getType().getId());
                 if (entity.getNbtData() != null) {
-                    logger.warning(entity.getNbtData().toString());
+                    logger.warn(entity.getNbtData().toString());
                 }
                 e.printStackTrace();
                 return null;
@@ -183,7 +183,7 @@ public class BukkitWorld extends AbstractWorld {
             try {
                 getWorld().regenerateChunk(chunk.getBlockX(), chunk.getBlockZ());
             } catch (Throwable t) {
-                logger.log(Level.WARNING, "Chunk generation via Bukkit raised an error", t);
+                logger.warn("Chunk generation via Bukkit raised an error", t);
             }
 
             // Then restore
@@ -280,7 +280,7 @@ public class BukkitWorld extends AbstractWorld {
         treeTypeMapping.put(TreeGenerator.TreeType.RANDOM_MUSHROOM, TreeType.BROWN_MUSHROOM);
         for (TreeGenerator.TreeType type : TreeGenerator.TreeType.values()) {
             if (treeTypeMapping.get(type) == null) {
-                WorldEdit.logger.severe("No TreeType mapping for TreeGenerator.TreeType." + type);
+                WorldEdit.logger.error("No TreeType mapping for TreeGenerator.TreeType." + type);
             }
         }
     }
@@ -425,9 +425,9 @@ public class BukkitWorld extends AbstractWorld {
             try {
                 return adapter.setBlock(BukkitAdapter.adapt(getWorld(), position), block, notifyAndLight);
             } catch (Exception e) {
-                if (block instanceof BaseBlock && ((BaseBlock)block).getNbtData() != null) {
+                if (block instanceof BaseBlock && ((BaseBlock) block).getNbtData() != null) {
-                    logger.warning("Tried to set a corrupt tile entity at " + position.toString());
+                    logger.warn("Tried to set a corrupt tile entity at " + position.toString());
-                    logger.warning(((BaseBlock)block).getNbtData().toString());
+                    logger.warn(((BaseBlock) block).getNbtData().toString());
                 }
                 e.printStackTrace();
                 Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -33,24 +33,46 @@ import com.sk89q.worldedit.bukkit.adapter.AdapterLoadException;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplLoader;
 import com.sk89q.worldedit.event.platform.CommandEvent;
+import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
 import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
+import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Capability;
-import com.sk89q.worldedit.extension.platform.NoCapablePlatformException;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.registry.state.Property;
+import com.sk89q.worldedit.world.biome.BiomeType;
+import com.sk89q.worldedit.world.block.BlockCategory;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.FuzzyBlockState;
+import com.sk89q.worldedit.world.entity.EntityType;
+import com.sk89q.worldedit.world.item.ItemCategory;
+import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.block.Biome;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.*;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +81,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -67,10 +88,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * Plugin for Bukkit.
  */
-public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
+public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
-{
 
-    private static final Logger log = Logger.getLogger("FastAsyncWorldEdit");
+    private static final Logger log = LoggerFactory.getLogger(WorldEditPlugin.class);
     public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
     private static WorldEditPlugin INSTANCE;
 
@@ -220,18 +240,18 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
                 }
             }
         }
-        {
+//        {
-            Logger logger = getLogger();
+//            Logger logger = getLogger();
-            if (logger != null) {
+//            if (logger != null) {
-                try {
+//                try {
-                    Field nameField = Logger.class.getDeclaredField("name");
+//                    Field nameField = Logger.class.getDeclaredField("name");
-                    nameField.setAccessible(true);
+//                    nameField.setAccessible(true);
-                    nameField.set(logger, "FastAsyncWorldEdit");
+//                    nameField.set(logger, "FastAsyncWorldEdit");
-                } catch (Throwable ignore) {
+//                } catch (Throwable ignore) {
-                    ignore.printStackTrace();
+//                    ignore.printStackTrace();
-                }
+//                }
-            }
+//            }
-        }
+//        }
         {
             File pluginsFolder = MainUtil.getJarFile().getParentFile();
             for (File file : pluginsFolder.listFiles()) {
@@ -245,7 +265,7 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
                     e.printStackTrace();
                 }
             }
-            log.log(Level.INFO, "Please restart the server if you have any plugins which depend on FAWE.");
+            getLogger().info("Please restart the server if you have any plugins which depend on FAWE.");
         }
     }
 
@@ -253,7 +273,7 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
         try {
             run.run();
         } catch (Throwable e) {
-            log.log(Level.SEVERE, message);
+            getLogger().severe(message);
             e.printStackTrace();
         }
     }
@@ -264,7 +284,7 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
             config = new BukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "config-legacy.yml"), true), this);
             config.load();
         } catch (Throwable e) {
-            log.log(Level.SEVERE, "Failed to load config.yml");
+            getLogger().severe("Failed to load config.yml");
             e.printStackTrace();
         }
         // Create schematics folder
@@ -280,37 +300,33 @@ public class WorldEditPlugin extends JavaPlugin //implements TabCompleter
         BukkitImplLoader adapterLoader = new BukkitImplLoader();
         try {
             adapterLoader.addClass(Spigot_v1_13_R2.class);
-        } catch (Throwable ignore) {
+        } catch (Throwable throwable) {
-            ignore.printStackTrace();
+            throwable.printStackTrace();
         }
 
         try {
             adapterLoader.addFromPath(getClass().getClassLoader());
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to search path for Bukkit adapters");
+            log.warn("Failed to search path for Bukkit adapters");
         }
 
         try {
             adapterLoader.addFromJar(getFile());
         } catch (IOException e) {
-            log.log(Level.WARNING, "Failed to search " + getFile() + " for Bukkit adapters", e);
+            log.warn("Failed to search " + getFile() + " for Bukkit adapters", e);
         }
         try {
             bukkitAdapter = adapterLoader.loadAdapter();
-            log.log(Level.INFO, "Using " + bukkitAdapter.getClass().getCanonicalName() + " as the Bukkit adapter");
+            log.info("Using " + bukkitAdapter.getClass().getCanonicalName() + " as the Bukkit adapter");
         } catch (AdapterLoadException e) {
-            try {
+            Platform platform = worldEdit.getPlatformManager().queryCapability(Capability.WORLD_EDITING);
-                Platform platform = worldEdit.getPlatformManager().queryCapability(Capability.WORLD_EDITING);
+            if (platform instanceof BukkitServerInterface) {
-                if (platform instanceof BukkitServerInterface) {
+                log.warn(e.getMessage());
-                    log.log(Level.WARNING, e.getMessage());
+            } else {
-                    return;
+                log.info("WorldEdit could not find a Bukkit adapter for this MC version, " +
-                } else {
+                        "but it seems that you have another implementation of WorldEdit installed (" + platform.getPlatformName() + ") " +
-                    log.log(Level.INFO, "WorldEdit could not find a Bukkit adapter for this MC version, " +
+                        "that handles the world editing.");
-                            "but it seems that you have another implementation of WorldEdit installed (" + platform.getPlatformName() + ") " +
+            }
-                            "that handles the world editing.");
-                }
-            } catch (NoCapablePlatformException ignore) {}
-            log.log(Level.INFO, "WorldEdit could not find a Bukkit adapter for this MC version");
         }
     }
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java

@@ -20,6 +20,8 @@
 package com.sk89q.worldedit.bukkit.adapter;
 
 import com.sk89q.worldedit.util.io.Closer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -29,15 +31,13 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Loads Bukkit implementation adapters.
  */
 public class BukkitImplLoader {
 
-    private static final Logger log = Logger.getLogger(BukkitImplLoader.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(BukkitImplLoader.class);
     private final List<String> adapterCandidates = new ArrayList<>();
     private String customCandidate;
 
@@ -73,7 +73,7 @@ public class BukkitImplLoader {
         if (className != null) {
             customCandidate = className;
             adapterCandidates.add(className);
-            log.log(Level.INFO, "-Dworldedit.bukkit.adapter used to add " + className + " to the list of available Bukkit adapters");
+            log.info("-Dworldedit.bukkit.adapter used to add " + className + " to the list of available Bukkit adapters");
         }
     }
 
@@ -161,19 +161,18 @@ public class BukkitImplLoader {
                 if (BukkitImplAdapter.class.isAssignableFrom(cls)) {
                     return (BukkitImplAdapter) cls.newInstance();
                 } else {
-                    log.log(Level.WARNING, "Failed to load the Bukkit adapter class '" + className +
+                    log.warn("Failed to load the Bukkit adapter class '" + className +
                             "' because it does not implement " + BukkitImplAdapter.class.getCanonicalName());
                 }
             } catch (ClassNotFoundException e) {
-                log.log(Level.WARNING, "Failed to load the Bukkit adapter class '" + className +
+                log.warn("Failed to load the Bukkit adapter class '" + className +
                         "' that is not supposed to be missing", e);
             } catch (IllegalAccessException e) {
-                log.log(Level.WARNING, "Failed to load the Bukkit adapter class '" + className +
+                log.warn("Failed to load the Bukkit adapter class '" + className +
                         "' that is not supposed to be raising this error", e);
             } catch (Throwable e) {
-                e.printStackTrace();
                 if (className.equals(customCandidate)) {
-                    log.log(Level.WARNING, "Failed to load the Bukkit adapter class '" + className + "'", e);
+                    log.warn("Failed to load the Bukkit adapter class '" + className + "'", e);
                 }
             }
         }

worldedit-core/build.gradle

@@ -1,87 +1,89 @@
-apply plugin: 'eclipse'
+apply plugin: 'eclipse'
-apply plugin: 'idea'
+apply plugin: 'idea'
-repositories {
+repositories {
-    maven {url "http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/"}
+    maven {url "http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/"}
-}
+}
-dependencies {
+dependencies {
-    compile 'de.schlichtherle:truezip:6.8.3'
+    compile 'de.schlichtherle:truezip:6.8.3'
-    compile 'rhino:js:1.7R2'
+    compile 'rhino:js:1.7R2'
-    compile 'com.google.guava:guava:21.0'
+    compile 'com.google.guava:guava:21.0'
-    compile 'com.sk89q:jchronic:0.2.4a'
+    compile 'com.sk89q:jchronic:0.2.4a'
-    compile 'com.google.code.findbugs:jsr305:1.3.9'
+    compile 'com.google.code.findbugs:jsr305:1.3.9'
-    compile 'com.thoughtworks.paranamer:paranamer:2.6'
+    compile 'com.thoughtworks.paranamer:paranamer:2.6'
-    compile 'com.google.code.gson:gson:2.8.0'
+    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.sk89q.lib:jlibnoise:1.0.0'
+    compile 'com.sk89q.lib:jlibnoise:1.0.0'
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
+    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    testCompile 'org.mockito:mockito-core:1.9.0-rc1'
+    compile 'org.slf4j:slf4j-api:1.7.26'
-
+    //compile 'net.sf.trove4j:trove4j:3.0.3'
-    // Fawe depends
+    testCompile 'org.mockito:mockito-core:1.9.0-rc1'
-    compile 'org.yaml:snakeyaml:1.19'
+
-    compile 'net.fabiozumbi12:redprotect:1.9.6'
+    // Fawe depends
-    compile ("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") {
+    compile 'org.yaml:snakeyaml:1.19'
-        transitive = false
+    compile 'net.fabiozumbi12:redprotect:1.9.6'
-    }
+    compile ("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") {
-    compile 'com.github.luben:zstd-jni:1.1.1'
+        transitive = false
-    compile 'co.aikar:fastutil-lite:1.0'
+    }
-}
+    compile 'com.github.luben:zstd-jni:1.1.1'
-
+    compile 'co.aikar:fastutil-lite:1.0'
-sourceSets {
+}
-    main {
+
-        java {
+sourceSets {
-            srcDir 'src/main/java'
+    main {
-            srcDir 'src/legacy/java'
+        java {
-        }
+            srcDir 'src/main/java'
-        resources {
+            srcDir 'src/legacy/java'
-            srcDir 'src/main/resources'
+        }
-        }
+        resources {
-    }
+            srcDir 'src/main/resources'
-}
+        }
-
+    }
-processResources {
+}
-    from('src/main/resources') {
+
-        include 'fawe.properties'
+processResources {
-        expand(
+    from('src/main/resources') {
-                internalVersion: "${project.parent.version}",
+        include 'fawe.properties'
-                name: project.parent.name,
+        expand(
-        )
+                internalVersion: "${project.parent.version}",
-    }
+                name: project.parent.name,
-}
+        )
-
+    }
-jar.archiveName="fawe-api-${project.parent.version}.jar"
+}
-jar.destinationDir = file '../mvn/com/boydti/fawe-api/' + project.parent.version
+
-task createPom << {
+jar.archiveName="fawe-api-${project.parent.version}.jar"
-    pom {
+jar.destinationDir = file '../mvn/com/boydti/fawe-api/' + project.parent.version
-        project {
+task createPom << {
-            groupId 'com.boydti'
+    pom {
-            artifactId 'fawe-api'
+        project {
-            version project.parent.version
+            groupId 'com.boydti'
-        }
+            artifactId 'fawe-api'
-    }
+            version project.parent.version
-    .getEffectivePom()
+        }
-            .setDependencies(new ArrayList<>())
+    }
-            .writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom")
+    .getEffectivePom()
-    pom {
+            .setDependencies(new ArrayList<>())
-        project {
+            .writeTo("../mvn/com/boydti/fawe-api/${project.parent.version}/fawe-api-${project.parent.version}.pom")
-            groupId 'com.boydti'
+    pom {
-            artifactId 'fawe-api'
+        project {
-            version 'latest'
+            groupId 'com.boydti'
-        }
+            artifactId 'fawe-api'
-    }
+            version 'latest'
-    .getEffectivePom()
+        }
-            .setDependencies(new ArrayList<>())
+    }
-            .writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom")
+    .getEffectivePom()
-}
+            .setDependencies(new ArrayList<>())
-task copyFiles {
+            .writeTo("../mvn/com/boydti/fawe-api/latest/fawe-api-latest.pom")
-    doLast {
+}
-        copy {
+task copyFiles {
-            from "../mvn/com/boydti/fawe-api/${project.parent.version}/"
+    doLast {
-            into '../mvn/com/boydti/fawe-api/latest/'
+        copy {
-            include('*.jar')
+            from "../mvn/com/boydti/fawe-api/${project.parent.version}/"
-            rename ("fawe-api-${project.parent.version}.jar", 'fawe-api-latest.jar')
+            into '../mvn/com/boydti/fawe-api/latest/'
-        }
+            include('*.jar')
-    }
+            rename ("fawe-api-${project.parent.version}.jar", 'fawe-api-latest.jar')
-}
+        }
-
+    }
-build.dependsOn(shadowJar)
+}
-build.finalizedBy(copyFiles)
+
-copyFiles.dependsOn(createPom)
+build.dependsOn(shadowJar)
+build.finalizedBy(copyFiles)
+copyFiles.dependsOn(createPom)

worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java

@@ -25,6 +25,7 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.util.gson.GsonUtil;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
+
 import java.util.HashMap;
 import java.util.Map;
 

worldedit-core/src/main/java/com/boydti/fawe/configuration/serialization/ConfigurationSerialization.java

@@ -1,16 +1,16 @@
 package com.boydti.fawe.configuration.serialization;
 
+import com.boydti.fawe.configuration.Configuration;
+import org.slf4j.LoggerFactory;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
- * Utility class for storing and retrieving classes for {@link com.boydti.fawe.configuration.Configuration}.
+ * Utility class for storing and retrieving classes for {@link Configuration}.
  */
 public class ConfigurationSerialization {
 
@@ -27,7 +27,7 @@ public class ConfigurationSerialization {
      * Attempts to deserialize the given arguments into a new instance of the
      * given class.
      * <p>
-     * <p>The class must implement {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable}, including
+     * <p>The class must implement {@link ConfigurationSerializable}, including
      * the extra methods as specified in the javadoc of
      * ConfigurationSerializable.</p>
      * <p>
@@ -39,7 +39,7 @@ public class ConfigurationSerialization {
      * @return New instance of the specified class
      */
     public static ConfigurationSerializable deserializeObject(Map<String, ?> args, Class<? extends ConfigurationSerializable> clazz) {
-        return new com.boydti.fawe.configuration.serialization.ConfigurationSerialization(clazz).deserialize(args);
+        return new ConfigurationSerialization(clazz).deserialize(args);
     }
 
     /**
@@ -47,7 +47,7 @@ public class ConfigurationSerialization {
      * <p>
      * given class.
      * <p>
-     * The class must implement {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable}, including
+     * The class must implement {@link ConfigurationSerializable}, including
      * the extra methods as specified in the javadoc of
      * ConfigurationSerializable.</p>
      * <p>
@@ -80,17 +80,17 @@ public class ConfigurationSerialization {
             throw new IllegalArgumentException("Args doesn't contain type key ('" + SERIALIZED_TYPE_KEY + "')");
         }
 
-        return new com.boydti.fawe.configuration.serialization.ConfigurationSerialization(clazz).deserialize(args);
+        return new ConfigurationSerialization(clazz).deserialize(args);
     }
 
     /**
-     * Registers the given {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable} class by its
+     * Registers the given {@link ConfigurationSerializable} class by its
      * alias.
      *
      * @param clazz Class to register
      */
     public static void registerClass(Class<? extends ConfigurationSerializable> clazz) {
-        com.boydti.fawe.configuration.serialization.DelegateDeserialization delegate = clazz.getAnnotation(com.boydti.fawe.configuration.serialization.DelegateDeserialization.class);
+        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
 
         if (delegate == null) {
             registerClass(clazz, getAlias(clazz));
@@ -99,19 +99,18 @@ public class ConfigurationSerialization {
     }
 
     /**
-     * Registers the given alias to the specified {@link
+     * Registers the given alias to the specified {@link ConfigurationSerializable} class.
-     * com.boydti.fawe.configuration.serialization.ConfigurationSerializable} class.
      *
      * @param clazz Class to register
      * @param alias Alias to register as
-     * @see com.boydti.fawe.configuration.serialization.SerializableAs
+     * @see SerializableAs
      */
     public static void registerClass(Class<? extends ConfigurationSerializable> clazz, String alias) {
         aliases.put(alias, clazz);
     }
 
     /**
-     * Unregisters the specified alias to a {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable}
+     * Unregisters the specified alias to a {@link ConfigurationSerializable}
      *
      * @param alias Alias to unregister
      */
@@ -120,8 +119,7 @@ public class ConfigurationSerialization {
     }
 
     /**
-     * Unregisters any aliases for the specified {@link
+     * Unregisters any aliases for the specified {@link ConfigurationSerializable} class.
-     * com.boydti.fawe.configuration.serialization.ConfigurationSerializable} class.
      *
      * @param clazz Class to unregister
      */
@@ -131,7 +129,7 @@ public class ConfigurationSerialization {
     }
 
     /**
-     * Attempts to get a registered {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable} class by
+     * Attempts to get a registered {@link ConfigurationSerializable} class by
      * its alias.
      *
      * @param alias Alias of the serializable
@@ -142,14 +140,14 @@ public class ConfigurationSerialization {
     }
 
     /**
-     * Gets the correct alias for the given {@link com.boydti.fawe.configuration.serialization.ConfigurationSerializable}
+     * Gets the correct alias for the given {@link ConfigurationSerializable}
      * class.
      *
      * @param clazz Class to get alias for
      * @return Alias to use for the class
      */
     public static String getAlias(Class<? extends ConfigurationSerializable> clazz) {
-        com.boydti.fawe.configuration.serialization.DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
+        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
 
         if (delegate != null) {
             if ((delegate.value() == null) || (delegate.value() == clazz)) {
@@ -180,9 +178,7 @@ public class ConfigurationSerialization {
             }
 
             return method;
-        } catch (NoSuchMethodException ex) {
+        } catch (NoSuchMethodException | SecurityException ex) {
-            return null;
-        } catch (SecurityException ex) {
             return null;
         }
     }
@@ -190,9 +186,7 @@ public class ConfigurationSerialization {
     protected Constructor<? extends ConfigurationSerializable> getConstructor() {
         try {
             return this.clazz.getConstructor(Map.class);
-        } catch (NoSuchMethodException ex) {
+        } catch (NoSuchMethodException | SecurityException ex) {
-            return null;
-        } catch (SecurityException ex) {
             return null;
         }
     }
@@ -202,14 +196,13 @@ public class ConfigurationSerialization {
             ConfigurationSerializable result = (ConfigurationSerializable) method.invoke(null, args);
 
             if (result == null) {
-                Logger.getLogger(com.boydti.fawe.configuration.serialization.ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                LoggerFactory.getLogger(ConfigurationSerialization.class).error(
                         "Could not call method '" + method.toString() + "' of " + this.clazz + " for deserialization: method returned null");
             } else {
                 return result;
             }
         } catch (Throwable ex) {
-            Logger.getLogger(com.boydti.fawe.configuration.serialization.ConfigurationSerialization.class.getName())
+            LoggerFactory.getLogger(ConfigurationSerialization.class).error("Could not call method '" + method.toString() + "' of " + this.clazz
-                    .log(Level.SEVERE, "Could not call method '" + method.toString() + "' of " + this.clazz
                                     + " for deserialization",
                             ex instanceof InvocationTargetException ? ex.getCause() : ex);
         }
@@ -221,8 +214,7 @@ public class ConfigurationSerialization {
         try {
             return ctor.newInstance(args);
         } catch (Throwable ex) {
-            Logger.getLogger(com.boydti.fawe.configuration.serialization.ConfigurationSerialization.class.getName())
+            LoggerFactory.getLogger(ConfigurationSerialization.class).error("Could not call constructor '" + ctor.toString() + "' of " + this.clazz
-                    .log(Level.SEVERE, "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
                                     + " for deserialization",
                             ex instanceof InvocationTargetException ? ex.getCause() : ex);
         }

worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/SimpleInjector.java

@@ -19,14 +19,15 @@
 
 package com.sk89q.minecraft.util.commands;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class SimpleInjector implements Injector {
 
-    private static final Logger log = Logger.getLogger(SimpleInjector.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(SimpleInjector.class);
     private Object[] args;
     private Class<?>[] argClasses;
 
@@ -45,7 +46,7 @@ public class SimpleInjector implements Injector {
             ctr.setAccessible(true);
             return ctr.newInstance(args);
         } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
-            log.log(Level.SEVERE, "Error initializing commands class " + clazz, e);
+            log.error("Error initializing commands class " + clazz, e);
             return null;
         }
     }

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -95,6 +95,8 @@ import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 import com.sk89q.worldedit.world.block.*;
 import com.sk89q.worldedit.world.weather.WeatherType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -108,12 +110,15 @@ import static com.sk89q.worldedit.regions.Regions.*;
 /**
  * An {@link Extent} that handles history, {@link BlockBag}s, change limits,
  * block re-ordering, and much more. Most operations in WorldEdit use this class.
- * <p>
+ *
  * <p>Most of the actual functionality is implemented with a number of other
  * {@link Extent}s that are chained together. For example, history is logged
  * using the {@link ChangeSetExtent}.</p>
  */
 public class EditSession extends AbstractDelegateExtent implements HasFaweQueue, SimpleWorld, AutoCloseable {
+
+    private static final Logger log = LoggerFactory.getLogger(EditSession.class);
+
     /**
      * Used by {@link EditSession#setBlock(BlockVector3, BlockStateHolder, Stage)} to
      * determine which {@link Extent}s should be bypassed.
@@ -2901,8 +2906,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
                     }
 
                     return BlockTypes.get((int) typeVariable.getValue()).withPropertyId((int) dataVariable.getValue()).toBaseBlock();
-                } catch (final Exception e) {
+                } catch (Exception e) {
-                    Fawe.debug("Failed to create shape: " + e);
+                    log.warn("Failed to create shape", e);
                     return null;
                 }
             }
@@ -3299,8 +3304,8 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
                     }
 
                     return defaultBiomeType;
-                } catch (final Exception e) {
+                } catch (Exception e) {
-                    Fawe.debug("Failed to create shape: " + e);
+                    log.warn("Failed to create shape", e);
                     return null;
                 }
             }

worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java

@@ -81,7 +81,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public class LocalSession implements TextureHolder {
 
-    @Deprecated
     public transient static int MAX_HISTORY_SIZE = 15;
 
     // Non-session related fields
@@ -1260,7 +1259,7 @@ public class LocalSession implements TextureHolder {
                 String msg = e.getMessage();
                 if (msg != null && msg.length() > 256) msg = msg.substring(0, 256);
                 this.failedCuiAttempts++;
-                WorldEdit.logger.warning("Error while reading CUI init message for player " + uuid + ": " + msg);
+                WorldEdit.logger.warn("Error while reading CUI init message: " + e.getMessage());
 
             }
         }
@@ -1442,4 +1441,4 @@ public class LocalSession implements TextureHolder {
     }
 
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java

@@ -61,6 +61,8 @@ import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.registry.BundledBlockData;
 import com.sk89q.worldedit.world.registry.BundledItemData;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import javax.script.ScriptException;
@@ -76,8 +78,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static com.sk89q.worldedit.event.platform.Interaction.HIT;
 import static com.sk89q.worldedit.event.platform.Interaction.OPEN;
@@ -97,9 +97,9 @@ import static com.sk89q.worldedit.event.platform.Interaction.OPEN;
  */
 public final class WorldEdit {
 
-    public static final Logger logger = Logger.getLogger(WorldEdit.class.getCanonicalName());
+    public static final Logger logger = LoggerFactory.getLogger(WorldEdit.class);
 
-    private final static WorldEdit instance = new WorldEdit();
+    private static final WorldEdit instance = new WorldEdit();
     private static String version;
 
     private final EventBus eventBus = new EventBus();
@@ -670,13 +670,13 @@ public final class WorldEdit {
         } catch (ScriptException e) {
             player.printError("Failed to execute:");
             player.printRaw(e.getMessage());
-            logger.log(Level.WARNING, "Failed to execute script", e);
+            logger.warn("Failed to execute script", e);
         } catch (NumberFormatException | WorldEditException e) {
             throw e;
         } catch (Throwable e) {
             player.printError("Failed to execute (see console):");
             player.printRaw(e.getClass().getCanonicalName());
-            logger.log(Level.WARNING, "Failed to execute script", e);
+            logger.warn("Failed to execute script", e);
         } finally {
             for (EditSession editSession : scriptContext.getEditSessions()) {
                 editSession.flushQueue();

worldedit-core/src/main/java/com/sk89q/worldedit/command/ChunkCommands.java

@@ -35,6 +35,7 @@ import com.sk89q.worldedit.math.MathUtils;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.storage.LegacyChunkStore;
 import com.sk89q.worldedit.world.storage.McRegionChunkStore;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -184,4 +185,5 @@ public class ChunkCommands {
             player.printError(BBC.getPrefix() + "Shell script type must be configured: 'bat' or 'bash' expected.");
         }
     }
+
 }

worldedit-core/src/main/java/com/sk89q/worldedit/command/NavigationCommands.java

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
+
 import com.boydti.fawe.FaweAPI;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.util.MathMan;
@@ -35,10 +38,6 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.command.parametric.Optional;
 import com.sk89q.worldedit.world.World;
 
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
-
 /**
  * Commands for moving the player around.
  */
@@ -58,11 +57,11 @@ public class NavigationCommands {
     }
 
     @Command(
-            aliases = {"unstuck", "!"},
+        aliases = { "unstuck", "!" },
-            usage = "",
+        usage = "",
-            desc = "Escape from being stuck inside a block",
+        desc = "Escape from being stuck inside a block",
-            min = 0,
+        min = 0,
-            max = 0
+        max = 0
     )
     @CommandPermissions("worldedit.navigation.unstuck")
     public void unstuck(Player player) throws WorldEditException {
@@ -234,4 +233,4 @@ public class NavigationCommands {
     }
 
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java

@@ -48,15 +48,18 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.util.io.Closer;
 import com.sk89q.worldedit.util.io.file.FilenameException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -66,12 +69,10 @@ import java.nio.channels.ReadableByteChannel;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.atomic.LongAdder;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-
 import static com.boydti.fawe.util.ReflectionUtils.as;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Commands that work with schematic files.
@@ -79,7 +80,7 @@ import static com.boydti.fawe.util.ReflectionUtils.as;
 @Command(aliases = {"schematic", "schem", "/schematic", "/schem", "clipboard", "/clipboard"}, desc = "Commands that work with schematic files")
 public class SchematicCommands extends MethodCommands {
 
-    private static final Logger log = Logger.getLogger(SchematicCommands.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(SchematicCommands.class);
 
     /**
      * Create a new instance.
@@ -266,7 +267,7 @@ public class SchematicCommands extends MethodCommands {
             player.printError("Unknown filename: " + filename);
         } catch (URISyntaxException | IOException e) {
             player.printError("File could not be read or it does not exist: " + e.getMessage());
-            log.log(Level.WARNING, "Failed to load a saved clipboard", e);
+            log.warn("Failed to load a saved clipboard", e);
         } finally {
             if (in != null) {
                 try {
@@ -363,7 +364,7 @@ public class SchematicCommands extends MethodCommands {
         } catch (IOException e) {
             e.printStackTrace();
             player.printError("Schematic could not written: " + e.getMessage());
-            log.log(Level.WARNING, "Failed to write a saved clipboard", e);
+            log.warn("Failed to write a saved clipboard", e);
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotCommands.java

@@ -33,13 +33,13 @@ import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.world.snapshot.InvalidSnapshotException;
 import com.sk89q.worldedit.world.snapshot.Snapshot;
 import com.sk89q.worldedit.world.storage.MissingWorldException;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
-import java.util.logging.Logger;
 
 /**
  * Snapshot commands.
@@ -47,7 +47,6 @@ import java.util.logging.Logger;
 @Command(aliases = {"snapshot", "snap"}, desc = "List, load and view information related to snapshots")
 public class SnapshotCommands {
 
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
     private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
 
     private final WorldEdit we;
@@ -93,10 +92,10 @@ public class SnapshotCommands {
                 File dir = config.snapshotRepo.getDirectory();
 
                 try {
-                    logger.info("WorldEdit found no snapshots: looked in: "
+                    WorldEdit.logger.info("WorldEdit found no snapshots: looked in: "
                             + dir.getCanonicalPath());
                 } catch (IOException e) {
-                    logger.info("WorldEdit found no snapshots: looked in "
+                    WorldEdit.logger.info("WorldEdit found no snapshots: looked in "
                             + "(NON-RESOLVABLE PATH - does it exist?): "
                             + dir.getPath());
                 }
@@ -107,7 +106,7 @@ public class SnapshotCommands {
     }
 
     @Command(
-            aliases = {"use"},
+            aliases = { "use" },
             usage = "<snapshot>",
             desc = "Choose a snapshot to use",
             min = 1,
@@ -150,7 +149,7 @@ public class SnapshotCommands {
     }
 
     @Command(
-            aliases = {"sel"},
+            aliases = { "sel" },
             usage = "<index>",
             desc = "Choose the snapshot based on the list id",
             min = 1,
@@ -197,7 +196,7 @@ public class SnapshotCommands {
     }
 
     @Command(
-            aliases = {"before"},
+            aliases = { "before" },
             usage = "<date>",
             desc = "Choose the nearest snapshot before a date",
             min = 1,
@@ -236,7 +235,7 @@ public class SnapshotCommands {
     }
 
     @Command(
-            aliases = {"after"},
+            aliases = { "after" },
             usage = "<date>",
             desc = "Choose the nearest snapshot after a date",
             min = 1,
@@ -261,7 +260,8 @@ public class SnapshotCommands {
                 Snapshot snapshot = config.snapshotRepo.getSnapshotAfter(date, player.getWorld().getName());
                 if (snapshot == null) {
                     dateFormat.setTimeZone(session.getTimeZone());
-                    player.printError("Couldn't find a snapshot after " + dateFormat.format(date.getTime()) + ".");
+                    player.printError("Couldn't find a snapshot after "
+                            + dateFormat.format(date.getTime()) + ".");
                 } else {
                     session.setSnapshot(snapshot);
                     BBC.SNAPSHOT_SET.send(player, snapshot.getName());
@@ -271,4 +271,5 @@ public class SnapshotCommands {
             }
         }
     }
+
 }

worldedit-core/src/main/java/com/sk89q/worldedit/command/SnapshotUtilCommands.java

@@ -37,18 +37,15 @@ import com.sk89q.worldedit.world.snapshot.Snapshot;
 import com.sk89q.worldedit.world.snapshot.SnapshotRestore;
 import com.sk89q.worldedit.world.storage.ChunkStore;
 import com.sk89q.worldedit.world.storage.MissingWorldException;
+
 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Logger;
-
 
 import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
 
 @Command(aliases = {}, desc = "[More Info](http://wiki.sk89q.com/wiki/WorldEdit/Snapshots)")
 public class SnapshotUtilCommands {
 
-    private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
-
     private final WorldEdit we;
 
     public SnapshotUtilCommands(WorldEdit we) {
@@ -56,7 +53,7 @@ public class SnapshotUtilCommands {
     }
 
     @Command(
-            aliases = {"restore", "/restore"},
+            aliases = { "restore", "/restore" },
             usage = "[snapshot]",
             desc = "Restore the selection from a snapshot",
             min = 0,
@@ -99,10 +96,10 @@ public class SnapshotUtilCommands {
                     File dir = config.snapshotRepo.getDirectory();
 
                     try {
-                        logger.info("FAWE found no snapshots: looked in: "
+                        WorldEdit.logger.info("WorldEdit found no snapshots: looked in: "
                                 + dir.getCanonicalPath());
                     } catch (IOException e) {
-                        logger.info("FAWE found no snapshots: looked in "
+                        WorldEdit.logger.info("WorldEdit found no snapshots: looked in "
                                 + "(NON-RESOLVABLE PATH - does it exist?): "
                                 + dir.getPath());
                     }

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/SelectionCommand.java

@@ -81,20 +81,25 @@ public class SelectionCommand extends SimpleCommand<Operation> {
         if (!testPermission(locals)) {
             throw new CommandPermissionsException();
         }
+
         Contextual<? extends Operation> operationFactory = delegate.call(args, locals);
+
         Actor actor = locals.get(Actor.class);
         if (actor instanceof Player) {
             try {
                 Player player = (Player) actor;
                 LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
                 Region selection = session.getSelection(player.getWorld());
+
                 EditSession editSession = session.createEditSession(player);
                 editSession.enableQueue();
                 locals.put(EditSession.class, editSession);
                 session.tellVersion(player);
+
                 EditContext editContext = new EditContext();
                 editContext.setDestination(locals.get(EditSession.class));
                 editContext.setRegion(selection);
+
                 Operation operation = operationFactory.createFromContext(editContext);
                 // Shortcut
                 if (selection instanceof CuboidRegion && editSession.hasFastMode() && operation instanceof RegionVisitor) {
@@ -191,4 +196,4 @@ public class SelectionCommand extends SimpleCommand<Operation> {
 
 
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java

@@ -19,11 +19,6 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
 import com.google.common.collect.Lists;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
@@ -38,6 +33,11 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockState;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 /**
  * A mode that cycles the data values of supported blocks.
  */
@@ -47,7 +47,7 @@ public class BlockDataCyler implements DoubleActionBlockTool {
     public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.data-cycler");
     }
-    
+
     private Map<UUID, Property<?>> selectedProperties = new HashMap<>();
 
     private boolean handleCycle(Platform server, LocalConfiguration config,
@@ -104,7 +104,8 @@ public class BlockDataCyler implements DoubleActionBlockTool {
         		player.print("Now cycling " + currentProperty.getName());
         	}
         }
-            return true;
+
+        return true;
     }
 
     @Override

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

@@ -19,16 +19,20 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.function.pattern.BlockPattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockType;
 
 /**
  * A mode that replaces one block.

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -49,24 +49,24 @@ public class TreePlanter implements BlockTool {
     public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
 
         EditSession editSession = session.createEditSession(player);
+            try {
+                boolean successful = false;
 
-        try {
-            boolean successful = false;
                 for (int i = 0; i < 10; i++) {
                     if (treeType.generate(editSession, clicked.add(0, 1, 0).toBlockPoint())) {
                         successful = true;
                         break;
                     }
                 }
-            
+
-            if (!successful) {
+                if (!successful) {
-                player.printError("A tree can't go there.");
+                    player.printError("A tree can't go there.");
+                }
+            } catch (MaxChangedBlocksException e) {
+                player.printError("Max. blocks changed reached.");
+            } finally {
+                session.remember(editSession);
             }
-        } catch (MaxChangedBlocksException e) {
-            player.printError("Max. blocks changed reached.");
-        } finally {
-            session.remember(editSession);
-        }
 
         return true;
     }

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/CylinderBrush.java

@@ -21,10 +21,10 @@ package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class CylinderBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowCylinderBrush.java

@@ -21,9 +21,9 @@ package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class HollowCylinderBrush implements Brush {

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowSphereBrush.java

@@ -21,9 +21,9 @@ package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class HollowSphereBrush implements Brush {

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/SphereBrush.java

@@ -21,9 +21,9 @@ package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class SphereBrush implements Brush {

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java

@@ -58,8 +58,13 @@ import com.sk89q.worldedit.util.command.fluent.CommandGraph;
 import com.sk89q.worldedit.util.command.fluent.DispatcherNode;
 import com.sk89q.worldedit.util.command.parametric.*;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
+import com.sk89q.worldedit.util.formatting.ColorCodeBuilder;
+import com.sk89q.worldedit.util.formatting.component.CommandUsageBox;
 import com.sk89q.worldedit.util.logging.DynamicStreamHandler;
 import com.sk89q.worldedit.util.logging.LogFormat;
+import com.sk89q.worldedit.world.World;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -69,10 +74,8 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -80,14 +83,15 @@ import static com.sk89q.worldedit.util.command.composition.LegacyCommandAdapter.
 
 /**
  * Handles the registration and invocation of commands.
- * <p>
+ *
  * <p>This class is primarily for internal usage.</p>
  */
 public final class CommandManager {
 
     public static final Pattern COMMAND_CLEAN_PATTERN = Pattern.compile("^[/]+");
-    private static final Logger log = Logger.getLogger(CommandManager.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(CommandManager.class);
-    private static final Logger commandLog = Logger.getLogger(CommandManager.class.getCanonicalName() + ".CommandLog");
+    private static final java.util.logging.Logger commandLog =
+        java.util.logging.Logger.getLogger(CommandManager.class.getCanonicalName() + ".CommandLog");
     private static final Pattern numberFormatExceptionPattern = Pattern.compile("^For input string: \"(.*)\"$");
 
     private final WorldEdit worldEdit;
@@ -124,6 +128,7 @@ public final class CommandManager {
         commandLog.addHandler(dynamicHandler);
         dynamicHandler.setFormatter(new LogFormat());
 
+        // Set up the commands manager
         builder = new ParametricBuilder();
         builder.setAuthorizer(new ActorAuthorizer());
         builder.setDefaultCompleter(new UserCommandCompleter(platformManager));
@@ -297,7 +302,7 @@ public final class CommandManager {
     }
 
     public void register(Platform platform) {
-        log.log(Level.FINE, "Registering commands with " + platform.getClass().getCanonicalName());
+        log.info("Registering commands with " + platform.getClass().getCanonicalName());
         this.platform = null;
 
         try {
@@ -318,12 +323,12 @@ public final class CommandManager {
             File file = new File(config.getWorkingDirectory(), path);
             commandLog.setLevel(Level.ALL);
 
-            log.log(Level.INFO, "Logging WorldEdit commands to " + file.getAbsolutePath());
+            log.info("Logging WorldEdit commands to " + file.getAbsolutePath());
 
             try {
                 dynamicHandler.setHandler(new FileHandler(file.getAbsolutePath(), true));
             } catch (IOException e) {
-                log.log(Level.WARNING, "Could not use command log file " + path + ": " + e.getMessage());
+                log.warn("Could not use command log file " + path + ": " + e.getMessage());
             }
         }
 
@@ -418,7 +423,8 @@ public final class CommandManager {
         return handleCommandTask(task, locals, null, null, null, null);
     }
 
-    private Object handleCommandTask(ThrowableSupplier<Throwable> task, CommandLocals locals, @Nullable Actor actor, @Nullable LocalSession session, @Nullable Set<String> failedPermissions, @Nullable FawePlayer fp) {
+    private Object handleCommandTask(ThrowableSupplier<Throwable> task, CommandLocals locals, @Nullable
+        Actor actor, @Nullable LocalSession session, @Nullable Set<String> failedPermissions, @Nullable FawePlayer fp) {
         Request.reset();
         if (actor == null) actor = locals.get(Actor.class);
         if (session == null) session = locals.get(LocalSession.class);
@@ -474,8 +480,8 @@ public final class CommandManager {
             if (message != null) {
                 actor.printError(BBC.getPrefix() + e.getMessage());
             } else {
-                actor.printError(BBC.getPrefix() + "An unknown FAWE error has occurred! Please see console.");
+                actor.printError("An unknown error has occurred! Please see console.");
-                log.log(Level.SEVERE, "An unknown FAWE error occurred", e);
+                log.error("An unknown error occurred", e);
             }
         } catch (Throwable e) {
             Exception faweException = FaweException.get(e);
@@ -485,7 +491,7 @@ public final class CommandManager {
             } else {
                 actor.printError(BBC.getPrefix() + "There was an error handling a FAWE command: [See console]");
                 actor.printRaw(e.getClass().getName() + ": " + e.getMessage());
-                log.log(Level.SEVERE, "An unexpected error occurred while handling a FAWE command", e);
+                log.error("An unexpected error occurred while handling a FAWE command", e);
             }
         } finally {
             final EditSession editSession = locals.get(EditSession.class);
@@ -552,7 +558,7 @@ public final class CommandManager {
         return dispatcher;
     }
 
-    public static Logger getLogger() {
+    public static java.util.logging.Logger getLogger() {
         return commandLog;
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java

@@ -49,25 +49,25 @@ import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import com.sk89q.worldedit.world.World;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Manages registered {@link Platform}s for WorldEdit. Platforms are
  * implementations of WorldEdit.
- * <p>
+ *
  * <p>This class is thread-safe.</p>
  */
 public class PlatformManager {
 
-    private static final Logger logger = Logger.getLogger(PlatformManager.class.getCanonicalName());
+    private static final Logger logger = LoggerFactory.getLogger(PlatformManager.class);
 
     private final WorldEdit worldEdit;
     private final CommandManager commandManager;
@@ -99,7 +99,7 @@ public class PlatformManager {
     public synchronized void register(Platform platform) {
         checkNotNull(platform);
 
-        logger.log(Level.FINE, "Got request to register " + platform.getClass() + " with WorldEdit [" + super.toString() + "]");
+        logger.info("Got request to register " + platform.getClass() + " with WorldEdit [" + super.toString() + "]");
 
         // Just add the platform to the list of platforms: we'll pick favorites
         // once all the platforms have been loaded
@@ -108,9 +108,9 @@ public class PlatformManager {
         // Make sure that versions are in sync
         if (firstSeenVersion != null) {
             if (!firstSeenVersion.equals(platform.getVersion())) {
-                logger.log(Level.WARNING, "Multiple ports of WorldEdit are installed but they report different versions ({0} and {1}). " +
+                logger.warn("Multiple ports of WorldEdit are installed but they report different versions ({0} and {1}). " +
                                 "If these two versions are truly different, then you may run into unexpected crashes and errors.",
-                        new Object[]{firstSeenVersion, platform.getVersion()});
+                        new Object[]{ firstSeenVersion, platform.getVersion() });
             }
         } else {
             firstSeenVersion = platform.getVersion();
@@ -119,7 +119,7 @@ public class PlatformManager {
 
     /**
      * Unregister a platform from WorldEdit.
-     * <p>
+     *
      * <p>If the platform has been chosen for any capabilities, then a new
      * platform will be found.</p>
      *
@@ -131,7 +131,7 @@ public class PlatformManager {
         boolean removed = platforms.remove(platform);
 
         if (removed) {
-            logger.log(Level.FINE, "Unregistering " + platform.getClass().getCanonicalName() + " from WorldEdit");
+            logger.info("Unregistering " + platform.getClass().getCanonicalName() + " from WorldEdit");
 
             boolean choosePreferred = false;
 
@@ -222,7 +222,7 @@ public class PlatformManager {
 
     /**
      * Get a list of loaded platforms.
-     * <p>
+     *
      * <p>The returned list is a copy of the original and is mutable.</p>
      *
      * @return a list of platforms
@@ -497,7 +497,7 @@ public class PlatformManager {
                         return;
                     }
 
-                    final Tool tool = session.getTool(player);
+                    Tool tool = session.getTool(player);
                     if (tool != null && tool instanceof DoubleActionTraceTool) {
                         if (tool.canUse(player)) {
                             FawePlayer<?> fp = FawePlayer.wrap(player);
@@ -532,7 +532,7 @@ public class PlatformManager {
                         return;
                     }
 
-                    final Tool tool = session.getTool(player);
+                    Tool tool = session.getTool(player);
                     if (tool != null && tool instanceof TraceTool) {
                         if (tool.canUse(player)) {
                             FawePlayer<?> fp = FawePlayer.wrap(player);

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardFormats.java

@@ -74,7 +74,7 @@ public class ClipboardFormats {
             ClipboardFormat old = aliasMap.put(lowKey, format);
             if (old != null) {
                 aliasMap.put(lowKey, old);
-                WorldEdit.logger.warning(format.getClass().getName() + " cannot override existing alias '" + lowKey + "' used by " + old.getClass().getName());
+                WorldEdit.logger.warn(format.getClass().getName() + " cannot override existing alias '" + lowKey + "' used by " + old.getClass().getName());
             }
         }
         for (String ext : format.getFileExtensions()) {
@@ -311,4 +311,4 @@ public class ClipboardFormats {
             throw new RuntimeException(e);
         }
     }
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java

@@ -46,6 +46,8 @@ import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.entity.EntityTypes;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 import com.sk89q.worldedit.world.storage.NBTConversions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -53,7 +55,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Reads schematic files that are compatible with MCEdit and other editors.
@@ -67,7 +68,7 @@ public class MCEditSchematicReader extends NBTSchematicReader {
         // TODO Add a handler for skulls, flower pots, note blocks, etc.
     }
 
-    private static final Logger log = Logger.getLogger(MCEditSchematicReader.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(MCEditSchematicReader.class);
     private final NBTInputStream inputStream;
 
     /**
@@ -231,15 +232,15 @@ public class MCEditSchematicReader extends NBTSchematicReader {
                                 clipboard.setBlock(region.getMinimumPoint().add(pt), state);
                             }
                         } else {
-                            log.warning("Unknown block when pasting schematic: " + blocks[index] + ":" + blockData[index] + ". Please report this issue.");
+                            log.warn("Unknown block when pasting schematic: " + blocks[index] + ":" + blockData[index] + ". Please report this issue.");
                         }
                     } catch (WorldEditException e) {
                         switch (failedBlockSets) {
                             case 0:
-                                log.log(Level.WARNING, "Failed to set block on a Clipboard", e);
+                                log.warn("Failed to set block on a Clipboard", e);
                                 break;
                             case 1:
-                                log.log(Level.WARNING, "Failed to set block on a Clipboard (again) -- no more messages will be logged", e);
+                                log.warn("Failed to set block on a Clipboard (again) -- no more messages will be logged", e);
                                 break;
                             default:
                         }
@@ -269,7 +270,7 @@ public class MCEditSchematicReader extends NBTSchematicReader {
                             BaseEntity state = new BaseEntity(entityType, compound);
                             clipboard.createEntity(location, state);
                         } else {
-                            log.warning("Unknown entity when pasting schematic: " + id.toLowerCase());
+                            log.warn("Unknown entity when pasting schematic: " + id.toLowerCase());
                         }
                     }
                 }

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SchematicReader.java

@@ -26,11 +26,13 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.NBTInputStream;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 
@@ -41,7 +43,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public class SchematicReader implements ClipboardReader {
 
-    private static final Logger log = Logger.getLogger(SchematicReader.class.getCanonicalName());
     private NBTInputStream inputStream;
     private InputStream rootStream;
 
@@ -109,4 +110,4 @@ public class SchematicReader implements ClipboardReader {
     public void close() throws IOException {
         inputStream.close();
     }
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java

@@ -60,6 +60,8 @@ import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.entity.EntityTypes;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -70,7 +72,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.BiConsumer;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -86,7 +87,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
         // If NBT Compat handlers are needed - add them here.
     }
 
-    private static final Logger log = Logger.getLogger(SpongeSchematicReader.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(SpongeSchematicReader.class);
     private final NBTInputStream inputStream;
 
     /**
@@ -257,4 +258,4 @@ public class SpongeSchematicReader extends NBTSchematicReader {
     public void close() throws IOException {
         inputStream.close();
     }
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandLoggingHandler.java

@@ -40,6 +40,8 @@ import java.lang.reflect.Method;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Logs called commands to a logger.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/ReparametrisingInterpolation.java

@@ -21,14 +21,15 @@
 
 package com.sk89q.worldedit.math.interpolation;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.sk89q.worldedit.math.Vector3;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-import java.util.logging.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Reparametrises another interpolation function by arc length.
@@ -38,7 +39,7 @@ import java.util.logging.Logger;
  */
 public class ReparametrisingInterpolation implements Interpolation {
 
-    private static final Logger log = Logger.getLogger(ReparametrisingInterpolation.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(ReparametrisingInterpolation.class);
 
     private final Interpolation baseInterpolation;
     private double totalArcLength;
@@ -102,7 +103,7 @@ public class ReparametrisingInterpolation implements Interpolation {
 
         Entry<Double, Double> ceilingEntry = cache.ceilingEntry(arc);
         if (ceilingEntry == null) {
-            log.warning("Error in arcToParameter: no ceiling entry for " + arc + " found!");
+            log.warn("Error in arcToParameter: no ceiling entry for " + arc + " found!");
             return 0;
         }
         final double rightArc = ceilingEntry.getKey();

worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java

@@ -27,13 +27,17 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent;
+import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.session.storage.JsonFileSessionStore;
 import com.sk89q.worldedit.session.storage.SessionStore;
 import com.sk89q.worldedit.session.storage.VoidStore;
 import com.sk89q.worldedit.util.concurrency.EvenMoreExecutors;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import com.sk89q.worldedit.world.gamemode.GameModes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.lang.ref.Reference;
@@ -41,29 +45,26 @@ import java.lang.ref.SoftReference;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Timer;
+import java.util.TimerTask;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.annotation.Nullable;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Session manager for WorldEdit.
- * <p>
+ *
  * <p>Get a reference to one from {@link WorldEdit}.</p>
- * <p>
+ *
  * <p>While this class is thread-safe, the returned session may not be.</p>
  */
 public class SessionManager {
 
-    @Deprecated
     public static int EXPIRATION_GRACE = 600000;
 
     private static final ListeningExecutorService executorService = MoreExecutors.listeningDecorator(EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 5));
-    private static final Logger log = Logger.getLogger(SessionManager.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
     private final Timer timer = new Timer();
     private final WorldEdit worldEdit;
     private final Map<UUID, SessionHolder> sessions = new ConcurrentHashMap<>(8, 0.9f, 1);
@@ -179,8 +180,8 @@ public class SessionManager {
             try {
                 session = store.load(getKey(sessionKey));
                 session.postLoad();
-            } catch (Throwable e) {
+            } catch (IOException e) {
-                log.log(Level.WARNING, "Failed to load saved session", e);
+                log.warn("Failed to load saved session", e);
                 session = new LocalSession();
             }
 
@@ -239,7 +240,7 @@ public class SessionManager {
                     }
                 }
             } catch (IOException e) {
-                log.log(Level.WARNING, "Failed to write session for UUID " + getKey(key), e);
+                log.warn("Failed to write session for UUID " + getKey(key), e);
             }
         }
     }
@@ -328,4 +329,4 @@ public class SessionManager {
 
 
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/session/storage/JsonFileSessionStore.java

@@ -19,8 +19,6 @@
 
 package com.sk89q.worldedit.session.storage;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonIOException;
@@ -28,6 +26,8 @@ import com.google.gson.JsonParseException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.util.gson.GsonUtil;
 import com.sk89q.worldedit.util.io.Closer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -37,8 +37,8 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.UUID;
-import java.util.logging.Level;
+
-import java.util.logging.Logger;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Stores sessions as JSON files in a directory.
@@ -47,7 +47,7 @@ import java.util.logging.Logger;
  */
 public class JsonFileSessionStore implements SessionStore {
 
-    private static final Logger log = Logger.getLogger(JsonFileSessionStore.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(JsonFileSessionStore.class);
     private final Gson gson;
     private final File dir;
 
@@ -61,7 +61,7 @@ public class JsonFileSessionStore implements SessionStore {
 
         if (!dir.isDirectory()) {
             if (!dir.mkdirs()) {
-                log.log(Level.WARNING, "Failed to create directory '" + dir.getPath() + "' for sessions");
+                log.warn("Failed to create directory '" + dir.getPath() + "' for sessions");
             }
         }
 
@@ -111,12 +111,12 @@ public class JsonFileSessionStore implements SessionStore {
 
         if (finalFile.exists()) {
             if (!finalFile.delete()) {
-                log.log(Level.WARNING, "Failed to delete " + finalFile.getPath() + " so the .tmp file can replace it");
+                log.warn("Failed to delete " + finalFile.getPath() + " so the .tmp file can replace it");
             }
         }
 
         if (!tempFile.renameTo(finalFile)) {
-            log.log(Level.WARNING, "Failed to rename temporary session file to " + finalFile.getPath());
+            log.warn("Failed to rename temporary session file to " + finalFile.getPath());
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/util/PropertiesConfiguration.java

@@ -1,283 +1,284 @@
-/*
+/*
- * WorldEdit, a Minecraft world manipulation toolkit
+ * WorldEdit, a Minecraft world manipulation toolkit
- * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) sk89q <http://www.sk89q.com>
- * Copyright (C) WorldEdit team and contributors
+ * Copyright (C) WorldEdit team and contributors
- *
+ *
- * This program is free software: you can redistribute it and/or modify it
+ * 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
+ * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- *
+ *
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
+ * for more details.
- *
+ *
- * You should have received a copy of the GNU Lesser General Public License
+ * 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/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+ */
-
+
-// $Id$
+// $Id$
-
+
-package com.sk89q.worldedit.util;
+package com.sk89q.worldedit.util;
-
+
-import com.google.common.collect.Lists;
+import com.sk89q.util.StringUtil;
-import com.sk89q.util.StringUtil;
+import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.util.report.Unreported;
-import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.world.item.ItemTypes;
+import com.sk89q.worldedit.world.item.ItemTypes;
-import com.sk89q.worldedit.world.registry.LegacyMapper;
+import com.sk89q.worldedit.world.registry.LegacyMapper;
-import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
+import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
-
+import org.slf4j.Logger;
-import java.io.File;
+import org.slf4j.LoggerFactory;
-import java.io.FileInputStream;
+
-import java.io.FileNotFoundException;
+import java.io.File;
-import java.io.FileOutputStream;
+import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.FileOutputStream;
-import java.io.OutputStream;
+import java.io.IOException;
-import java.util.Arrays;
+import java.io.InputStream;
-import java.util.HashSet;
+import java.io.OutputStream;
-import java.util.Properties;
+import java.util.Arrays;
-import java.util.Set;
+import java.util.HashSet;
-import java.util.logging.Level;
+import java.util.Properties;
-import java.util.logging.Logger;
+import java.util.Set;
-import java.util.stream.Collectors;
+
-
+/**
-/**
+ * Simple LocalConfiguration that loads settings using
- * Simple LocalConfiguration that loads settings using
+ * {@code java.util.Properties}.
- * {@code java.util.Properties}.
+ */
- */
+public class PropertiesConfiguration extends LocalConfiguration {
-public class PropertiesConfiguration extends LocalConfiguration {
+
-
+    @Unreported private static final Logger log = LoggerFactory.getLogger(PropertiesConfiguration.class);
-    private static final Logger log = Logger.getLogger(PropertiesConfiguration.class.getCanonicalName());
+
-
+    @Unreported protected Properties properties;
-    protected Properties properties;
+    @Unreported protected File path;
-    protected File path;
+
-
+    /**
-    /**
+     * Construct the object. The configuration isn't loaded yet.
-     * Construct the object. The configuration isn't loaded yet.
+     *
-     *
+     * @param path the path tot he configuration
-     * @param path the path tot he configuration
+     */
-     */
+    public PropertiesConfiguration(File path) {
-    public PropertiesConfiguration(File path) {
+        this.path = path;
-        this.path = path;
+
-
+        properties = new Properties();
-        properties = new Properties();
+    }
-    }
+
-
+    @Override
-    @Override
+    public void load() {
-    public void load() {
+        try (InputStream stream = new FileInputStream(path)) {
-        try (InputStream stream = new FileInputStream(path)) {
+            properties.load(stream);
-            properties.load(stream);
+        } catch (FileNotFoundException ignored) {
-        } catch (FileNotFoundException ignored) {
+        } catch (IOException e) {
-        } catch (IOException e) {
+            log.warn("Failed to read configuration", e);
-            log.log(Level.WARNING, "Failed to read configuration", e);
+        }
-        }
+
-
+        loadExtra();
-        loadExtra();
+
-
+        profile = getBool("profile", profile);
-        profile = getBool("profile", profile);
+
-
+        disallowedBlocks =
-        disallowedBlocks =
+            new HashSet<>(getStringSet("limits.disallowed-blocks", getDefaultDisallowedBlocks()));
-            new HashSet<>(getStringSet("limits.disallowed-blocks", getDefaultDisallowedBlocks()));
+        allowedDataCycleBlocks =
-        allowedDataCycleBlocks =
+                new HashSet<>(getStringSet("limits.allowed-data-cycle-blocks", null));
-                new HashSet<>(getStringSet("limits.allowed-data-cycle-blocks", null));
+        defaultChangeLimit = getInt("default-max-changed-blocks", defaultChangeLimit);
-        defaultChangeLimit = getInt("default-max-changed-blocks", defaultChangeLimit);
+        maxChangeLimit = getInt("max-changed-blocks", maxChangeLimit);
-        maxChangeLimit = getInt("max-changed-blocks", maxChangeLimit);
+        defaultMaxPolygonalPoints = getInt("default-max-polygon-points", defaultMaxPolygonalPoints);
-        defaultMaxPolygonalPoints = getInt("default-max-polygon-points", defaultMaxPolygonalPoints);
+        maxPolygonalPoints = getInt("max-polygon-points", maxPolygonalPoints);
-        maxPolygonalPoints = getInt("max-polygon-points", maxPolygonalPoints);
+        defaultMaxPolyhedronPoints = getInt("default-max-polyhedron-points", defaultMaxPolyhedronPoints);
-        defaultMaxPolyhedronPoints = getInt("default-max-polyhedron-points", defaultMaxPolyhedronPoints);
+        maxPolyhedronPoints = getInt("max-polyhedron-points", maxPolyhedronPoints);
-        maxPolyhedronPoints = getInt("max-polyhedron-points", maxPolyhedronPoints);
+        shellSaveType = getString("shell-save-type", shellSaveType);
-        shellSaveType = getString("shell-save-type", shellSaveType);
+        maxRadius = getInt("max-radius", maxRadius);
-        maxRadius = getInt("max-radius", maxRadius);
+        maxSuperPickaxeSize = getInt("max-super-pickaxe-size", maxSuperPickaxeSize);
-        maxSuperPickaxeSize = getInt("max-super-pickaxe-size", maxSuperPickaxeSize);
+        maxBrushRadius = getInt("max-brush-radius", maxBrushRadius);
-        maxBrushRadius = getInt("max-brush-radius", maxBrushRadius);
+        logCommands = getBool("log-commands", logCommands);
-        logCommands = getBool("log-commands", logCommands);
+        logFile = getString("log-file", logFile);
-        logFile = getString("log-file", logFile);
+        logFormat = getString("log-format", logFormat);
-        logFormat = getString("log-format", logFormat);
+        registerHelp = getBool("register-help", registerHelp);
-        registerHelp = getBool("register-help", registerHelp);
+        wandItem = getString("wand-item", wandItem);
-        wandItem = getString("wand-item", wandItem);
+        try {
-        try {
+            wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId();
-            wandItem = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(wandItem)).getId();
+        } catch (Throwable e) {
-        } catch (Throwable e) {}
+        }
-        superPickaxeDrop = getBool("super-pickaxe-drop-items", superPickaxeDrop);
+        superPickaxeDrop = getBool("super-pickaxe-drop-items", superPickaxeDrop);
-        superPickaxeManyDrop = getBool("super-pickaxe-many-drop-items", superPickaxeManyDrop);
+        superPickaxeManyDrop = getBool("super-pickaxe-many-drop-items", superPickaxeManyDrop);
-        noDoubleSlash = getBool("no-double-slash", noDoubleSlash);
+        noDoubleSlash = getBool("no-double-slash", noDoubleSlash);
-        useInventory = getBool("use-inventory", useInventory);
+        useInventory = getBool("use-inventory", useInventory);
-        useInventoryOverride = getBool("use-inventory-override", useInventoryOverride);
+        useInventoryOverride = getBool("use-inventory-override", useInventoryOverride);
-        useInventoryCreativeOverride = getBool("use-inventory-creative-override", useInventoryCreativeOverride);
+        useInventoryCreativeOverride = getBool("use-inventory-creative-override", useInventoryCreativeOverride);
-        navigationWand = getString("nav-wand-item", navigationWand);
+        navigationWand = getString("nav-wand-item", navigationWand);
-        try {
+        try {
-            navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId();
+            navigationWand = LegacyMapper.getInstance().getItemFromLegacy(Integer.parseInt(navigationWand)).getId();
-        } catch (Throwable e) {}
+        } catch (Throwable e) {
-        navigationWandMaxDistance = getInt("nav-wand-distance", navigationWandMaxDistance);
+        }
-        navigationUseGlass = getBool("nav-use-glass", navigationUseGlass);
+        navigationWandMaxDistance = getInt("nav-wand-distance", navigationWandMaxDistance);
-        scriptTimeout = getInt("scripting-timeout", scriptTimeout);
+        navigationUseGlass = getBool("nav-use-glass", navigationUseGlass);
-        saveDir = getString("schematic-save-dir", saveDir);
+        scriptTimeout = getInt("scripting-timeout", scriptTimeout);
-        scriptsDir = getString("craftscript-dir", scriptsDir);
+        saveDir = getString("schematic-save-dir", saveDir);
-        butcherDefaultRadius = getInt("butcher-default-radius", butcherDefaultRadius);
+        scriptsDir = getString("craftscript-dir", scriptsDir);
-        butcherMaxRadius = getInt("butcher-max-radius", butcherMaxRadius);
+        butcherDefaultRadius = getInt("butcher-default-radius", butcherDefaultRadius);
-        allowSymlinks = getBool("allow-symbolic-links", allowSymlinks);
+        butcherMaxRadius = getInt("butcher-max-radius", butcherMaxRadius);
-
+        allowSymlinks = getBool("allow-symbolic-links", allowSymlinks);
-        LocalSession.MAX_HISTORY_SIZE = Math.max(15, getInt("history-size", 15));
+
-
+        LocalSession.MAX_HISTORY_SIZE = Math.max(15, getInt("history-size", 15));
-        String snapshotsDir = getString("snapshots-dir", "");
+
-        if (!snapshotsDir.isEmpty()) {
+        String snapshotsDir = getString("snapshots-dir", "");
-            snapshotRepo = new SnapshotRepository(snapshotsDir);
+        if (!snapshotsDir.isEmpty()) {
-        }
+            snapshotRepo = new SnapshotRepository(snapshotsDir);
-
+        }
-        path.getParentFile().mkdirs();
+
-        try (OutputStream output = new FileOutputStream(path)) {
+        path.getParentFile().mkdirs();
-            properties.store(output, "Don't put comments; they get removed");
+        try (OutputStream output = new FileOutputStream(path)) {
-        } catch (IOException e) {
+            properties.store(output, "Don't put comments; they get removed");
-            log.log(Level.WARNING, "Failed to write configuration", e);
+        } catch (IOException e) {
-        }
+            log.warn("Failed to write configuration", e);
-    }
+        }
-
+    }
-    /**
+
-     * Called to load extra configuration.
+    /**
-     */
+     * Called to load extra configuration.
-    protected void loadExtra() {
+     */
-    }
+    protected void loadExtra() {
-
+    }
-    /**
+
-     * Get a string value.
+    /**
-     *
+     * Get a string value.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected String getString(String key, String def) {
+     */
-        if (def == null) {
+    protected String getString(String key, String def) {
-            def = "";
+        if (def == null) {
-        }
+            def = "";
-        String val = properties.getProperty(key);
+        }
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, def);
+        if (val == null) {
-            return def;
+            properties.setProperty(key, def);
-        } else {
+            return def;
-            return val;
+        } else {
-        }
+            return val;
-    }
+        }
-
+    }
-    /**
+
-     * Get a boolean value.
+    /**
-     *
+     * Get a boolean value.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected boolean getBool(String key, boolean def) {
+     */
-        String val = properties.getProperty(key);
+    protected boolean getBool(String key, boolean def) {
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, def ? "true" : "false");
+        if (val == null) {
-            return def;
+            properties.setProperty(key, def ? "true" : "false");
-        } else {
+            return def;
-            return val.equalsIgnoreCase("true")
+        } else {
-                    || val.equals("1");
+            return val.equalsIgnoreCase("true")
-        }
+                    || val.equals("1");
-    }
+        }
-
+    }
-    /**
+
-     * Get an integer value.
+    /**
-     *
+     * Get an integer value.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected int getInt(String key, int def) {
+     */
-        String val = properties.getProperty(key);
+    protected int getInt(String key, int def) {
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, String.valueOf(def));
+        if (val == null) {
-            return def;
+            properties.setProperty(key, String.valueOf(def));
-        } else {
+            return def;
-            try {
+        } else {
-                return Integer.parseInt(val);
+            try {
-            } catch (NumberFormatException e) {
+                return Integer.parseInt(val);
-                properties.setProperty(key, String.valueOf(def));
+            } catch (NumberFormatException e) {
-                return def;
+                properties.setProperty(key, String.valueOf(def));
-            }
+                return def;
-        }
+            }
-    }
+        }
-
+    }
-    /**
+
-     * Get a double value.
+    /**
-     *
+     * Get a double value.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected double getDouble(String key, double def) {
+     */
-        String val = properties.getProperty(key);
+    protected double getDouble(String key, double def) {
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, String.valueOf(def));
+        if (val == null) {
-            return def;
+            properties.setProperty(key, String.valueOf(def));
-        } else {
+            return def;
-            try {
+        } else {
-                return Double.parseDouble(val);
+            try {
-            } catch (NumberFormatException e) {
+                return Double.parseDouble(val);
-                properties.setProperty(key, String.valueOf(def));
+            } catch (NumberFormatException e) {
-                return def;
+                properties.setProperty(key, String.valueOf(def));
-            }
+                return def;
-        }
+            }
-    }
+        }
-
+    }
-    /**
+
-     * Get a double value.
+    /**
-     *
+     * Get a double value.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected Set<Integer> getIntSet(String key, int[] def) {
+     */
-        String val = properties.getProperty(key);
+    protected Set<Integer> getIntSet(String key, int[] def) {
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, StringUtil.joinString(def, ",", 0));
+        if (val == null) {
-            Set<Integer> set = new HashSet<>();
+            properties.setProperty(key, StringUtil.joinString(def, ",", 0));
-            for (int i : def) {
+            Set<Integer> set = new HashSet<>();
-                set.add(i);
+            for (int i : def) {
-            }
+                set.add(i);
-            return set;
+            }
-        } else {
+            return set;
-            Set<Integer> set = new HashSet<>();
+        } else {
-            String[] parts = val.split(",");
+            Set<Integer> set = new HashSet<>();
-            for (String part : parts) {
+            String[] parts = val.split(",");
-                try {
+            for (String part : parts) {
-                    int v = Integer.parseInt(part.trim());
+                try {
-                    set.add(v);
+                    int v = Integer.parseInt(part.trim());
-                } catch (NumberFormatException ignored) {
+                    set.add(v);
-                }
+                } catch (NumberFormatException ignored) {
-            }
+                }
-            return set;
+            }
-        }
+            return set;
-    }
+        }
-
+    }
-    /**
+
-     * Get a String set.
+    /**
-     *
+     * Get a String set.
-     * @param key the key
+     *
-     * @param def the default value
+     * @param key the key
-     * @return the value
+     * @param def the default value
-     */
+     * @return the value
-    protected Set<String> getStringSet(String key, String[] def) {
+     */
-        String val = properties.getProperty(key);
+    protected Set<String> getStringSet(String key, String[] def) {
-        if (val == null) {
+        String val = properties.getProperty(key);
-            properties.setProperty(key, StringUtil.joinString(def, ",", 0));
+        if (val == null) {
-            return new HashSet<>(Arrays.asList(def));
+            properties.setProperty(key, StringUtil.joinString(def, ",", 0));
-        } else {
+            return new HashSet<>(Arrays.asList(def));
-            Set<String> set = new HashSet<>();
+        } else {
-            String[] parts = val.split(",");
+            Set<String> set = new HashSet<>();
-            for (String part : parts) {
+            String[] parts = val.split(",");
-                try {
+            for (String part : parts) {
-                    String v = part.trim();
+                try {
-                    set.add(v);
+                    String v = part.trim();
-                } catch (NumberFormatException ignored) {
+                    set.add(v);
-                }
+                } catch (NumberFormatException ignored) {
-            }
+                }
-            return set;
+            }
-        }
+            return set;
-    }
+        }
-
+    }
-}
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java

@@ -26,11 +26,10 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.session.SessionManager;
 import com.sk89q.worldedit.util.report.Unreported;
 import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
+import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * A less simple implementation of {@link LocalConfiguration}
@@ -51,7 +50,7 @@ public class YAMLConfiguration extends LocalConfiguration {
         try {
             config.load();
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Error loading WorldEdit configuration", e);
+            logger.warn("Error loading WorldEdit configuration", e);
         }
 
         profile = config.getBoolean("debug", profile);

worldedit-core/src/main/java/com/sk89q/worldedit/util/eventbus/EventBus.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.util.eventbus;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.SetMultimap;
 import com.google.common.eventbus.DeadEvent;
 import com.sk89q.worldedit.internal.annotation.RequiresNewerGuava;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -36,8 +36,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
+
-import java.util.logging.Logger;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Dispatches events to listeners, and provides ways for listeners to register
@@ -53,7 +53,7 @@ import java.util.logging.Logger;
  */
 public class EventBus {
 
-    private final Logger logger = Logger.getLogger(EventBus.class.getCanonicalName());
+    private final Logger logger = LoggerFactory.getLogger(EventBus.class);
 
     private final SetMultimap<Class<?>, EventHandler> handlersByType =
             Multimaps.newSetMultimap(new HashMap<>(), this::newHandlerSet);
@@ -186,8 +186,7 @@ public class EventBus {
         try {
             handler.handleEvent(event);
         } catch (InvocationTargetException e) {
-            logger.log(Level.SEVERE,
+            logger.error("Could not dispatch event: " + event + " to handler " + handler, e);
-                    "Could not dispatch event: " + event + " to handler " + handler, e);
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java

@@ -19,23 +19,23 @@
 
 package com.sk89q.worldedit.util.io;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Throwables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.ArrayDeque;
 import java.util.Deque;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.zip.ZipFile;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 public final class Closer implements Closeable {
 
-    private static final Logger logger = Logger.getLogger(Closer.class.getCanonicalName());
+    private static final Logger logger = LoggerFactory.getLogger(Closer.class);
 
     /**
      * The suppressor implementation to use for the current Java version.
@@ -218,7 +218,7 @@ public final class Closer implements Closeable {
         @Override
         public void suppress(Object closeable, Throwable thrown, Throwable suppressed) {
             // log to the same place as Closeables
-            logger.log(Level.WARNING, "Suppressing exception thrown when closing " + closeable, suppressed);
+            logger.warn("Suppressing exception thrown when closing " + closeable, suppressed);
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/util/logging/WorldEditPrefixHandler.java

@@ -53,7 +53,8 @@ public final class WorldEditPrefixHandler extends Handler {
      * @param name the logger name
      */
     public static void register(String name) {
-        Logger.getLogger(name).addHandler(new WorldEditPrefixHandler());
+        //todo fix this
+        //Logger.getLogger(name).addHandler(new WorldEditPrefixHandler());
     }
 
 }

worldedit-core/src/main/java/com/sk89q/worldedit/util/paste/ActorCallbackPaste.java

@@ -26,14 +26,14 @@ import com.sk89q.worldedit.command.util.AsyncCommandHelper;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.command.parametric.ExceptionConverter;
 import com.sk89q.worldedit.util.task.Supervisor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URL;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class ActorCallbackPaste {
 
-    private static final Logger LOGGER = Logger.getLogger(ActorCallbackPaste.class.getSimpleName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(ActorCallbackPaste.class);
 
     private ActorCallbackPaste() {
     }
@@ -62,7 +62,7 @@ public static void pastebin(Supervisor supervisor, final Actor sender, String co
 
             @Override
             public void onFailure(Throwable throwable) {
-                LOGGER.log(Level.WARNING, "Failed to submit pastebin", throwable);
+                LOGGER.warn("Failed to submit pastebin", throwable);
                 sender.printError("Failed to submit to a pastebin. Please see console for the error.");
             }
         });

worldedit-core/src/main/java/com/sk89q/worldedit/util/report/ShallowObjectReport.java

@@ -19,16 +19,17 @@
 
 package com.sk89q.worldedit.util.report;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class ShallowObjectReport extends DataReport {
 
-    private static final Logger log = Logger.getLogger(ShallowObjectReport.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(ShallowObjectReport.class);
 
     public ShallowObjectReport(String title, Object object) {
         super(title);
@@ -52,7 +53,7 @@ public class ShallowObjectReport extends DataReport {
                 Object value = field.get(object);
                 append(field.getName(), String.valueOf(value));
             } catch (IllegalAccessException e) {
-                log.log(Level.WARNING, "Failed to get value of '" + field.getName() + "' on " + type);
+                log.warn("Failed to get value of '" + field.getName() + "' on " + type);
             }
         }
     }

worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk.java

@@ -260,7 +260,7 @@ public class AnvilChunk implements Chunk {
 
         BlockState state = LegacyMapper.getInstance().getBlockFromLegacy(id, data);
         if (state == null) {
-            WorldEdit.logger.warning("Unknown legacy block " + id + ":" + data + " found when loading legacy anvil chunk.");
+            WorldEdit.logger.warn("Unknown legacy block " + id + ":" + data + " found when loading legacy anvil chunk.");
             return BlockTypes.AIR.getDefaultState().toBaseBlock();
         }
         if (state.getMaterial().hasContainer()) {

worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java

@@ -183,7 +183,7 @@ public class OldChunk implements Chunk {
 
         BlockState state = LegacyMapper.getInstance().getBlockFromLegacy(id, dataVal);
         if (state == null) {
-            WorldEdit.logger.warning("Unknown legacy block " + id + ":" + dataVal + " found when loading legacy anvil chunk.");
+            WorldEdit.logger.warn("Unknown legacy block " + id + ":" + dataVal + " found when loading legacy anvil chunk.");
             return BlockTypes.AIR.getDefaultState().toBaseBlock();
         }
         if (state.getBlockType().getMaterial().hasContainer()) {

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java

@@ -24,7 +24,10 @@ import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.util.gson.VectorAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.URL;
@@ -32,10 +35,6 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
 
 /**
  * Provides block data based on the built-in block database that is bundled
@@ -50,7 +49,7 @@ import javax.annotation.Nullable;
  */
 public class BundledBlockData {
 
-    private static final Logger log = Logger.getLogger(BundledBlockData.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(BundledBlockData.class);
     private static BundledBlockData INSTANCE;
 
     private final Map<String, BlockEntry> idMap = new HashMap<>();
@@ -62,7 +61,7 @@ public class BundledBlockData {
         try {
             loadFromResource();
         } catch (Throwable e) {
-            log.log(Level.WARNING, "Failed to load the built-in block registry", e);
+            log.warn("Failed to load the built-in block registry", e);
         }
     }
 
@@ -152,4 +151,4 @@ public class BundledBlockData {
         public SimpleBlockMaterial material = new SimpleBlockMaterial();
     }
 
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java

@@ -25,17 +25,16 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.util.gson.VectorAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
 
 /**
  * Provides item data based on the built-in item database that is bundled
@@ -50,7 +49,7 @@ import javax.annotation.Nullable;
  */
 public class BundledItemData {
 
-    private static final Logger log = Logger.getLogger(BundledItemData.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(BundledItemData.class);
     private static BundledItemData INSTANCE;
 
     private final Map<String, ItemEntry> idMap = new HashMap<>();
@@ -62,7 +61,7 @@ public class BundledItemData {
         try {
             loadFromResource();
         } catch (Throwable e) {
-            log.log(Level.WARNING, "Failed to load the built-in item registry", e);
+            log.warn("Failed to load the built-in item registry", e);
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/LegacyMapper.java

@@ -40,22 +40,22 @@ import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
-import com.sk89q.worldedit.extension.input.ParserContext;
-import com.sk89q.worldedit.util.gson.VectorAdapter;
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class LegacyMapper {
 
-    private static final Logger log = Logger.getLogger(LegacyMapper.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(LegacyMapper.class);
     private static LegacyMapper INSTANCE;
 
     private final Int2ObjectArrayMap<Integer> blockStateToLegacyId4Data = new Int2ObjectArrayMap<>();
@@ -70,8 +70,7 @@ public class LegacyMapper {
         try {
             loadFromResource();
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.warn("Failed to load the built-in legacy id registry", e);
-            log.log(Level.WARNING, "Failed to load the built-in legacy id registry", e);
         }
     }
 
@@ -110,7 +109,7 @@ public class LegacyMapper {
                 blockStateToLegacyId4Data.put(blockState.getInternalId(), (Integer) combinedId);
                 blockStateToLegacyId4Data.putIfAbsent(blockState.getInternalBlockTypeId(), combinedId);
             } catch (Exception e) {
-                log.fine("Unknown block: " + blockEntry.getValue());
+                log.warn("Unknown block: " + blockEntry.getValue());
             }
         }
         for (int id = 0; id < 256; id++) {
@@ -127,7 +126,7 @@ public class LegacyMapper {
             try {
                 itemMap.put(getCombinedId(itemEntry.getKey()), ItemTypes.get(itemEntry.getValue()));
             } catch (Exception e) {
-                log.fine("Unknown item: " + itemEntry.getValue());
+                log.warn("Unknown item: " + itemEntry.getValue());
             }
         }
     }
@@ -232,7 +231,7 @@ public class LegacyMapper {
     		try {
     			return BlockTypes.get(plotBlock.toString()).getDefaultState().toBaseBlock();
     		}catch(Throwable failed) {
-    			log.severe("Unable to convert StringPlotBlock " + plotBlock + " to BaseBlock!");
+    			log.error("Unable to convert StringPlotBlock " + plotBlock + " to BaseBlock!");
     			failed.printStackTrace();
     			return null;
     		}
@@ -240,12 +239,12 @@ public class LegacyMapper {
     		try {
     			return new BaseBlock(((LegacyPlotBlock)plotBlock).getId(), ((LegacyPlotBlock)plotBlock).getData());
     		}catch(Throwable failed) {
-    			log.severe("Unable to convert LegacyPlotBlock " + plotBlock + " to BaseBlock!");
+    			log.error("Unable to convert LegacyPlotBlock " + plotBlock + " to BaseBlock!");
     			failed.printStackTrace();
     			return null;
     		}
     	}else {
-			log.severe("Unable to convert LegacyPlotBlock " + plotBlock + " to BaseBlock!");
+			  log.error("Unable to convert LegacyPlotBlock " + plotBlock + " to BaseBlock!");
 			return null;
     	}
     }

worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/Snapshot.java

@@ -29,11 +29,12 @@ import com.sk89q.worldedit.world.storage.TrueZipLegacyChunkStore;
 import com.sk89q.worldedit.world.storage.TrueZipMcRegionChunkStore;
 import com.sk89q.worldedit.world.storage.ZippedLegacyChunkStore;
 import com.sk89q.worldedit.world.storage.ZippedMcRegionChunkStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Calendar;
-import java.util.logging.Logger;
 import java.util.zip.ZipFile;
 
 /**
@@ -41,7 +42,7 @@ import java.util.zip.ZipFile;
  */
 public class Snapshot implements Comparable<Snapshot> {
 
-    protected static Logger logger = Logger.getLogger(Snapshot.class.getCanonicalName());
+    protected static Logger logger = LoggerFactory.getLogger(Snapshot.class);
 
     protected File file;
     protected String name;

worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/legacy.json

@@ -404,7 +404,6 @@
     "61:11": "minecraft:furnace[facing=south,lit=false]",
     "61:12": "minecraft:furnace[facing=west,lit=false]",
     "61:13": "minecraft:furnace[facing=east,lit=false]",
-    "62:0": "minecraft:lit_furnace",
     "62:2": "minecraft:furnace[facing=north,lit=true]",
     "62:3": "minecraft:furnace[facing=south,lit=true]",
     "62:4": "minecraft:furnace[facing=west,lit=true]",
@@ -1849,7 +1848,7 @@
     "48:0": "minecraft:mossy_cobblestone",
     "49:0": "minecraft:obsidian",
     "50:0": "minecraft:torch",
-    "52:0": "minecraft:mob_spawner",
+    "52:0": "minecraft:spawner",
     "53:0": "minecraft:oak_stairs",
     "54:0": "minecraft:chest",
     "56:0": "minecraft:diamond_ore",
@@ -2393,4 +2392,4 @@
     "2266:0": "minecraft:music_disc_11",
     "2267:0": "minecraft:music_disc_wait"
   }
-}
+}

worldedit-core/src/test/java/com/sk89q/minecraft/util/commands/CommandContextTest.java

@@ -21,17 +21,21 @@ package com.sk89q.minecraft.util.commands;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class CommandContextTest {
 
-    private static final Logger log = Logger.getLogger(CommandContextTest.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(CommandContextTest.class);
     private static final String firstCmdString = "herpderp -opw testers \"mani world\" 'another thing'  because something";
     CommandContext firstCommand;
 
@@ -40,7 +44,7 @@ public class CommandContextTest {
         try {
             firstCommand = new CommandContext(firstCmdString, new HashSet<>(Arrays.asList('o', 'w')));
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Unexpected exception when creating CommandContext");
         }
     }
@@ -79,7 +83,7 @@ public class CommandContextTest {
             new CommandContext(cmd);
             new CommandContext(cmd2);
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -90,7 +94,7 @@ public class CommandContextTest {
         try {
             new CommandContext(cmd);
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -101,7 +105,7 @@ public class CommandContextTest {
         try {
             new CommandContext(cmd);
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -115,7 +119,7 @@ public class CommandContextTest {
             CommandContext context2 = new CommandContext("r hello -f world");
             assertTrue(context2.hasFlag('f'));
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -131,7 +135,7 @@ public class CommandContextTest {
             CommandContext context2 = new CommandContext("pm name \"hello world\"   foo   bar");
             assertEquals("\"hello world\"   foo   bar", context2.getJoinedStrings(1));
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -143,7 +147,7 @@ public class CommandContextTest {
             assertArrayEquals(new String[] { "foo", "bar", "baz" }, context.getSlice(0));
 
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }
@@ -154,7 +158,7 @@ public class CommandContextTest {
             CommandContext context = new CommandContext("region flag xmas blocked-cmds \"\"");
             assertEquals(context.argsLength(), 3);
         } catch (CommandException e) {
-            log.log(Level.WARNING, "Error", e);
+            log.warn("Error", e);
             fail("Error creating CommandContext");
         }
     }

worldedit-forge/build.gradle

@@ -16,6 +16,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 
 dependencies {
     compile project(':worldedit-core')
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.2'
     compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1'
 }

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplLoader.java

@@ -21,6 +21,8 @@ package com.sk89q.worldedit.sponge.adapter;
 
 import com.google.common.collect.Lists;
 import com.sk89q.worldedit.util.io.Closer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,15 +32,13 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Loads Sponge implementation adapters.
  */
 public class SpongeImplLoader {
 
-    private static final Logger log = Logger.getLogger(SpongeImplLoader.class.getCanonicalName());
+    private static final Logger log = LoggerFactory.getLogger(SpongeImplLoader.class);
     private final List<String> adapterCandidates = new ArrayList<>();
     private String customCandidate;
 
@@ -71,7 +71,7 @@ public class SpongeImplLoader {
         if (className != null) {
             customCandidate = className;
             adapterCandidates.add(className);
-            log.log(Level.INFO, "-Dworldedit.sponge.adapter used to add " + className + " to the list of available Sponge adapters");
+            log.info("-Dworldedit.sponge.adapter used to add " + className + " to the list of available Sponge adapters");
         }
     }
 
@@ -157,18 +157,18 @@ public class SpongeImplLoader {
                 if (SpongeImplAdapter.class.isAssignableFrom(cls)) {
                     suitableAdapters.add((SpongeImplAdapter) cls.newInstance());
                 } else {
-                    log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className +
+                    log.warn("Failed to load the Sponge adapter class '" + className +
                             "' because it does not implement " + SpongeImplAdapter.class.getCanonicalName());
                 }
             } catch (ClassNotFoundException e) {
-                log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className +
+                log.warn("Failed to load the Sponge adapter class '" + className +
                         "' that is not supposed to be missing", e);
             } catch (IllegalAccessException e) {
-                log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className +
+                log.warn("Failed to load the Sponge adapter class '" + className +
                         "' that is not supposed to be raising this error", e);
             } catch (Throwable e) {
                 if (className.equals(customCandidate)) {
-                    log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className + "'", e);
+                    log.warn("Failed to load the Sponge adapter class '" + className + "'", e);
                 }
             }
         }