diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java index ef1ad4883..4fb836cc7 100644 --- a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java +++ b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java @@ -102,7 +102,7 @@ public class ConfigPack extends YamlConfiguration { biomeList = getStringList("grids"); configs.put(id, this); - LangUtil.log("config-pack.load", Level.INFO, getID(), String.valueOf((System.nanoTime() - l)/1000000D)); + LangUtil.log("config-pack.loaded", Level.INFO, getID(), String.valueOf((System.nanoTime() - l)/1000000D)); } public Map getAbstractBiomes() { diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java index ecaf905a1..60d5227c1 100644 --- a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java +++ b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java @@ -22,6 +22,7 @@ public final class ConfigUtil { public static boolean masterDisableCaves; public static void loadConfig(JavaPlugin main) { main.saveDefaultConfig(); + main.reloadConfig(); FileConfiguration config = main.getConfig(); LangUtil.load(config.getString("language", "en_us"), main); diff --git a/src/main/java/com/dfsek/terra/config/base/WorldConfig.java b/src/main/java/com/dfsek/terra/config/base/WorldConfig.java index bd3b48153..fa1c7153c 100644 --- a/src/main/java/com/dfsek/terra/config/base/WorldConfig.java +++ b/src/main/java/com/dfsek/terra/config/base/WorldConfig.java @@ -68,7 +68,7 @@ public class WorldConfig { fromImage = false; } } - } catch(IllegalArgumentException e) { + } catch(IllegalArgumentException | NullPointerException e) { throw new InvalidConfigurationException(e.getCause()); } Bukkit.getLogger().info("Loaded " + tConfig.biomeList.size() + " BiomeGrids from list."); diff --git a/src/main/java/com/dfsek/terra/config/lang/Language.java b/src/main/java/com/dfsek/terra/config/lang/Language.java index 31e77b72c..423181d8f 100644 --- a/src/main/java/com/dfsek/terra/config/lang/Language.java +++ b/src/main/java/com/dfsek/terra/config/lang/Language.java @@ -6,9 +6,7 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class Language extends YamlConfiguration { public Language(File file) throws IOException, InvalidConfigurationException { @@ -18,13 +16,14 @@ public class Language extends YamlConfiguration { public void load(@NotNull File file) throws IOException, InvalidConfigurationException { super.load(file); } + @SuppressWarnings("unchecked") public Message getMessage(String id) { Object m = get(id); Message temp; if(m instanceof List) { - temp = new MultiLineMessage(getStringList(id)); + temp = new MultiLineMessage((List) m); } else if(m instanceof String) { - temp = new SingleLineMessage(getString(id)); + temp = new SingleLineMessage((String) m); } else return new SingleLineMessage("message:" + id + ":translation_undefined"); if(temp.isEmpty()) return new SingleLineMessage("message:" + id + ":translation_undefined"); return temp;