From 63bd87ff66b8da3568ff6a4bb9deed3e4f108d2a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 10 Aug 2021 14:47:29 +0100 Subject: [PATCH] More formatting changes --- .../ecoenchants/display/EnchantmentCache.java | 17 +++++++++-------- .../display/options/MaxLevelOptions.java | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java index 407ac601..d7647a0f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java @@ -258,22 +258,23 @@ public class EnchantmentCache { numberString += level; } - String appendedName = name + numberString; - if (level > enchantment.getMaxLevel() && PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().isReformatAboveMaxLevel()) { + String clone = rawName; + String color = PLUGIN.getDisplayModule().getOptions().getMaxLevelOptions().getAboveMaxLevelFormat(); if (color.contains("{}")) { - appendedName = color.replace("{}", appendedName); + clone = color.replace("{}", clone); } else { - appendedName = color + appendedName; + clone = color + clone; } - appendedName = StringUtils.format(appendedName); + return StringUtils.format(clone + numberString); + } else { + return name + numberString; } - return appendedName; + } else { + return name; } - - return name; } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/MaxLevelOptions.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/MaxLevelOptions.java index ad209419..794e98e4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/MaxLevelOptions.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/options/MaxLevelOptions.java @@ -33,6 +33,6 @@ public class MaxLevelOptions extends PluginDependent { */ public void update() { reformatAboveMaxLevel = this.getPlugin().getConfigYml().getBool("lore.above-max-level.reformat"); - aboveMaxLevelFormat = this.getPlugin().getLangYml().getString("above-max-level-color", false); + aboveMaxLevelFormat = this.getPlugin().getLangYml().getBukkitHandle().getString("above-max-level-color"); } }