From f8bd6f25475d397654baaafdad9808d314d29f04 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 21 Dec 2021 14:57:03 +0000 Subject: [PATCH] Updated config string getters --- .../com/willfp/ecoenchants/command/CommandEnchantinfo.java | 6 +++--- .../ecoenchants/display/options/DescriptionOptions.java | 2 +- .../willfp/ecoenchants/enchantments/itemtypes/Spell.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java index 0414a0ff..1957abd2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java @@ -91,7 +91,7 @@ public class CommandEnchantinfo extends PluginCommand { if (enchantment1 instanceof EcoEnchant enchant) { conflictNames.add(enchant.getDisplayName()); } else { - conflictNames.add(this.getPlugin().getLangYml().getString("enchantments." + enchantment1.getKey().getKey() + ".name")); + conflictNames.add(this.getPlugin().getLangYml().getFormattedString("enchantments." + enchantment1.getKey().getKey() + ".name")); } })); @@ -101,7 +101,7 @@ public class CommandEnchantinfo extends PluginCommand { if (allConflicts.length() >= 2) { allConflicts = allConflicts.substring(0, allConflicts.length() - 2); } else { - allConflicts = this.getPlugin().getLangYml().getString("no-conflicts"); + allConflicts = this.getPlugin().getLangYml().getFormattedString("no-conflicts"); } Set targets = enchantment.getTargetMaterials(); @@ -132,7 +132,7 @@ public class CommandEnchantinfo extends PluginCommand { if (allTargets.length() >= 2) { allTargets = allTargets.substring(0, allTargets.length() - 2); } else { - allTargets = this.getPlugin().getLangYml().getString("no-targets"); + allTargets = this.getPlugin().getLangYml().getFormattedString("no-targets"); } String maxLevel = String.valueOf(enchantment.getMaxLevel()); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DescriptionOptions.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DescriptionOptions.java index f5dd361d..fb0ce69e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DescriptionOptions.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/DescriptionOptions.java @@ -49,7 +49,7 @@ public class DescriptionOptions extends PluginDependent { public void update() { threshold = this.getPlugin().getConfigYml().getInt("lore.describe.before-lines"); enabled = this.getPlugin().getConfigYml().getBool("lore.describe.enabled"); - color = this.getPlugin().getLangYml().getString("description-color"); + color = this.getPlugin().getLangYml().getFormattedString("description-color"); showingAtBottom = this.getPlugin().getConfigYml().getBool("lore.describe.at-bottom"); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java index 31efc62c..318b9077 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java @@ -260,7 +260,7 @@ public abstract class Spell extends EcoEnchant { if (cooldown > 0) { if (!this.hasFlag("no-cooldown-message")) { if (this.getPlugin().getConfigYml().getBool("types.special.cooldown-in-actionbar")) { - String message = this.getPlugin().getLangYml().getString("messages.on-cooldown") + String message = this.getPlugin().getLangYml().getFormattedString("messages.on-cooldown") .replace("%seconds%", String.valueOf(cooldown)) .replace("%name%", EnchantmentCache.getEntry(this).getRawName());