From 0ecfe0d9923d31f554252d202df28d7534f4331c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 25 Aug 2021 17:37:43 +0100 Subject: [PATCH] Finished GUI line wrapping --- .../com/willfp/ecoskills/skills/SkillGUI.kt | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt index 2ee67b9..12b3a6f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/SkillGUI.kt @@ -71,21 +71,16 @@ class SkillGUI( val wrappedLore = mutableListOf() for (line in lore) { - val whitespaceLen = line.length - line.trim().length - val whitespace = " ".repeat(whitespaceLen) + val indent = " ".repeat(line.length - line.trim().length) val wrapped = WordUtils.wrap( - line, + line.trim(), plugin.configYml.getInt("gui.line-wrap"), "\n${plugin.langYml.getString("line-wrap-color")}", false ).split("\n").toMutableList() - if (wrapped.size > 1) { - wrapped.replaceAll { "$whitespace$it" } - } + wrapped.replaceAll { "$indent$it" } - wrappedLore.addAll( - wrapped - ) + wrappedLore.addAll(wrapped) } wrappedLore @@ -259,21 +254,16 @@ class SkillGUI( val wrappedLore = ArrayList() for (line in lore) { - val whitespaceLen = line.length - line.trim().length - val whitespace = " ".repeat(whitespaceLen) + val indent = " ".repeat(line.length - line.trim().length) val wrapped = WordUtils.wrap( - line, + line.trim(), plugin.configYml.getInt("gui.line-wrap"), "\n${plugin.langYml.getString("line-wrap-color")}", false ).split("\n").toMutableList() - if (wrapped.size > 1) { - wrapped.replaceAll { "$whitespace$it" } - } + wrapped.replaceAll { "$indent$it" } - wrappedLore.addAll( - wrapped - ) + wrappedLore.addAll(wrapped) } meta.lore = wrappedLore