Upstream
/
ColorConsole
mirror of https://github.com/games647/ColorConsole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrate to Java 7 NIO files

This commit is contained in:
games647 2017-01-26 09:05:53 +01:00
parent 87f1ba4dd6
commit 9482098abb
No known key found for this signature in database
GPG Key ID: E9E962F08F621538
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/github/games647/colorconsole/bungee/ColorConsoleBungee.java
View File

@ -1,14 +1,5 @@
package com.github.games647.colorconsole.bungee;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.config.Configuration;
@ -16,6 +7,16 @@ import net.md_5.bungee.config.ConfigurationProvider;
import net.md_5.bungee.config.YamlConfiguration;
import net.md_5.bungee.log.ColouredWriter;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.logging.Formatter;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
public class ColorConsoleBungee extends Plugin {
private Configuration configuration;
@ -72,10 +73,11 @@ public class ColorConsoleBungee extends Plugin {
private void saveDefaultConfig() {
getDataFolder().mkdir();
File configFile = new File(getDataFolder(), "config.yml");
if (!configFile.exists()) {
Path configFile = getDataFolder().toPath().resolve("config.yml");
if (!Files.exists(configFile)) {
try (InputStream in = getResourceAsStream("config.yml")) {
Files.copy(in, configFile.toPath());
Files.copy(in, configFile);
} catch (IOException ioExc) {
getLogger().log(Level.SEVERE, "Error saving default config", ioExc);
}

18
src/main/java/com/github/games647/colorconsole/sponge/ColorConsoleSponge.java
View File

@ -2,17 +2,12 @@ package com.github.games647.colorconsole.sponge;
import com.google.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
import ninja.leaping.configurate.commented.CommentedConfigurationNode;
import ninja.leaping.configurate.hocon.HoconConfigurationLoader;
import ninja.leaping.configurate.loader.ConfigurationLoader;
import ninja.leaping.configurate.objectmapping.ObjectMapper;
import ninja.leaping.configurate.objectmapping.ObjectMappingException;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Layout;
@ -20,13 +15,18 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.slf4j.Logger;
import org.spongepowered.api.config.DefaultConfig;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
import org.spongepowered.api.plugin.Plugin;
import java.io.IOException;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
import java.nio.file.Path;
@Plugin(id = "colorconsole", name = "ColorConsole", version = "1.6"
, url = "https://github.com/games647/ColorConsole/"
, description = "Print colorful console messages depending on the logging level")
@ -36,7 +36,7 @@ public class ColorConsoleSponge {
@Inject
@DefaultConfig(sharedRoot = true)
private File configFile;
private Path configFile;
@Inject
@DefaultConfig(sharedRoot = true)
@ -64,7 +64,7 @@ public class ColorConsoleSponge {
rootNode = configManager.createEmptyNode();
ConfigurationLoader<CommentedConfigurationNode> configLoader = HoconConfigurationLoader.builder()
.setPath(configFile.toPath()).build();
.setPath(configFile).build();
try {
configMapper = ObjectMapper
.forClass(ColorConsoleConfig.class).bindToNew();