diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/CustomPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/disk/CustomPlaceholders.java index 4b47f9bc..6e6052a6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/CustomPlaceholders.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/disk/CustomPlaceholders.java @@ -6,12 +6,15 @@ package me.filoghost.holographicdisplays.disk; import me.filoghost.fcommons.Colors; +import me.filoghost.fcommons.config.ConfigPath; import me.filoghost.fcommons.config.ConfigSection; +import me.filoghost.fcommons.config.ConfigType; import me.filoghost.fcommons.config.FileConfig; import me.filoghost.fcommons.logging.Log; import java.util.ArrayList; import java.util.List; +import java.util.Map.Entry; public class CustomPlaceholders { @@ -25,11 +28,9 @@ public class CustomPlaceholders { return; } - for (String placeholder : placeholdersSection.getKeys()) { - String replacement = Colors.addColors(placeholdersSection.getString(placeholder)); - if (replacement == null) { - return; - } + for (Entry entry : placeholdersSection.toMap(ConfigType.STRING).entrySet()) { + String placeholder = entry.getKey().asRawKey(); + String replacement = Colors.addColors(entry.getValue()); if (placeholder.length() == 0) { Log.warning("Error in \"" + config.getSourceFile() + "\": placeholder cannot be empty (skipped)."); diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrader.java b/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrader.java index 37ce629d..395beb1c 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrader.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/disk/upgrade/LegacySymbolsUpgrader.java @@ -9,6 +9,8 @@ import me.filoghost.fcommons.Strings; import me.filoghost.fcommons.config.Config; import me.filoghost.fcommons.config.ConfigErrors; import me.filoghost.fcommons.config.ConfigLoader; +import me.filoghost.fcommons.config.ConfigPath; +import me.filoghost.fcommons.config.ConfigSection; import me.filoghost.fcommons.config.exception.ConfigLoadException; import me.filoghost.fcommons.config.exception.ConfigSaveException; import me.filoghost.fcommons.logging.Log; @@ -36,6 +38,8 @@ public class LegacySymbolsUpgrader { } Config newConfig = new Config(); + ConfigSection placeholdersSection = newConfig.getOrCreateSection("placeholders"); + List lines; try { lines = Files.readAllLines(oldFile); @@ -59,7 +63,7 @@ public class LegacySymbolsUpgrader { String placeholder = unquote(parts[0]); String replacement = StringEscapeUtils.unescapeJava(unquote(parts[1])); - newConfig.setString("placeholders." + placeholder, replacement); + placeholdersSection.setString(ConfigPath.literal(placeholder), replacement); } try {