diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/config/TargetYml.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/config/TargetYml.java index 05b8615..1c127b4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/config/TargetYml.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/config/TargetYml.java @@ -39,7 +39,7 @@ public class TargetYml extends BaseConfig { */ public Set getTargetItems(@NotNull final String target) { Set items = new HashSet<>(); - this.getStrings(target + ".items", false).forEach(s -> items.add(Items.lookup(s.toUpperCase()))); + this.getStrings(target + ".items").forEach(s -> items.add(Items.lookup(s.toUpperCase()))); return items; } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt index 6ed25d4..86ce589 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt @@ -55,7 +55,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin if (reforge == null && stone == null && target != null) { if (plugin.configYml.getBool("reforge.show-reforgable")) { val addLore: MutableList = ArrayList() - for (string in plugin.configYml.getStrings("reforge.reforgable-suffix")) { + for (string in plugin.configYml.getFormattedStrings("reforge.reforgable-suffix")) { addLore.add(Display.PREFIX + string) } lore.addAll(addLore) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt index 168099d..8df57f8 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/gui/ReforgeGUI.kt @@ -64,8 +64,8 @@ object ReforgeGUI { previous.type = Material.getMaterial( plugin.configYml.getString("gui.invalid-item.material").uppercase() )!! - meta.setDisplayName(plugin.configYml.getString("gui.invalid-item.name")) - meta.lore = plugin.configYml.getStrings("gui.invalid-item.lore").map { + meta.setDisplayName(plugin.configYml.getFormattedString("gui.invalid-item.name")) + meta.lore = plugin.configYml.getFormattedStrings("gui.invalid-item.lore").map { it.replace("%cost%", NumberUtils.format(cost)) .replace("%xpcost%", NumberUtils.format(xpCost.toDouble())) } @@ -74,8 +74,8 @@ object ReforgeGUI { previous.type = Material.getMaterial( plugin.configYml.getString("gui.allow.material").uppercase() )!! - meta.setDisplayName(plugin.configYml.getString("gui.allow.name")) - meta.lore = plugin.configYml.getStrings("gui.allow.lore").map { + meta.setDisplayName(plugin.configYml.getFormattedString("gui.allow.name")) + meta.lore = plugin.configYml.getFormattedStrings("gui.allow.lore").map { it.replace("%cost%", NumberUtils.format(cost)) .replace("%xpcost%", NumberUtils.format(xpCost.toDouble())) } @@ -84,8 +84,8 @@ object ReforgeGUI { previous.type = Material.getMaterial( plugin.configYml.getString("gui.allow-stone.material").uppercase() )!! - meta.setDisplayName(plugin.configYml.getString("gui.allow-stone.name")) - meta.lore = plugin.configYml.getStrings("gui.allow-stone.lore").map { + meta.setDisplayName(plugin.configYml.getFormattedString("gui.allow-stone.name")) + meta.lore = plugin.configYml.getFormattedStrings("gui.allow-stone.lore").map { it.replace("%cost%", NumberUtils.format(cost)) .replace("%xpcost%", NumberUtils.format(xpCost.toDouble())) .replace("%stone%", ReforgeUtils.getReforgeStone(menu.getCaptiveItems(player)[1]).name) @@ -95,8 +95,8 @@ object ReforgeGUI { previous.type = Material.getMaterial( plugin.configYml.getString("gui.no-item.material").uppercase() )!! - meta.setDisplayName(plugin.configYml.getString("gui.no-item.name")) - meta.lore = plugin.configYml.getStrings("gui.no-item.lore").map { + meta.setDisplayName(plugin.configYml.getFormattedString("gui.no-item.name")) + meta.lore = plugin.configYml.getFormattedStrings("gui.no-item.lore").map { it.replace("%cost%", NumberUtils.format(cost)) .replace("%xpcost%", NumberUtils.format(xpCost.toDouble())) } @@ -122,7 +122,7 @@ object ReforgeGUI { Material.getMaterial(plugin.configYml.getString("gui.close.material", false).toUpperCase())!! menu = Menu.builder(plugin.configYml.getInt("gui.rows")).apply { - setTitle(plugin.langYml.getString("menu.title")) + setTitle(plugin.langYml.getFormattedString("menu.title")) setMask(FillerMask(MaskMaterials(*maskMaterials), *maskPattern)) modfiy { builder -> val slot = Slot.builder( @@ -173,7 +173,7 @@ object ReforgeGUI { plugin.configYml.getInt("gui.close.location.column"), Slot.builder( ItemStackBuilder(closeMaterial) - .setDisplayName(plugin.langYml.getString("menu.close")) + .setDisplayName(plugin.langYml.getFormattedString("menu.close")) .build() ).onLeftClick { event, _, _ -> event.whoClicked.closeInventory()