From f473188f1dabf4f06f4a56783401aa80ed096326 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Sat, 28 Oct 2017 17:45:28 +0200
Subject: [PATCH] Replace java File API with the newer NIO API

---
 pom.xml                                          |  2 +-
 .../colorconsole/bungee/ColorConsoleBungee.java  | 16 +++++++++-------
 .../colorconsole/common/CommonFormatter.java     |  2 +-
 .../colorconsole/sponge/ColorConsoleSponge.java  | 11 ++---------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae3303e..3b9bf54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <name>ColorConsole</name>
     <version>2.3.3</version>
-    <inceptionYear>2016</inceptionYear>
+
     <url>https://dev.bukkit.org/bukkit-plugins/colorconsole/</url>
     <description>
         Print colorful console messages depending on the logging level
diff --git a/src/main/java/com/github/games647/colorconsole/bungee/ColorConsoleBungee.java b/src/main/java/com/github/games647/colorconsole/bungee/ColorConsoleBungee.java
index 76ca8fb..1481d7e 100644
--- a/src/main/java/com/github/games647/colorconsole/bungee/ColorConsoleBungee.java
+++ b/src/main/java/com/github/games647/colorconsole/bungee/ColorConsoleBungee.java
@@ -70,15 +70,17 @@ public class ColorConsoleBungee extends Plugin {
     }
 
     private void saveDefaultConfig() {
-        getDataFolder().mkdir();
+        try {
+            Files.createDirectories(getDataFolder().toPath());
 
-        Path configFile = getDataFolder().toPath().resolve("config.yml");
-        if (Files.notExists(configFile)) {
-            try (InputStream in = getResourceAsStream("config.yml")) {
-                Files.copy(in, configFile);
-            } catch (IOException ioExc) {
-                getLogger().log(Level.SEVERE, "Error saving default config", ioExc);
+            Path configFile = getDataFolder().toPath().resolve("config.yml");
+            if (Files.notExists(configFile)) {
+                try (InputStream in = getResourceAsStream("config.yml")) {
+                    Files.copy(in, configFile);
+                }
             }
+        } catch (IOException ioExc) {
+            getLogger().log(Level.SEVERE, "Error saving default config", ioExc);
         }
     }
 }
diff --git a/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java b/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java
index d1ba4a8..b381a70 100644
--- a/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java
+++ b/src/main/java/com/github/games647/colorconsole/common/CommonFormatter.java
@@ -19,7 +19,7 @@ public class CommonFormatter {
 
     //copied from AnsiEscape in order to provide compatibility with older minecraft versions
     private static final String CSI = "\u001b[";
-    private static final String SUFFIX = "m";
+    private static final char SUFFIX = 'm';
     private final String reset = Ansi.ansi().a(Ansi.Attribute.RESET).toString();
 
     private final Set<String> ignoreMessages;
diff --git a/src/main/java/com/github/games647/colorconsole/sponge/ColorConsoleSponge.java b/src/main/java/com/github/games647/colorconsole/sponge/ColorConsoleSponge.java
index 9622537..c78acfc 100644
--- a/src/main/java/com/github/games647/colorconsole/sponge/ColorConsoleSponge.java
+++ b/src/main/java/com/github/games647/colorconsole/sponge/ColorConsoleSponge.java
@@ -30,10 +30,6 @@ public class ColorConsoleSponge {
 
     private final Logger logger;
 
-    @Inject
-    @DefaultConfig(sharedRoot = true)
-    private Path configFile;
-
     @Inject
     @DefaultConfig(sharedRoot = true)
     private ConfigurationLoader<CommentedConfigurationNode> configManager;
@@ -55,18 +51,15 @@ public class ColorConsoleSponge {
         logger.info("Setting up config");
 
         rootNode = configManager.createEmptyNode();
-        ConfigurationLoader<CommentedConfigurationNode> configLoader = HoconConfigurationLoader.builder()
-                .setPath(configFile).build();
         try {
-            configMapper = ObjectMapper
-                    .forClass(ColorConsoleConfig.class).bindToNew();
+            configMapper = ObjectMapper.forClass(ColorConsoleConfig.class).bindToNew();
 
             rootNode = configManager.load();
             configMapper.populate(rootNode);
 
             //add and save missing values
             configMapper.serialize(rootNode);
-            configLoader.save(rootNode);
+            configManager.save(rootNode);
         } catch (IOException | ObjectMappingException ioEx) {
             logger.error("Cannot save default config", ioEx);
             return;