diff --git a/pom.xml b/pom.xml
index 1b61833..fc333b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@
org.apache.maven.plugins
maven-compiler-plugin
- 2.0.2
+ 3.6.1
-
- 1.6
+
+ 1.8
@@ -63,22 +63,29 @@
+
org.bukkit
bukkit
- 1.9-R0.1-SNAPSHOT
+ 1.12-pre2-SNAPSHOT
jar
ru.tehkode
PermissionsEx
- 1.22
+ 1.23.1
+
+
+ *
+ *
+
+
net.milkbowl.vault
VaultAPI
- 1.5
+ 1.6
provided
@@ -89,11 +96,11 @@
vault-repo
- http://nexus.theyeticave.net/content/repositories/pub_releases
+ http://nexus.hc.to/content/repositories/pub_releases
pex-repo
- http://pex-repo.aoeu.xyz
+ https://pex-repo.aoeu.xyz/
diff --git a/src/main/java/ru/tehkode/modifyworld/bukkit/Modifyworld.java b/src/main/java/ru/tehkode/modifyworld/bukkit/Modifyworld.java
index 7774b42..6b7166f 100644
--- a/src/main/java/ru/tehkode/modifyworld/bukkit/Modifyworld.java
+++ b/src/main/java/ru/tehkode/modifyworld/bukkit/Modifyworld.java
@@ -18,6 +18,7 @@
*/
package ru.tehkode.modifyworld.bukkit;
+import java.io.InputStreamReader;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.FileConfiguration;
@@ -132,7 +133,7 @@ public class Modifyworld extends JavaPlugin {
if (load != null) {
YamlConfiguration conf = new YamlConfiguration();
conf.options().copyDefaults(true);
- conf.load(load);
+ conf.load(new InputStreamReader(load));
YamlConfiguration def = loadUnlocalized(path);
if (def != null) {
conf.setDefaults(def);
@@ -146,7 +147,7 @@ public class Modifyworld extends JavaPlugin {
InputStream load = getResource(path);
if (load != null) {
YamlConfiguration conf = new YamlConfiguration();
- conf.load(load);
+ conf.load(new InputStreamReader(load));
return conf;
}
return null;
@@ -160,7 +161,7 @@ public class Modifyworld extends JavaPlugin {
YamlConfiguration base = new YamlConfiguration();
InputStream load = getResource("lang/" + locale.toString() + "/" + path); // Country-specific
if (load != null) {
- base.load(load);
+ base.load(new InputStreamReader(load));
base.options().copyDefaults(true);
YamlConfiguration def = loadBaseLanguage(path, locale);
if (def == null) {
@@ -208,7 +209,7 @@ public class Modifyworld extends JavaPlugin {
InputStream defConfigStream = getLocalizedResource("config.yml");
if (defConfigStream != null) {
try {
- this.config.load(defConfigStream);
+ this.config.load(new InputStreamReader(defConfigStream));
} catch (Exception de) {
this.getLogger().severe("Default config file is broken. Please tell this to Modifyworld author.");
}
@@ -219,7 +220,7 @@ public class Modifyworld extends JavaPlugin {
InputStream defConfigStream = getLocalizedResource("config.yml");
if (defConfigStream != null) {
- this.config.setDefaults(YamlConfiguration.loadConfiguration(defConfigStream));
+ this.config.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(defConfigStream)));
}
}
}