From 4b8e71c5e9ef681a25777cab4c70fb565d2b5716 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Mon, 17 Aug 2026 13:56:01 +0200 Subject: [PATCH 01/11] fix creating new unit repair not working --- .../cuanvil/gui/config/list/UnitRepairElementListGui.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index 9b879fdc..3418c83c 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -93,7 +93,7 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui Date: Thu, 13 Aug 2026 01:51:03 +0200 Subject: [PATCH 02/11] language backend logic --- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 30 ++++-- .../cuanvil/command/ReloadExecutor.kt | 4 + .../kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt | 93 +++++++++++++++++++ .../xyz/alexcrea/cuanvil/lang/Language.kt | 56 +++++++++++ src/main/resources/config.yml | 5 + 5 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index a119bfc7..c88acfd3 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -17,6 +17,7 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant +import xyz.alexcrea.cuanvil.lang.Lang import xyz.alexcrea.cuanvil.listener.AnvilCloseListener import xyz.alexcrea.cuanvil.listener.AnvilResultListener import xyz.alexcrea.cuanvil.listener.ChatEventListener @@ -135,6 +136,25 @@ open class CustomAnvil : JavaPlugin() { */ override fun onEnable() { instance = this + // Load default configuration + try { + if(!ConfigHolder.loadDefaultConfig()) + throw RuntimeException("Error loading configuration file") + } catch (e: Exception) { + logger.log(Level.SEVERE, "error occurred loading default configuration", e) + MetricsUtil.trackError(e) + if(tryDirtyStart()) return + } + + // Load language + try { + Lang.reload() + } catch (e: Exception) { + logger.log(Level.SEVERE, "error occurred loading language file", e) + MetricsUtil.trackError(e) + if(tryDirtyStart()) return + } + try { legacyCheck() } catch (e: Exception) { @@ -143,6 +163,7 @@ open class CustomAnvil : JavaPlugin() { if(trySafeStart()) return } + // Add commands try { CustomAnvilCommand(this) @@ -152,15 +173,6 @@ open class CustomAnvil : JavaPlugin() { if(trySafeStart()) return } - // Load default configuration - try { - if(!ConfigHolder.loadDefaultConfig()) - throw RuntimeException("Error loading configuration file") - } catch (e: Exception) { - logger.log(Level.SEVERE, "error occurred loading default configuration", e) - MetricsUtil.trackError(e) - if(tryDirtyStart()) return - } // Load dependency try { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index d3df341a..bc9a80be 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -8,6 +8,7 @@ import xyz.alexcrea.cuanvil.api.event.CAConfigReadyEvent import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.gui.config.global.* +import xyz.alexcrea.cuanvil.lang.Lang import xyz.alexcrea.cuanvil.update.UpdateHandler class ReloadExecutor : CASubCommand { @@ -58,6 +59,9 @@ class ReloadExecutor : CASubCommand { try { if (!ConfigHolder.reloadAllFromDisk(hardfail)) return false + // reload language config + Lang.reload() + // Then update all global gui containing value from config BasicConfigGui.getInstance()?.updateGuiValues() EnchantCostConfigGui.getInstance()?.updateGuiValues() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt new file mode 100644 index 00000000..b89ca6bd --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt @@ -0,0 +1,93 @@ +package xyz.alexcrea.cuanvil.lang + +import io.delilaheve.CustomAnvil +import xyz.alexcrea.cuanvil.config.ConfigHolder + +object Lang { + + private val default = Language(DEFAULT_LANG, false) + private var lang = default + + fun reload() { + val langID = langID + if(lang.name == langID && lang != default) + lang.reload() + else + lang = Language(langID) + + if(default != lang) default.reload() + } + + fun String.translate(): String { + val value = lang.get(this) + if(value != null) return value + + CustomAnvil.log("Missing language data for ${lang.name} using default") + + return default.get(this) ?: this + } + + fun String.translate(vararg params: Pair): String { + return translate( + params.asSequence() + .map { Pair(it.first, it.second.toString()) } + .toMap() + ) + } + + fun String.translate(vararg params: Pair): String { + return translate( + params.asSequence() + .map { Pair(it.first.toString(), it.second.toString()) } + .toMap() + ) + } + + fun String.translate(vararg params: Pair): String { + return translate(params.toMap()) + } + + fun String.translate(vararg params: Pair): String { + return translate( + params.asSequence() + .map { Pair(it.first.toString(), it.second) } + .toMap() + ) + } + + fun String.translate(params: Map): String { + val builder = StringBuilder(translate()) + + // replace all placeholder thingy %key -> value + for((key, replacement) in params) { + var current = 0 + while(true) { + current = builder.indexOf('%', current) + 1 + if(current < 0 || current + key.length > builder.length) break // may be able to be removed if bound checked in startsWith ? + if(!builder.startsWith(key, current, false)) continue + + builder.replace(current - 1, current + key.length, replacement) + current = current - 1 + replacement.length + } + } + + return builder.toString() + } + + /* + * Config Options & get + */ + const val LANG_PATH = "language" + const val DEFAULT_LANG = "en" + + /** + * Value of an item rename + */ + private val langID: String + get() { + return ConfigHolder.DEFAULT_CONFIG + .config + .getString(LANG_PATH, DEFAULT_LANG)!! + } + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt new file mode 100644 index 00000000..d06f9aba --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt @@ -0,0 +1,56 @@ +package xyz.alexcrea.cuanvil.lang + +import io.delilaheve.CustomAnvil +import org.bukkit.configuration.file.FileConfiguration +import org.bukkit.configuration.file.YamlConfiguration +import java.io.File +import java.io.InputStreamReader +import java.util.logging.Level + + +class Language(private val id: String, private val default: Boolean = false) { + + private val resourcePath: String + private val file: File + + private val conf: FileConfiguration + + init { + conf = YamlConfiguration() + resourcePath = "lang/$id.yml" + file = File(CustomAnvil.instance.dataFolder, resourcePath) + + reload() + } + + fun reload() { + if(file.exists() && !default) try { + conf.load(file) + return + } catch(e: Exception) { + CustomAnvil.instance.logger.log( + Level.SEVERE, + "Could not load custom Anvil config file. using to internal resource", + e + ) + } + + loadInternalResource() + } + + private fun loadInternalResource() { + val input = CustomAnvil.instance.getResource(resourcePath) + if(input != null) + conf.load(InputStreamReader(input)) + else + CustomAnvil.instance.logger.log(Level.SEVERE, "Language $id not found") + + } + + fun get(key: String): String? { + return conf.getString(key) + } + + val name: String + get() = conf.getString("name", id)!! +} \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 218c3a1f..f67ebb17 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -16,6 +16,11 @@ metric_type: auto # Accept true or false (true by default) metric_collect_errors: true +# Which language should the plugin should be +# If you like to add language yourself see TODO link to guide +# Currently available languages: en +language: en + # All anvil cost will be capped to limit_repair_value if enabled. # # In other words: From c63676707880d2020b5c0a61ce44dbb162abdf19 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Thu, 13 Aug 2026 10:10:37 +0200 Subject: [PATCH 03/11] translation key for load errors and warnings --- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 79 +++++++++++--------- src/main/resources/lang/en.yml | 29 +++++++ 2 files changed, 71 insertions(+), 37 deletions(-) create mode 100644 src/main/resources/lang/en.yml diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index c88acfd3..8c284ef4 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -7,8 +7,6 @@ import org.bukkit.plugin.java.JavaPlugin import xyz.alexcrea.cuanvil.api.event.CAConfigReadyEvent import xyz.alexcrea.cuanvil.api.event.CAEnchantRegistryReadyEvent import xyz.alexcrea.cuanvil.command.CustomAnvilCommand -import xyz.alexcrea.cuanvil.command.EditConfigExecutor -import xyz.alexcrea.cuanvil.command.ReloadExecutor import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil @@ -18,6 +16,7 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant import xyz.alexcrea.cuanvil.lang.Lang +import xyz.alexcrea.cuanvil.lang.Lang.translate import xyz.alexcrea.cuanvil.listener.AnvilCloseListener import xyz.alexcrea.cuanvil.listener.AnvilResultListener import xyz.alexcrea.cuanvil.listener.ChatEventListener @@ -109,11 +108,23 @@ open class CustomAnvil : JavaPlugin() { } } + /** + * Error Logging handler + */ + @JvmStatic fun logError(message: String, throwable: Throwable? = null, track: Boolean = true) { + instance.logger.log(Level.SEVERE, message, throwable) + addToLogQueue(message) + + if(track && throwable != null) { + MetricsUtil.trackError(throwable) + } + } } // stop plugin if we do not force a dirty start (true by default) // Return true if start was stopped private fun tryDirtyStart(): Boolean { + if(ConfigHolder.DEFAULT_CONFIG == null) return false if(!ConfigHolder.DEFAULT_CONFIG.config.getBoolean("dirty_start", false)) { Bukkit.getPluginManager().disablePlugin(this) return true @@ -124,6 +135,7 @@ open class CustomAnvil : JavaPlugin() { // stop plugin if we force a safe start (false by default) // Return true if start was stopped private fun trySafeStart(): Boolean { + if(ConfigHolder.DEFAULT_CONFIG == null) return false if(ConfigHolder.DEFAULT_CONFIG.config.getBoolean("safe_start", false)) { Bukkit.getPluginManager().disablePlugin(this) return true @@ -141,8 +153,7 @@ open class CustomAnvil : JavaPlugin() { if(!ConfigHolder.loadDefaultConfig()) throw RuntimeException("Error loading configuration file") } catch (e: Exception) { - logger.log(Level.SEVERE, "error occurred loading default configuration", e) - MetricsUtil.trackError(e) + logError("error occurred loading default configuration", e) if(tryDirtyStart()) return } @@ -150,16 +161,14 @@ open class CustomAnvil : JavaPlugin() { try { Lang.reload() } catch (e: Exception) { - logger.log(Level.SEVERE, "error occurred loading language file", e) - MetricsUtil.trackError(e) + logError("error occurred loading language file", e) if(tryDirtyStart()) return } try { legacyCheck() } catch (e: Exception) { - logger.log(Level.SEVERE, "error trying to check for legacy system", e) - MetricsUtil.trackError(e) + logError("error.load.legacy.failed".translate(), e) if(trySafeStart()) return } @@ -168,8 +177,7 @@ open class CustomAnvil : JavaPlugin() { try { CustomAnvilCommand(this) } catch (e: Exception) { - logger.log(Level.SEVERE, "error trying to register commands", e) - MetricsUtil.trackError(e) + logError("error.load.command-register".translate(), e) if(trySafeStart()) return } @@ -178,8 +186,7 @@ open class CustomAnvil : JavaPlugin() { try { DependencyManager.loadDependency() } catch (e: Exception) { - logger.log(Level.SEVERE, "error loading dependency compatibility", e) - MetricsUtil.trackError(e) + logError("error.load.compatibility".translate(), e) if(tryDirtyStart()) return } @@ -187,8 +194,7 @@ open class CustomAnvil : JavaPlugin() { try { registerListeners() } catch (e: Exception) { - logger.log(Level.SEVERE, "error registering listeners", e) - MetricsUtil.trackError(e) + logError("error.load.listeners".translate(), e) if(tryDirtyStart()) return } @@ -204,32 +210,22 @@ open class CustomAnvil : JavaPlugin() { MetricsUtil.shutdownMetrics() } - private fun loadEnchantmentSystemDirty() { - try { - loadEnchantmentSystem() - } catch (e: Exception) { - logger.log(Level.SEVERE, "error initializing enchantment system", e) - MetricsUtil.trackError(e) - tryDirtyStart() - } - } - private fun legacyCheck() { // Disable old plugin name if exist val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus") if (potentialPlugin != null) { Bukkit.getPluginManager().disablePlugin(potentialPlugin) - logger.warning("An old version of this plugin was detected") - logger.warning("Please note CustomAnvil is a more recent version of UnsafeEnchantsPlus") + logger.warning("warning.load.legacy.old-name.1".translate()) + logger.warning("warning.load.legacy.old-name.2".translate()) } val isPaper = PlatformUtil.isPaper if(!isPaper) { - logger.warning("It seems you are using spigot") - logger.warning("Please take notice that spigot is less supported than paper and derivatives") + logger.warning("warning.load.legacy.spigot.1".translate()) + logger.warning("warning.load.legacy.spigot.2".translate()) if(MinecraftVersionUtil.isTooNewForSpigot) { - logger.warning("If replace too expensive is not working this is likely because of spigot") - logger.warning("As native nms is not supported for spigot starting 26.1") + logger.warning("warning.load.legacy.spigot-old.1".translate()) + logger.warning("warning.load.legacy.spigot-old.1".translate()) } } @@ -242,13 +238,13 @@ open class CustomAnvil : JavaPlugin() { UpdateUtils.currentMinecraftVersion().toString()) .setFeatured(featured) .setOnError { - logger.log(Level.WARNING, "error trying to fetch latest update", it) + logger.log(Level.WARNING, "error.load.update.check-fail".translate(), it) } .checkVersion { latestVer: String? -> CustomAnvil.latestVer = latestVer if(latestVer == null || version.contains(latestVer)) return@checkVersion - logger.warning("An update may be available: $latestVer") + logger.warning("warning.load.update.available".translate(Pair("version", latestVer))) } } @@ -263,6 +259,15 @@ open class CustomAnvil : JavaPlugin() { server.pluginManager.registerEvents(AnvilCloseListener(DependencyManager.packetManager), this) } + private fun loadEnchantmentSystemDirty() { + try { + loadEnchantmentSystem() + } catch (e: Exception) { + logError("error.load.enchant-system".translate(), e) + tryDirtyStart() + } + } + private fun loadEnchantmentSystem(){ // Register enchantments CAEnchantmentRegistry.getInstance().registerBukkit() @@ -273,7 +278,7 @@ open class CustomAnvil : JavaPlugin() { // Load config if (!ConfigHolder.loadNonDefaultConfig()) { - logger.log(Level.SEVERE,"Plugin has an issue while trying to load non default config... exiting...") + logError("error.load.non-default-config".translate()) server.pluginManager.disablePlugin(this) return } @@ -327,15 +332,15 @@ open class CustomAnvil : JavaPlugin() { try { val configReader = FileReader(resourceFile) yamlConfig.load(configReader) - } catch (test: Exception) { + } catch (_: Exception) { if (hardFailSafe) { // This is important and may impact gameplay if it does not load. // Failsafe is to stop the plugin - logger.severe("Resource ${resourceFile.path} Could not be load or reload.") - logger.severe("Disabling plugin.") + logError("error.reload.resource.fail".translate(Pair("path", resourceFile.path))) + logError("error.reload.resource.hard-fail".translate()) Bukkit.getPluginManager().disablePlugin(this) } else { - logger.warning("Resource ${resourceFile.path} Could not be load or reload.") + logError("error.reload.resource.fail".translate(Pair("path", resourceFile.path))) } return null } diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml new file mode 100644 index 00000000..d466dd53 --- /dev/null +++ b/src/main/resources/lang/en.yml @@ -0,0 +1,29 @@ +name: English + +warning: + load: + legacy: + old-name: + 1: "An old version of this plugin was detected" + 2: "Please note CustomAnvil is a more recent version of UnsafeEnchantsPlus" + spigot: + 1: "It seems you are using spigot" + 2: "Please take notice that spigot is less supported than paper and derivatives" + spigot-old: + 1: "If replace too expensive is not working this is likely because of spigot" + 2: "As native nms is not supported for spigot starting 26.1" + update.available: "An update may be available: %version" + +error: + load: + legacy.failed: "error trying to check for legacy system" + update.check-fail: "error trying to fetch latest update" + command-register: "error trying to register commands" + compatibility: "error loading dependency compatibility" + listeners: "error registering listeners" + enchant-system: "error initializing enchantment system" + non-default-config: "Plugin has an issue while trying to load non default config... exiting..." + reload: + resource: + fail: "Resource %path Could not be loaded or reloaded." + hard-fail: "Disabling plugin." From cb6040df10b0a4a3c54b3c939048a55418a15e06 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Thu, 13 Aug 2026 13:10:22 +0200 Subject: [PATCH 04/11] better translation system --- .../{PaperSpigotUtil.kt => PlatformUtil.kt} | 17 ++- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 51 ++++--- .../cuanvil/command/DiagnosticExecutor.kt | 3 +- .../kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt | 53 +------- .../xyz/alexcrea/cuanvil/lang/Language.kt | 1 - .../xyz/alexcrea/cuanvil/lang/Message.kt | 128 ++++++++++++++++++ .../kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt | 4 + .../xyz/alexcrea/cuanvil/lang/MsgError.kt | 26 ++++ .../xyz/alexcrea/cuanvil/lang/MsgWarning.kt | 17 +++ .../xyz/alexcrea/cuanvil/util/MetricsUtil.kt | 4 +- src/main/resources/lang/en.yml | 36 +++++ 11 files changed, 257 insertions(+), 83 deletions(-) rename nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/{PaperSpigotUtil.kt => PlatformUtil.kt} (88%) create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt diff --git a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt similarity index 88% rename from nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt rename to nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt index 20972bfa..3b47adaa 100644 --- a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt +++ b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt @@ -2,7 +2,7 @@ package xyz.alexcrea.cuanvil.dependency.util import net.kyori.adventure.text.Component import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer -import org.bukkit.inventory.ItemStack +import org.bukkit.command.CommandSender import org.bukkit.inventory.meta.ItemMeta // Mostly made for paper, spigot and folia support @@ -100,4 +100,19 @@ object PlatformUtil { } } + /** + * Try to send paper component to the player + * + * @param component The used component + * @return true if sent, else otherwise + */ + fun CommandSender.sendPaperMessage(component: Component): Boolean { + if(isPaper) { + this.sendMessage(component) + return true + } + + return false + } + } diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index 8c284ef4..df000bce 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -16,7 +16,8 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant import xyz.alexcrea.cuanvil.lang.Lang -import xyz.alexcrea.cuanvil.lang.Lang.translate +import xyz.alexcrea.cuanvil.lang.MsgError +import xyz.alexcrea.cuanvil.lang.MsgWarning import xyz.alexcrea.cuanvil.listener.AnvilCloseListener import xyz.alexcrea.cuanvil.listener.AnvilResultListener import xyz.alexcrea.cuanvil.listener.ChatEventListener @@ -111,12 +112,12 @@ open class CustomAnvil : JavaPlugin() { /** * Error Logging handler */ - @JvmStatic fun logError(message: String, throwable: Throwable? = null, track: Boolean = true) { - instance.logger.log(Level.SEVERE, message, throwable) - addToLogQueue(message) + @JvmStatic fun logError(message: String, throwable: Throwable? = null, track: Boolean = true, level: Level = Level.SEVERE) { + instance.logger.log(level, message, throwable) + addToLogQueue("Error: $message") - if(track && throwable != null) { - MetricsUtil.trackError(throwable) + if(track) { + MetricsUtil.trackError(message, throwable) } } } @@ -168,7 +169,7 @@ open class CustomAnvil : JavaPlugin() { try { legacyCheck() } catch (e: Exception) { - logError("error.load.legacy.failed".translate(), e) + MsgError.LOAD_LEGACY_FAILED.log(e) if(trySafeStart()) return } @@ -177,7 +178,7 @@ open class CustomAnvil : JavaPlugin() { try { CustomAnvilCommand(this) } catch (e: Exception) { - logError("error.load.command-register".translate(), e) + MsgError.LOAD_COMMAND_REGISTER.log(e) if(trySafeStart()) return } @@ -186,7 +187,7 @@ open class CustomAnvil : JavaPlugin() { try { DependencyManager.loadDependency() } catch (e: Exception) { - logError("error.load.compatibility".translate(), e) + MsgError.LOAD_COMPATIBILITY.log(e) if(tryDirtyStart()) return } @@ -194,7 +195,7 @@ open class CustomAnvil : JavaPlugin() { try { registerListeners() } catch (e: Exception) { - logError("error.load.listeners".translate(), e) + MsgError.LOAD_LISTENERS.log(e) if(tryDirtyStart()) return } @@ -215,18 +216,15 @@ open class CustomAnvil : JavaPlugin() { val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus") if (potentialPlugin != null) { Bukkit.getPluginManager().disablePlugin(potentialPlugin) - logger.warning("warning.load.legacy.old-name.1".translate()) - logger.warning("warning.load.legacy.old-name.2".translate()) + MsgWarning.LOAD_LEGACY_OLD_NAME.log() } val isPaper = PlatformUtil.isPaper if(!isPaper) { - logger.warning("warning.load.legacy.spigot.1".translate()) - logger.warning("warning.load.legacy.spigot.2".translate()) - if(MinecraftVersionUtil.isTooNewForSpigot) { - logger.warning("warning.load.legacy.spigot-old.1".translate()) - logger.warning("warning.load.legacy.spigot-old.1".translate()) - } + MsgWarning.LOAD_LEGACY_SPIGOT.log() + if(MinecraftVersionUtil.isTooNewForSpigot) + MsgWarning.LOAD_LEGACY_SPIGOT_OLD.log() + } val loader = if(isPaper) "paper" else "spigot" @@ -238,13 +236,13 @@ open class CustomAnvil : JavaPlugin() { UpdateUtils.currentMinecraftVersion().toString()) .setFeatured(featured) .setOnError { - logger.log(Level.WARNING, "error.load.update.check-fail".translate(), it) + MsgError.LOAD_UPDATE_CHECK_FAIL.log(it, level = Level.WARNING, track = false) } .checkVersion { latestVer: String? -> CustomAnvil.latestVer = latestVer if(latestVer == null || version.contains(latestVer)) return@checkVersion - logger.warning("warning.load.update.available".translate(Pair("version", latestVer))) + MsgWarning.LOAD_UPDATE_AVAILABLE.log(latestVer) } } @@ -263,7 +261,7 @@ open class CustomAnvil : JavaPlugin() { try { loadEnchantmentSystem() } catch (e: Exception) { - logError("error.load.enchant-system".translate(), e) + MsgError.LOAD_ENCHANT_SYSTEM.log(e) tryDirtyStart() } } @@ -278,7 +276,7 @@ open class CustomAnvil : JavaPlugin() { // Load config if (!ConfigHolder.loadNonDefaultConfig()) { - logError("error.load.non-default-config".translate()) + MsgError.LOAD_NON_DEFAULT_CONFIG.log() server.pluginManager.disablePlugin(this) return } @@ -332,16 +330,15 @@ open class CustomAnvil : JavaPlugin() { try { val configReader = FileReader(resourceFile) yamlConfig.load(configReader) - } catch (_: Exception) { + } catch (e: Exception) { + MsgError.RELOAD_FAIL.log(e, resourceFile.path) if (hardFailSafe) { // This is important and may impact gameplay if it does not load. // Failsafe is to stop the plugin - logError("error.reload.resource.fail".translate(Pair("path", resourceFile.path))) - logError("error.reload.resource.hard-fail".translate()) + MsgError.RELOAD_HARD_FAIL.log() Bukkit.getPluginManager().disablePlugin(this) - } else { - logError("error.reload.resource.fail".translate(Pair("path", resourceFile.path))) } + return null } return yamlConfig diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt index c2293afc..4998f14d 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt @@ -122,8 +122,7 @@ class DiagnosticExecutor : CASubCommand { if (sender is HumanEntity) { if (hasError) - sender.spigot() - .sendMessage(TextComponent(ChatColor.RED.toString() + "There was an error running the diagnostic")) + sender.sendMessage(ChatColor.RED.toString() + "There was an error running the diagnostic") val message = TextComponent(ChatColor.GREEN.toString() + "Click to copy diagnostic data") message.clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, stb.toString()) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt index b89ca6bd..db8a2b29 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt @@ -18,60 +18,13 @@ object Lang { if(default != lang) default.reload() } - fun String.translate(): String { - val value = lang.get(this) + fun getTranslated(key: String): String { + val value = lang.get(key) if(value != null) return value CustomAnvil.log("Missing language data for ${lang.name} using default") - return default.get(this) ?: this - } - - fun String.translate(vararg params: Pair): String { - return translate( - params.asSequence() - .map { Pair(it.first, it.second.toString()) } - .toMap() - ) - } - - fun String.translate(vararg params: Pair): String { - return translate( - params.asSequence() - .map { Pair(it.first.toString(), it.second.toString()) } - .toMap() - ) - } - - fun String.translate(vararg params: Pair): String { - return translate(params.toMap()) - } - - fun String.translate(vararg params: Pair): String { - return translate( - params.asSequence() - .map { Pair(it.first.toString(), it.second) } - .toMap() - ) - } - - fun String.translate(params: Map): String { - val builder = StringBuilder(translate()) - - // replace all placeholder thingy %key -> value - for((key, replacement) in params) { - var current = 0 - while(true) { - current = builder.indexOf('%', current) + 1 - if(current < 0 || current + key.length > builder.length) break // may be able to be removed if bound checked in startsWith ? - if(!builder.startsWith(key, current, false)) continue - - builder.replace(current - 1, current + key.length, replacement) - current = current - 1 + replacement.length - } - } - - return builder.toString() + return default.get(key) ?: key } /* diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt index d06f9aba..d6054ba2 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt @@ -7,7 +7,6 @@ import java.io.File import java.io.InputStreamReader import java.util.logging.Level - class Language(private val id: String, private val default: Boolean = false) { private val resourcePath: String diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt new file mode 100644 index 00000000..be4b8f41 --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -0,0 +1,128 @@ +package xyz.alexcrea.cuanvil.lang + +import io.delilaheve.CustomAnvil +import net.kyori.adventure.text.Component +import org.bukkit.command.CommandSender +import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.sendPaperMessage +import xyz.alexcrea.cuanvil.util.MiniMessageUtil +import java.util.logging.Level +import kotlin.math.min + +interface MessageLike { + + fun log(vararg params: Any) + + fun send(destination: CommandSender, vararg params: Any) +} + +enum class MessageType { + DEFAULT, + WARNING, + ERROR, +} + +open class Message(val key: String, vararg val params: String) : MessageLike { + + protected fun replaceParameters(stb: StringBuilder, vararg values: Any) { + // replace all placeholder thingy %key -> value + + for(i in 0 until min(params.size, values.size)) { + val key = params[i] + val replacement = values[i].toString() + + var current = 0 + while(true) { + current = stb.indexOf('%', current) + 1 + if(current < 0 || current + key.length > stb.length) break // may be able to be removed if bound checked in startsWith ? + if(!stb.startsWith(key, current, false)) continue + + stb.replace(current - 1, current + key.length, replacement) + current = current - 1 + replacement.length + } + } + } + + fun unformatted(vararg params: Any): String { + val translated = Lang.getTranslated(key) + if(params.isEmpty()) return translated + + val stb = StringBuilder(translated) + replaceParameters(stb, *params) + return stb.toString() + } + + fun formatted(vararg params: Any): Component { + val unformatted = unformatted(*params) + + return MiniMessageUtil.mm.deserialize(unformatted) + } + + override fun log(vararg params: Any) { + val text = unformatted(*params) + + CustomAnvil.instance.logger.info(text) + } + + override fun send(destination: CommandSender, vararg params: Any) { + val message = formatted(*params) + if(!destination.sendPaperMessage(message)) + destination.sendMessage(MiniMessageUtil.legacy_mm.serialize(message)) + } +} + +class WarningMessage(key: String, vararg params: String) : Message("warning.$key", *params) { + + override fun log(vararg params: Any) { + val text = unformatted(*params) + + CustomAnvil.instance.logger.warning(text) + } + +} + +class ErrorMessage(key: String, vararg params: String) : Message("error.$key", *params) { + + override fun log(vararg params: Any) { + val text = unformatted(*params) + + CustomAnvil.logError(text) + } + + fun log(e: Throwable, vararg params: Any, level: Level = Level.SEVERE, track: Boolean = true) { + val text = unformatted(*params) + + CustomAnvil.logError(text, e, track, level) + } +} + +class MultiLineMessage(type: MessageType, baseKey: String, count: Int, vararg params: String) : MessageLike { + + private val messages = ArrayList() + + init { + for(i in 1 until count + 1) { + val message = createNew(type, "$baseKey.$i", *params) + messages.add(message) + } + } + + private fun createNew(type: MessageType, key: String, vararg params: String): MessageLike { + return when(type) { + MessageType.DEFAULT -> Message(key, *params) + MessageType.WARNING -> WarningMessage(key, *params) + MessageType.ERROR -> ErrorMessage(key, *params) + } + } + + override fun log(vararg params: Any) { + for(message in messages) { + message.log(*params) + } + } + + override fun send(destination: CommandSender, vararg params: Any) { + for(message in messages) { + message.send(destination, *params) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt new file mode 100644 index 00000000..7823f79d --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt @@ -0,0 +1,4 @@ +package xyz.alexcrea.cuanvil.lang + +object Msg { +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt new file mode 100644 index 00000000..6e5e26fb --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt @@ -0,0 +1,26 @@ +package xyz.alexcrea.cuanvil.lang + +object MsgError { + + /* + * ----------------- + * Load and reload + * ----------------- + */ + val LOAD_UPDATE_CHECK_FAIL = ErrorMessage("load.update.check-fail") + val LOAD_LEGACY_FAILED = ErrorMessage("load.legacy.failed") + val LOAD_COMMAND_REGISTER = ErrorMessage("load.command-register") + val LOAD_COMPATIBILITY = ErrorMessage("load.compatibility") + val LOAD_LISTENERS = ErrorMessage("load.listeners") + val LOAD_ENCHANT_SYSTEM = ErrorMessage("load.enchant-system") + val LOAD_NON_DEFAULT_CONFIG = ErrorMessage("load.non-default-config") + + val RELOAD_FAIL = ErrorMessage("reload.resource.fail", "path") + val RELOAD_HARD_FAIL = ErrorMessage("reload.resource.hardfail") + + /* + * ---------- + * Commands + * ---------- + */ +} diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt new file mode 100644 index 00000000..aa7af304 --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt @@ -0,0 +1,17 @@ +package xyz.alexcrea.cuanvil.lang + +object MsgWarning { + + /* + * --------------- + * Load and reload + * --------------- + */ + val LOAD_UPDATE_AVAILABLE = WarningMessage("load.update.available", "version") + + val LOAD_LEGACY_OLD_NAME = MultiLineMessage(MessageType.WARNING, "load.legacy.old-name", 2) + val LOAD_LEGACY_SPIGOT = MultiLineMessage(MessageType.WARNING, "load.legacy.spigot", 2) + val LOAD_LEGACY_SPIGOT_OLD = MultiLineMessage(MessageType.WARNING, "load.legacy.spigot", 2) + + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt index 1763db56..88004112 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt @@ -74,8 +74,8 @@ object MetricsUtil { lastError = e } - fun trackError(message: String) { - ERROR_TRACKER?.trackError(message) + fun trackError(message: String, cause: Throwable? = null) { + trackError(RuntimeException(message, cause)) } } diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml index d466dd53..b0c96009 100644 --- a/src/main/resources/lang/en.yml +++ b/src/main/resources/lang/en.yml @@ -1,4 +1,5 @@ name: English +last-updated: 2.1.0 warning: load: @@ -27,3 +28,38 @@ error: resource: fail: "Resource %path Could not be loaded or reloaded." hard-fail: "Disabling plugin." + +command: + shared: + no-diag-permission: "You do not have permission to diagnostic this server" + # I try to avoid using & for color but this is for a bungee text component + hover-copy: "§7Click to copy" + warning: + missing-subcmd: "Need to specify a subcommand. for example %example1 or %example2" + root: + warning: + unknown-sub: "Invalid subcommand. run `%command help` to see available commands" + error: + generic: "Error running this command" + debug: + description: "Used to toggle debug logs and retrieve them" + log-cleared: "Log Cleared" + toggled: "Debug toggled to %type" + # I try to avoid using & for color but this is for a bungee text component + copy: "§aClick to copy log data" + data: + header: "Debug Log data:" + line-count: "Found %count lines" + warning: + unspecified-type: "Need to specify which type of debug to toggle: \"default\" or \"verbose\"" + no-log: "No log to show ? make sure you tried with debug log toggled (%command)" + diagnostic: + description: "Basic diagnostic of this plugin" + had-error: "There was an error running the diagnostic" + # I try to avoid using & for color but this is for a bungee text component + copy: "§aClick to copy diagnostic data" + config: + description: "Used to edit the configuration of the plugin" + + warning: + legacy-name: "/ca gui has been moved to /ca config" \ No newline at end of file From 47e38bd23b3dc76ec392010c693bbb83d1078abd Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sat, 15 Aug 2026 05:15:11 +0200 Subject: [PATCH 05/11] finished adding command text to trans file --- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 5 +- .../alexcrea/cuanvil/command/CASubCommand.kt | 3 +- .../cuanvil/command/CustomAnvilCommand.kt | 7 +- .../cuanvil/command/DebugToggleExecutor.kt | 68 +++++++++-------- .../cuanvil/command/DiagnosticExecutor.kt | 17 +++-- .../cuanvil/command/EditConfigExecutor.kt | 49 ++++++------ .../cuanvil/command/EnchantExecutor.kt | 54 +++++++------- .../alexcrea/cuanvil/command/HelpExecutor.kt | 31 ++++---- .../cuanvil/command/ReloadExecutor.kt | 34 +++++---- .../xyz/alexcrea/cuanvil/lang/Message.kt | 57 +++++++++++--- .../xyz/alexcrea/cuanvil/lang/MsgCommand.kt | 74 +++++++++++++++++++ .../kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt | 6 ++ .../xyz/alexcrea/cuanvil/lang/MsgWarning.kt | 25 +++++-- .../alexcrea/cuanvil/util/ComponentUtil.kt | 14 ++++ src/main/resources/lang/en.yml | 43 +++++++++-- 15 files changed, 334 insertions(+), 153 deletions(-) create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt create mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index df000bce..7ff46191 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -1,6 +1,7 @@ package io.delilaheve import io.delilaheve.util.ConfigOptions +import net.kyori.adventure.text.Component import org.bukkit.Bukkit import org.bukkit.configuration.file.YamlConfiguration import org.bukkit.plugin.java.JavaPlugin @@ -76,7 +77,7 @@ open class CustomAnvil : JavaPlugin() { var latestVer: String? = null // Debug - val debugStorageQueue = ArrayDeque() + val debugStorageQueue = ArrayDeque() private fun addToLogQueue(message: String) { if(debugStorageQueue.size >= 200) { @@ -84,7 +85,7 @@ open class CustomAnvil : JavaPlugin() { debugStorageQueue.removeFirst() } - debugStorageQueue.addLast(message) + debugStorageQueue.addLast(Component.text(message)) } /** diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt index ede87e9a..ec893559 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt @@ -3,6 +3,7 @@ package xyz.alexcrea.cuanvil.command import org.bukkit.command.Command import org.bukkit.command.CommandSender import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry +import xyz.alexcrea.cuanvil.lang.MessageLike interface CASubCommand { @@ -21,7 +22,7 @@ interface CASubCommand { list: MutableList ) - fun description(): String + fun description(): MessageLike fun allEnchantmentsByName(): Collection { val names = mutableSetOf() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CustomAnvilCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CustomAnvilCommand.kt index 1cae583f..ef4a3f41 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CustomAnvilCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CustomAnvilCommand.kt @@ -6,6 +6,7 @@ import org.bukkit.command.Command import org.bukkit.command.CommandExecutor import org.bukkit.command.CommandSender import org.bukkit.command.TabCompleter +import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.MetricsUtil class CustomAnvilCommand(plugin: CustomAnvil) : CommandExecutor, TabCompleter { @@ -57,15 +58,15 @@ class CustomAnvilCommand(plugin: CustomAnvil) : CommandExecutor, TabCompleter { } if (subcmd == null || !subcmd.allowed(sender)) { - sender.sendMessage("Invalid subcommand. run `$cmdstr help` to see available commands") + MsgCommand.ROOT_UNKNOWN_SUBCOMMAND.send(sender, cmdstr) return true } try { return subcmd.executeCommand(sender, cmd, subcmdStr, newargs) } catch (e: Throwable) { - MetricsUtil.trackError(e) - sender.sendMessage("§cError running this command") + CustomAnvil.logError("Error running /$cmdstr ${args.joinToString(" ")}", e) + MsgCommand.ROOT_ERROR_SUBCOMMAND.send(sender) return false } } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt index 302ff782..c0c4862f 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt @@ -6,16 +6,17 @@ import net.md_5.bungee.api.chat.ClickEvent import net.md_5.bungee.api.chat.HoverEvent import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.chat.hover.content.Text -import org.bukkit.ChatColor import org.bukkit.command.Command import org.bukkit.command.CommandSender import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.command.DiagnosticExecutor.Companion.NO_DIAG_PERM +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand +import xyz.alexcrea.cuanvil.util.MiniMessageUtil class DebugToggleExecutor : CASubCommand { - override fun description(): String { - return "Used to toggle debug logs and retrieve it" + override fun description(): MessageLike { + return MsgCommand.DEBUG_DESCRIPTION } override fun allowed(sender: CommandSender): Boolean { @@ -26,18 +27,18 @@ class DebugToggleExecutor : CASubCommand { sender: CommandSender, cmd: Command, cmdstr: String, - args: Array + args: Array, ): Boolean { - if (!allowed(sender)) { - sender.sendMessage(NO_DIAG_PERM) + if(!allowed(sender)) { + MsgCommand.SHARED_NO_DIAG_PERM.send(sender) return false } - if (args.isEmpty()) { - sender.sendMessage("Need to specify a subcommand: \"toggle\" or \"get\"") + if(args.isEmpty()) { + MsgCommand.SHARED_MISSING_SUBCOMMAND.send(sender) return true } - when (args[0].lowercase()) { + when(args[0].lowercase()) { "toggle" -> executeToggle(sender, args) "get" -> executeGet(sender) "get-and-clear" -> { @@ -47,52 +48,57 @@ class DebugToggleExecutor : CASubCommand { "clear" -> { CustomAnvil.debugStorageQueue.clear() - sender.sendMessage("Log Cleared") + MsgCommand.DEBUG_LOG_CLEARED.send(sender) } - else -> return false + else -> { + MsgCommand.SHARED_UNKNOWN_SUB_COMMAND.send(sender) + return false + } } return true } private fun executeToggle(sender: CommandSender, args: Array) { - if (args.size < 2) { - sender.sendMessage("Need to specify which type of debug to toggle: \"default\" or \"verbose\"") + if(args.size < 2) { + MsgCommand.DEBUG_WARNING_UNSPECIFIED_TYPE.send(sender) return } - when (args[1].lowercase()) { + when(args[1].lowercase()) { "default" -> { ConfigOptions.OVERRIDE_DEBUG_LOG = !ConfigOptions.debugLog - sender.sendMessage("Debug toggle to: ${ConfigOptions.debugLog}") + MsgCommand.DEBUG_TOGGLED.send(sender, ConfigOptions.debugLog) } "verbose" -> { ConfigOptions.OVERRIDE_VERBOSE_DEBUG_LOG = !ConfigOptions.verboseDebugLog - sender.sendMessage("Debug toggle to: ${ConfigOptions.verboseDebugLog}") + MsgCommand.DEBUG_TOGGLED.send(sender, ConfigOptions.debugLog) } - else -> sender.sendMessage("Invalid debug type: ${args[1]}") + else -> MsgCommand.DEBUG_WARNING_INVALID_TYPE.send(sender, ConfigOptions.debugLog) } - } private fun executeGet(sender: CommandSender) { - val stb = StringBuilder("Debug Log data:") - if (CustomAnvil.debugStorageQueue.isEmpty()) { - sender.sendMessage("No log to show ? make sure you tried with debug log toggled (/ca debug toggle)") + if(CustomAnvil.debugStorageQueue.isEmpty()) { + MsgCommand.DEBUG_WARNING_NO_LOG.send(sender, "/ca debug toggle") return } - stb.append("\nFound ${CustomAnvil.debugStorageQueue.size} lines\n") - for (log in CustomAnvil.debugStorageQueue) { - stb.append('\n').append(log) + val stb = StringBuilder(MsgCommand.DEBUG_DATA_HEADER.unformatted()).append(' ') + stb.append(MsgCommand.DEBUG_DATA_LINE_COUNT.unformatted(CustomAnvil.debugStorageQueue.size)) + for(log in CustomAnvil.debugStorageQueue) { + stb.append('\n').append(MiniMessageUtil.plain_text_mm.serialize(log)) } - if (sender is Player) { - val message = TextComponent(ChatColor.GREEN.toString() + "Click to copy log data") + if(sender is Player) { + val message = TextComponent(MsgCommand.DEBUG_COPY.legacy()) message.clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, stb.toString()) - message.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, Text("§7Click to copy")) + message.hoverEvent = HoverEvent( + HoverEvent.Action.SHOW_TEXT, + Text(MsgCommand.SHARED_HOVER_COPY.legacy()) + ) sender.spigot().sendMessage(message); } else { @@ -101,12 +107,12 @@ class DebugToggleExecutor : CASubCommand { } override fun tabCompleter(sender: CommandSender, args: Array, list: MutableList) { - if (!allowed(sender)) return + if(!allowed(sender)) return list.addAll( - when (args.size) { + when(args.size) { 1 -> listOf("toggle", "get", "get-and-clear", "clear") - 2 -> when (args[0].lowercase()) { + 2 -> when(args[0].lowercase()) { "toggle" -> listOf("default", "verbose") else -> listOf() } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt index 4998f14d..b015fde0 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt @@ -6,7 +6,6 @@ import net.md_5.bungee.api.chat.HoverEvent import net.md_5.bungee.api.chat.TextComponent import net.md_5.bungee.api.chat.hover.content.Text import org.bukkit.Bukkit -import org.bukkit.ChatColor import org.bukkit.Material import org.bukkit.command.Command import org.bukkit.command.CommandSender @@ -25,15 +24,17 @@ import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.dependency.packet.NoPacketManager import xyz.alexcrea.cuanvil.dependency.packet.ProtocoLibWrapper import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener import xyz.alexcrea.cuanvil.util.MetricsUtil import java.util.* import java.util.stream.Collectors +@Suppress("UnstableApiUsage") class DiagnosticExecutor : CASubCommand { companion object { - const val NO_DIAG_PERM = "You do not have permission to diagnostic this server" fun fetchNMSType(): String { val packetManager = DependencyManager.packetManager @@ -101,7 +102,7 @@ class DiagnosticExecutor : CASubCommand { args: Array ): Boolean { if (!allowed(sender)) { - sender.sendMessage(NO_DIAG_PERM) + MsgCommand.SHARED_NO_DIAG_PERM.send(sender) return false } @@ -122,11 +123,11 @@ class DiagnosticExecutor : CASubCommand { if (sender is HumanEntity) { if (hasError) - sender.sendMessage(ChatColor.RED.toString() + "There was an error running the diagnostic") - val message = TextComponent(ChatColor.GREEN.toString() + "Click to copy diagnostic data") + MsgCommand.DIAGNOSTIC_ERROR_GENERIC.send(sender) + val message = TextComponent(MsgCommand.DIAGNOSTIC_COPY.legacy()) message.clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, stb.toString()) - message.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, Text("§7Click to copy")) + message.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, Text(MsgCommand.SHARED_HOVER_COPY.legacy())) sender.spigot().sendMessage(message) } else { @@ -213,8 +214,8 @@ class DiagnosticExecutor : CASubCommand { return this.name + " v" + this.description.version } - override fun description(): String { - return "Basic diagnostic of this plugin" + override fun description(): MessageLike { + return MsgCommand.DIAGNOSTIC_DESCRIPTION } private fun pluginListDiag(sender: CommandSender, stb: StringBuilder) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt index 79151cd3..0fc522d2 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt @@ -11,6 +11,8 @@ import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.config.global.EnchantConfigGui import xyz.alexcrea.cuanvil.gui.config.global.ItemConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.MaterialUtil.customType import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir @@ -20,42 +22,38 @@ class EditConfigExecutor : CASubCommand { return sender.hasPermission(CustomAnvil.editConfigPermission) } - override fun description(): String { - return "Gui to edit the plugin's config" + override fun description(): MessageLike { + return MsgCommand.CONFIG_DESCRIPTION } override fun executeCommand( sender: CommandSender, cmd: Command, cmdstr: String, - args: Array + args: Array, ): Boolean { - if (sender !is HumanEntity) return false + if(sender !is HumanEntity) return false - if (!allowed(sender)) { + if(!allowed(sender)) { sender.sendMessage(GuiGlobalActions.NO_EDIT_PERM) return false } - if (PlatformUtil.isFolia) { - sender.sendMessage("§cIt look like you are using Folia. Sadly Custom Anvil do not support Config gui for Folia.") - sender.sendMessage("§eIt is may come in a future version.") - sender.sendMessage("") - sender.sendMessage("§eCurrently you need to edit manually the config or copy from another server (spigot or better)") - sender.sendMessage("§eThen /ca reload after config file is edited") + if(PlatformUtil.isFolia) { + MsgCommand.CONFIG_FOLIA_ISSUE.send(sender) return false } - if ("gui".equals(cmdstr, ignoreCase = true)) { - sender.sendMessage("§c/ca gui has been moved to /ca config") + if("gui".equals(cmdstr, ignoreCase = true)) { + MsgCommand.CONFIG_LEGACY_NAME_WARNING.send(sender) } - if (args.isEmpty()) + if(args.isEmpty()) processOpen(sender) - else when (args[0].lowercase()) { + else when(args[0].lowercase()) { "open" -> processOpen(sender) "enchant" -> processEnchant(sender, args) "item" -> processItem(sender) - else -> sender.sendMessage("Unknown subcommand \"${args[0]}\"") + else -> MsgCommand.SHARED_UNKNOWN_SUB_COMMAND.send(sender) } return true @@ -63,31 +61,30 @@ class EditConfigExecutor : CASubCommand { private fun processEnchant(sender: HumanEntity, args: Array) { val enchantToFilter: Set - if (args.size <= 1) { + if(args.size <= 1) { val item = sender.inventory.itemInMainHand enchantToFilter = EnchantmentApi.getEnchantments(item).keys - if (enchantToFilter.isEmpty()) { - sender.sendMessage("No enchantment found in the item you are holding") + if(enchantToFilter.isEmpty()) { + MsgCommand.CONFIG_ENCHANTMENT_NO_IN_HAND.send(sender) return } } else { enchantToFilter = HashSet(EnchantmentApi.getByName(args[1].lowercase())) - if (enchantToFilter.isEmpty()) { - sender.sendMessage("No enchantment found with the name \"${args[1]}\"") + if(enchantToFilter.isEmpty()) { + MsgCommand.CONFIG_ENCHANTMENT_NO_NAME.send(sender, args[1]) return } } EnchantConfigGui(enchantToFilter).show(sender) - } private fun processItem(sender: HumanEntity) { val item = sender.inventory.itemInMainHand - if (item.isAir) { - sender.sendMessage("Cannot configure the item in hand") + if(item.isAir) { + MsgCommand.CONFIG_CANNOT_CONFIGURE_WARNING.send(sender) return } @@ -104,10 +101,10 @@ class EditConfigExecutor : CASubCommand { override fun tabCompleter(sender: CommandSender, args: Array, list: MutableList) { list.addAll( - when (args.size) { + when(args.size) { 1 -> listOf("item", "enchant", "open") 2 -> { - when (args[0].lowercase()) { + when(args[0].lowercase()) { "enchant" -> allEnchantmentsByName() else -> listOf() } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt index 654df1a8..46b256f3 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt @@ -10,6 +10,8 @@ import org.bukkit.command.CommandSender import org.bukkit.entity.HumanEntity import xyz.alexcrea.cuanvil.api.EnchantmentApi import xyz.alexcrea.cuanvil.enchant.CAEnchantment +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir class EnchantExecutor : CASubCommand { @@ -19,74 +21,74 @@ class EnchantExecutor : CASubCommand { return sender.hasPermission(CustomAnvil.giveEnchantmentPermission) } - override fun description(): String { - return "Allows to set enchantment to holden item" + override fun description(): MessageLike { + return MsgCommand.ENCHANT_DESCRIPTION } override fun executeCommand( sender: CommandSender, cmd: Command, cmdstr: String, - args: Array + args: Array, ): Boolean { - if (sender !is HumanEntity) return true + if(sender !is HumanEntity) return true - if (!allowed(sender)) { - sender.sendMessage("No permission to execute this command") + if(!allowed(sender)) { + MsgCommand.SHARED_NO_PERMISSION.send(sender) return true } - when (args.size) { + when(args.size) { 0 -> { - sender.sendMessage("Missing enchantment parameter") + MsgCommand.ENCHANT_MISSING_PARAMETER_WARNING.send(sender) return true } } val enchant = firstEnchantment(args[0]) - if (enchant == null) { - sender.sendMessage("Enchantment not found: ${args[0]}") + if(enchant == null) { + MsgCommand.ENCHANT_NOT_FOUND_WARNING.send(sender, args[0]) return true } - val level = if (args.size > 1) + val level = if(args.size > 1) args[1].toIntOrNull()?.coerceIn(0, ConfigOptions.ENCHANT_LIMIT) else 1 - if (level == null) { - sender.sendMessage("Invalid number: ${args[1]}") + if(level == null) { + MsgCommand.ENCHANT_MALFORMED_NUMBER_WARNING.send(sender, args[1]) return true } val inHand = sender.inventory.itemInMainHand - if (inHand.isAir) { - sender.sendMessage("Cannot enchant this item") + if(inHand.isAir) { + MsgCommand.ENCHANT_CANNOT_ENCHANT_WARNING.send(sender) return true } - if (level == 0) { + if(level == 0) { enchant.removeFrom(inHand) - if (inHand.isEnchantedBook() && EnchantmentApi.getEnchantments(inHand).isEmpty()) + if(inHand.isEnchantedBook() && EnchantmentApi.getEnchantments(inHand).isEmpty()) inHand.type = Material.BOOK - sender.sendMessage("${enchant.prettyName} removed") + MsgCommand.ENCHANT_REMOVE.send(sender, enchant.prettyName) } else { - if (Material.BOOK == inHand.type) + if(Material.BOOK == inHand.type) inHand.type = Material.ENCHANTED_BOOK enchant.addEnchantmentUnsafe(inHand, level) - sender.sendMessage("${enchant.prettyName} set to level $level") + MsgCommand.ENCHANT_SET.send(sender, enchant.prettyName, level) } return true } override fun tabCompleter(sender: CommandSender, args: Array, list: MutableList) { - if (sender !is HumanEntity) return + if(sender !is HumanEntity) return list.addAll( - when (args.size) { + when(args.size) { 1 -> allEnchantmentsByName() 2 -> findEnchantmentLevels(sender, args[0]) @@ -97,19 +99,19 @@ class EnchantExecutor : CASubCommand { private fun findEnchantmentLevels( sender: HumanEntity, - name: String + name: String, ): Collection { val enchant = firstEnchantment(name) ?: return listOf() val limit = ConfigOptions.enchantLimit(enchant) val result = mutableListOf() - for (i in 1 until limit + 1) { + for(i in 1 until limit + 1) { result.add(i.toString()) } val inHand = sender.inventory.itemInMainHand - if (enchant.isEnchantmentPresent(inHand)) + if(enchant.isEnchantmentPresent(inHand)) result.add("0") return result @@ -117,7 +119,7 @@ class EnchantExecutor : CASubCommand { private fun firstEnchantment(name: String): CAEnchantment? { val enchants = EnchantmentApi.getByName(name.lowercase()) - if (!enchants.isEmpty()) + if(!enchants.isEmpty()) return enchants.iterator().next() return EnchantmentApi.getByKey(NamespacedKey.fromString(name)) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt index c6c4d08c..1f669ac5 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt @@ -1,29 +1,38 @@ package xyz.alexcrea.cuanvil.command import com.google.common.collect.ImmutableMap +import net.kyori.adventure.text.Component +import net.kyori.adventure.text.TextComponent import org.bukkit.command.Command import org.bukkit.command.CommandSender +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand +import xyz.alexcrea.cuanvil.util.ComponentUtil.send class HelpExecutor : CASubCommand { + override fun description(): MessageLike { + return MsgCommand.HELP_DESCRIPTION + } + lateinit var commands: ImmutableMap override fun executeCommand( sender: CommandSender, cmd: Command, cmdstr: String, - args: Array + args: Array, ): Boolean { + var text = MsgCommand.HELP_HEADER.formatted() + for((key, cmd) in commands) { + if(!cmd.allowed(sender)) continue - val stb = StringBuilder("List of available commands:") - for ((key, cmd) in commands) { - if (!cmd.allowed(sender)) continue - - stb.append("\n- $key: ").append(cmd.description()) + text = text.appendNewline() + .append(Component.text("- $key: ")) + .append(cmd.description().formatted()) } - sender.sendMessage(stb.toString()) - + text.send(sender) return true } @@ -34,12 +43,8 @@ class HelpExecutor : CASubCommand { override fun tabCompleter( sender: CommandSender, args: Array, - list: MutableList + list: MutableList, ) { } - override fun description(): String { - return "Help command" - } - } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index bc9a80be..f9d91ace 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -9,29 +9,35 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.gui.config.global.* import xyz.alexcrea.cuanvil.lang.Lang +import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.update.UpdateHandler class ReloadExecutor : CASubCommand { + override fun description(): MessageLike { + return MsgCommand.RELOAD_DESCRIPTION + } + override fun executeCommand( sender: CommandSender, cmd: Command, cmdstr: String, - args: Array + args: Array, ): Boolean { - if (!allowed(sender)) { - sender.sendMessage("§cYou do not have permission to reload the config") + if(!allowed(sender)) { + MsgCommand.SHARED_NO_PERMISSION.send(sender) return false } - sender.sendMessage("§eReloading config...") + MsgCommand.RELOAD_START.send(sender) val hardfail = args.isNotEmpty() && ("hard".equals(args[0], true)) val commandSuccess = commandBody(hardfail) - if (commandSuccess) { - sender.sendMessage("§aConfig reloaded !") + if(commandSuccess) { + MsgCommand.RELOAD_SUCCESS.send(sender) } else { - sender.sendMessage("§cConfig was not able to be reloaded...") - if (hardfail) { - sender.sendMessage("§4Hard fail, plugin disabled") + MsgCommand.RELOAD_FAIL.send(sender) + if(hardfail) { + MsgCommand.RELOAD_HARD_FAIL.send(sender) } } return commandSuccess @@ -44,20 +50,16 @@ class ReloadExecutor : CASubCommand { override fun tabCompleter( sender: CommandSender, args: Array, - list: MutableList + list: MutableList, ) { } - override fun description(): String { - return "Reload the configuration of this plugin" - } - /** * Execute the command, return true if success or false otherwise */ private fun commandBody(hardfail: Boolean): Boolean { try { - if (!ConfigHolder.reloadAllFromDisk(hardfail)) return false + if(!ConfigHolder.reloadAllFromDisk(hardfail)) return false // reload language config Lang.reload() @@ -83,7 +85,7 @@ class ReloadExecutor : CASubCommand { Bukkit.getServer().pluginManager.callEvent(configReadyEvent) return true - } catch (e: Exception) { + } catch(e: Exception) { e.printStackTrace() return false } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt index be4b8f41..53b3dce5 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -3,7 +3,7 @@ package xyz.alexcrea.cuanvil.lang import io.delilaheve.CustomAnvil import net.kyori.adventure.text.Component import org.bukkit.command.CommandSender -import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.sendPaperMessage +import xyz.alexcrea.cuanvil.util.ComponentUtil.send import xyz.alexcrea.cuanvil.util.MiniMessageUtil import java.util.logging.Level import kotlin.math.min @@ -13,18 +13,28 @@ interface MessageLike { fun log(vararg params: Any) fun send(destination: CommandSender, vararg params: Any) + + fun unformatted(vararg params: Any): String + + fun formatted(vararg params: Any): Component + + fun legacy(vararg params: Any): String { + val formated = formatted(*params) + return MiniMessageUtil.legacy_mm.serialize(formated) + } } enum class MessageType { - DEFAULT, - WARNING, - ERROR, + DEFAULT, WARNING, ERROR, COMMAND, UI, } open class Message(val key: String, vararg val params: String) : MessageLike { protected fun replaceParameters(stb: StringBuilder, vararg values: Any) { // replace all placeholder thingy %key -> value + if(params.size != values.size) { + CustomAnvil.log("Wrong number of argument for parameter for key $key (${params.size}/${values.size})") + } for(i in 0 until min(params.size, values.size)) { val key = params[i] @@ -33,7 +43,7 @@ open class Message(val key: String, vararg val params: String) : MessageLike { var current = 0 while(true) { current = stb.indexOf('%', current) + 1 - if(current < 0 || current + key.length > stb.length) break // may be able to be removed if bound checked in startsWith ? + if(current <= 0 || current + key.length > stb.length) break // may be able to be removed if bound checked in startsWith ? if(!stb.startsWith(key, current, false)) continue stb.replace(current - 1, current + key.length, replacement) @@ -42,16 +52,16 @@ open class Message(val key: String, vararg val params: String) : MessageLike { } } - fun unformatted(vararg params: Any): String { + override fun unformatted(vararg params: Any): String { val translated = Lang.getTranslated(key) - if(params.isEmpty()) return translated + if(params.isEmpty() && this.params.isEmpty()) return translated val stb = StringBuilder(translated) replaceParameters(stb, *params) return stb.toString() } - fun formatted(vararg params: Any): Component { + override fun formatted(vararg params: Any): Component { val unformatted = unformatted(*params) return MiniMessageUtil.mm.deserialize(unformatted) @@ -64,9 +74,7 @@ open class Message(val key: String, vararg val params: String) : MessageLike { } override fun send(destination: CommandSender, vararg params: Any) { - val message = formatted(*params) - if(!destination.sendPaperMessage(message)) - destination.sendMessage(MiniMessageUtil.legacy_mm.serialize(message)) + formatted(*params).send(destination) } } @@ -95,6 +103,10 @@ class ErrorMessage(key: String, vararg params: String) : Message("error.$key", * } } + +class CommandMessage(key: String, vararg params: String) : Message("command.$key", *params) +class UIMessage(key: String, vararg params: String) : Message("ui.$key", *params) + class MultiLineMessage(type: MessageType, baseKey: String, count: Int, vararg params: String) : MessageLike { private val messages = ArrayList() @@ -111,6 +123,8 @@ class MultiLineMessage(type: MessageType, baseKey: String, count: Int, vararg pa MessageType.DEFAULT -> Message(key, *params) MessageType.WARNING -> WarningMessage(key, *params) MessageType.ERROR -> ErrorMessage(key, *params) + MessageType.COMMAND -> CommandMessage(key, *params) + MessageType.UI -> UIMessage(key, *params) } } @@ -125,4 +139,25 @@ class MultiLineMessage(type: MessageType, baseKey: String, count: Int, vararg pa message.send(destination, *params) } } + + override fun unformatted(vararg params: Any): String { + val stb = StringBuilder() + stb.append(messages[0].unformatted(*params)) + + for(i in 1 until messages.size) { + stb.append('\n').append(messages[i].unformatted(*params)) + } + + return stb.toString() + } + + override fun formatted(vararg params: Any): Component { + val component = messages[0].formatted(*params) + + for(i in 1 until messages.size) { + component.appendNewline().append(messages[i].formatted(*params)) + } + + return component + } } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt new file mode 100644 index 00000000..fb2d882b --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt @@ -0,0 +1,74 @@ +package xyz.alexcrea.cuanvil.lang + +import xyz.alexcrea.cuanvil.lang.CommandMessage as Message + +object MsgCommand { + + fun multiLine(basekey: String, count: Int): MultiLineMessage { + return MultiLineMessage( + MessageType.COMMAND, basekey, count + ) + } + + // Root + val ROOT_UNKNOWN_SUBCOMMAND = Message("root.warning.unknown-sub", "command") + val ROOT_ERROR_SUBCOMMAND = Message("root.error.generic") + + // Shared + val SHARED_NO_DIAG_PERM = Message("shared.no-diag-permission") + val SHARED_HOVER_COPY = Message("shared.hover-copy") + val SHARED_MISSING_SUBCOMMAND = Message("shared.warning.missing-subcmd", "example1", "example2") + val SHARED_UNKNOWN_SUB_COMMAND = Message("shared.unknown-subcmd", "command") + val SHARED_NO_PERMISSION = Message("shared.no-permission") + + // Debug + val DEBUG_DESCRIPTION = Message("debug.description") + val DEBUG_LOG_CLEARED = Message("debug.log-cleared") + val DEBUG_TOGGLED = Message("debug.toggled", "type") + val DEBUG_COPY = Message("debug.copy") + + val DEBUG_DATA_HEADER = Message("debug.data.header") + val DEBUG_DATA_LINE_COUNT = Message("debug.data.line-count", "count") + + val DEBUG_WARNING_UNSPECIFIED_TYPE = Message("debug.warning.unspecified-type") + val DEBUG_WARNING_INVALID_TYPE = Message("debug.warning.invalid-type", "type") + val DEBUG_WARNING_NO_LOG = Message("debug.warning.no-log", "command") + + // Diagnostic + val DIAGNOSTIC_DESCRIPTION = Message("diagnostic.description") + val DIAGNOSTIC_ERROR_GENERIC = Message("diagnostic.had-error") + val DIAGNOSTIC_COPY = Message("diagnostic.copy") + + // Config + val CONFIG_DESCRIPTION = Message("config.description") + val CONFIG_LEGACY_NAME_WARNING = Message("config.warning.legacy-name") + val CONFIG_FOLIA_ISSUE = multiLine("config.folia-issue", 5) + + val CONFIG_ENCHANTMENT_NO_IN_HAND = Message("config.enchantment.no_hand") + val CONFIG_ENCHANTMENT_NO_NAME = Message("config.enchantment.no_name", "name") + + val CONFIG_CANNOT_CONFIGURE_WARNING = Message("config.warning.cannot_configure") + + // Enchant + val ENCHANT_DESCRIPTION = Message("enchant.description") + val ENCHANT_REMOVE = Message("enchant.remove.", "name") + val ENCHANT_SET = Message("enchant.set.", "name", "level") + + val ENCHANT_MISSING_PARAMETER_WARNING = Message("enchant.warning.missing_parameter") + val ENCHANT_NOT_FOUND_WARNING = Message("enchant.warning.not_found", "path") + val ENCHANT_MALFORMED_NUMBER_WARNING = Message("enchant.warning.malformed_number", "num") + val ENCHANT_CANNOT_ENCHANT_WARNING = Message("enchant.warning.cannot_enchant") + + // Help + val HELP_DESCRIPTION = Message("help.description") + val HELP_HEADER = Message("help.header") + + // Reload + val RELOAD_DESCRIPTION = Message("reload.description") + val RELOAD_START = Message("reload.start") + val RELOAD_SUCCESS = Message("reload.success") + val RELOAD_FAIL = Message("reload.fail") + val RELOAD_HARD_FAIL = Message("reload.hard-fail") + +} + diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt new file mode 100644 index 00000000..bb1c807b --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt @@ -0,0 +1,6 @@ +package xyz.alexcrea.cuanvil.lang + +object MsgUI { + + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt index aa7af304..f58dd814 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt @@ -1,17 +1,26 @@ package xyz.alexcrea.cuanvil.lang +import xyz.alexcrea.cuanvil.lang.WarningMessage as Message + object MsgWarning { + fun multiLine(basekey: String, count: Int): MultiLineMessage { + return MultiLineMessage( + MessageType.WARNING, + basekey, + count + ) + } + /* - * --------------- - * Load and reload - * --------------- + * ----------------- + * Load and reload + * ----------------- */ - val LOAD_UPDATE_AVAILABLE = WarningMessage("load.update.available", "version") - - val LOAD_LEGACY_OLD_NAME = MultiLineMessage(MessageType.WARNING, "load.legacy.old-name", 2) - val LOAD_LEGACY_SPIGOT = MultiLineMessage(MessageType.WARNING, "load.legacy.spigot", 2) - val LOAD_LEGACY_SPIGOT_OLD = MultiLineMessage(MessageType.WARNING, "load.legacy.spigot", 2) + val LOAD_UPDATE_AVAILABLE = Message("load.update.available", "version") + val LOAD_LEGACY_OLD_NAME = multiLine("load.legacy.old-name", 2) + val LOAD_LEGACY_SPIGOT = multiLine("load.legacy.spigot", 2) + val LOAD_LEGACY_SPIGOT_OLD = multiLine("load.legacy.spigot", 2) } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt new file mode 100644 index 00000000..884675be --- /dev/null +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt @@ -0,0 +1,14 @@ +package xyz.alexcrea.cuanvil.util + +import net.kyori.adventure.text.Component +import org.bukkit.command.CommandSender +import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.sendPaperMessage + +object ComponentUtil { + + fun Component.send(destination: CommandSender) { + if(!destination.sendPaperMessage(this)) + destination.sendMessage(MiniMessageUtil.legacy_mm.serialize(this)) + } + +} \ No newline at end of file diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml index b0c96009..cfd9ce17 100644 --- a/src/main/resources/lang/en.yml +++ b/src/main/resources/lang/en.yml @@ -32,8 +32,9 @@ error: command: shared: no-diag-permission: "You do not have permission to diagnostic this server" - # I try to avoid using & for color but this is for a bungee text component - hover-copy: "§7Click to copy" + hover-copy: "Click to copy" + unknown-subcmd: "Unknown subcommand %command" + no-permission: "No permission to execute this command" warning: missing-subcmd: "Need to specify a subcommand. for example %example1 or %example2" root: @@ -45,21 +46,47 @@ command: description: "Used to toggle debug logs and retrieve them" log-cleared: "Log Cleared" toggled: "Debug toggled to %type" - # I try to avoid using & for color but this is for a bungee text component - copy: "§aClick to copy log data" + copy: "Click to copy log data" data: header: "Debug Log data:" line-count: "Found %count lines" warning: unspecified-type: "Need to specify which type of debug to toggle: \"default\" or \"verbose\"" + invalid-type: "Invalid debug type \"%type\"" no-log: "No log to show ? make sure you tried with debug log toggled (%command)" diagnostic: description: "Basic diagnostic of this plugin" had-error: "There was an error running the diagnostic" - # I try to avoid using & for color but this is for a bungee text component - copy: "§aClick to copy diagnostic data" + copy: "Click to copy diagnostic data" config: description: "Used to edit the configuration of the plugin" - + folia-issue: + 1: "It look like you are using Folia. Sadly Custom Anvil do not support Config gui for Folia." + 2: "It is may come in a future version." + 3: "" + 4: "Currently you need to edit manually the config or copy from another server (spigot or better)" + 5: "Then /ca reload after config file is edited" + enchantment: + no_hand: "No enchantment found in the item you are holding" + no_name: "No enchantment found with the name %name" warning: - legacy-name: "/ca gui has been moved to /ca config" \ No newline at end of file + legacy-name: "/ca gui has been moved to /ca config" + cannot_configure: "Cannot configure the item in hand" + enchant: + description: "Allows to set enchantment to holden item" + warning: + missing_parameter: "Missing enchantment parameter" + not_found: "Enchantment not found: %path" + malformed_number: "Invalid number: %num" + cannot_enchant: "Cannot enchant this item" + removed: "%name removed" + set: "%name set to level %level" + help: + description: "Help command" + header: "List of available commands:" + reload: + description: "Reload the configuration of this plugin" + start: "Reloading config..." + success: "Config reloaded !" + fail: "Config was not able to be reloaded..." + hard-fail: "Hard fail, plugin disabled" \ No newline at end of file From b0a34b6b14d130eb40a5e8c4a5b309d2eb4720aa Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sat, 15 Aug 2026 16:15:49 +0200 Subject: [PATCH 06/11] rework multiline --- .../alexcrea/cuanvil/anvil/AnvilMergeLogic.kt | 4 +- .../alexcrea/cuanvil/command/CASubCommand.kt | 4 +- .../cuanvil/command/DebugToggleExecutor.kt | 8 +- .../cuanvil/command/DiagnosticExecutor.kt | 4 +- .../cuanvil/command/EditConfigExecutor.kt | 4 +- .../cuanvil/command/EnchantExecutor.kt | 4 +- .../alexcrea/cuanvil/command/HelpExecutor.kt | 7 +- .../cuanvil/command/ReloadExecutor.kt | 4 +- .../kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt | 8 + .../xyz/alexcrea/cuanvil/lang/Language.kt | 5 + .../xyz/alexcrea/cuanvil/lang/Message.kt | 170 ++++++++---------- .../xyz/alexcrea/cuanvil/lang/MsgCommand.kt | 8 +- .../xyz/alexcrea/cuanvil/lang/MsgWarning.kt | 14 +- .../cuanvil/listener/AnvilResultListener.kt | 3 +- .../alexcrea/cuanvil/util/ComponentUtil.kt | 21 ++- .../alexcrea/cuanvil/util/MiniMessageUtil.kt | 5 - .../cuanvil/util/anvil/AnvilColorUtil.kt | 13 +- .../cuanvil/util/anvil/AnvilLoreEditUtil.kt | 5 +- 18 files changed, 147 insertions(+), 144 deletions(-) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt index a1c411a3..7d1b745c 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt @@ -22,6 +22,8 @@ import xyz.alexcrea.cuanvil.dialog.AnvilRenameDialog import xyz.alexcrea.cuanvil.enchant.CAEnchantment import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe import xyz.alexcrea.cuanvil.util.CasedStringUtil +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeLegacy +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.CustomRecipeUtil import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir import xyz.alexcrea.cuanvil.util.MiniMessageUtil @@ -151,7 +153,7 @@ object AnvilMergeLogic { ) if (component != null) { - renameText = MiniMessageUtil.legacy_mm.serialize(component) + renameText = component.serializeLegacy() sumCost += ConfigOptions.useOfColorCost useColor = true diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt index ec893559..e8d7f825 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/CASubCommand.kt @@ -3,7 +3,7 @@ package xyz.alexcrea.cuanvil.command import org.bukkit.command.Command import org.bukkit.command.CommandSender import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message interface CASubCommand { @@ -22,7 +22,7 @@ interface CASubCommand { list: MutableList ) - fun description(): MessageLike + fun description(): Message fun allEnchantmentsByName(): Collection { val names = mutableSetOf() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt index c0c4862f..4ed7e0be 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt @@ -9,13 +9,13 @@ import net.md_5.bungee.api.chat.hover.content.Text import org.bukkit.command.Command import org.bukkit.command.CommandSender import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand -import xyz.alexcrea.cuanvil.util.MiniMessageUtil +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain class DebugToggleExecutor : CASubCommand { - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.DEBUG_DESCRIPTION } @@ -88,7 +88,7 @@ class DebugToggleExecutor : CASubCommand { val stb = StringBuilder(MsgCommand.DEBUG_DATA_HEADER.unformatted()).append(' ') stb.append(MsgCommand.DEBUG_DATA_LINE_COUNT.unformatted(CustomAnvil.debugStorageQueue.size)) for(log in CustomAnvil.debugStorageQueue) { - stb.append('\n').append(MiniMessageUtil.plain_text_mm.serialize(log)) + stb.append('\n').append(log.serializePlain()) } if(sender is Player) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt index b015fde0..0644a6fa 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DiagnosticExecutor.kt @@ -24,7 +24,7 @@ import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.dependency.packet.NoPacketManager import xyz.alexcrea.cuanvil.dependency.packet.ProtocoLibWrapper import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener import xyz.alexcrea.cuanvil.util.MetricsUtil @@ -214,7 +214,7 @@ class DiagnosticExecutor : CASubCommand { return this.name + " v" + this.description.version } - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.DIAGNOSTIC_DESCRIPTION } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt index 0fc522d2..50bd186f 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EditConfigExecutor.kt @@ -11,7 +11,7 @@ import xyz.alexcrea.cuanvil.gui.config.MainConfigGui import xyz.alexcrea.cuanvil.gui.config.global.EnchantConfigGui import xyz.alexcrea.cuanvil.gui.config.global.ItemConfigGui import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.MaterialUtil.customType import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir @@ -22,7 +22,7 @@ class EditConfigExecutor : CASubCommand { return sender.hasPermission(CustomAnvil.editConfigPermission) } - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.CONFIG_DESCRIPTION } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt index 46b256f3..d39acb3b 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/EnchantExecutor.kt @@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender import org.bukkit.entity.HumanEntity import xyz.alexcrea.cuanvil.api.EnchantmentApi import xyz.alexcrea.cuanvil.enchant.CAEnchantment -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir @@ -21,7 +21,7 @@ class EnchantExecutor : CASubCommand { return sender.hasPermission(CustomAnvil.giveEnchantmentPermission) } - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.ENCHANT_DESCRIPTION } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt index 1f669ac5..4d5c23de 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/HelpExecutor.kt @@ -2,16 +2,15 @@ package xyz.alexcrea.cuanvil.command import com.google.common.collect.ImmutableMap import net.kyori.adventure.text.Component -import net.kyori.adventure.text.TextComponent import org.bukkit.command.Command import org.bukkit.command.CommandSender -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.util.ComponentUtil.send class HelpExecutor : CASubCommand { - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.HELP_DESCRIPTION } @@ -23,7 +22,7 @@ class HelpExecutor : CASubCommand { cmdstr: String, args: Array, ): Boolean { - var text = MsgCommand.HELP_HEADER.formatted() + var text = MsgCommand.HELP_HEADER.formatted().first() for((key, cmd) in commands) { if(!cmd.allowed(sender)) continue diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index f9d91ace..f5b92b62 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -9,13 +9,13 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.gui.config.global.* import xyz.alexcrea.cuanvil.lang.Lang -import xyz.alexcrea.cuanvil.lang.MessageLike +import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand import xyz.alexcrea.cuanvil.update.UpdateHandler class ReloadExecutor : CASubCommand { - override fun description(): MessageLike { + override fun description(): Message { return MsgCommand.RELOAD_DESCRIPTION } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt index db8a2b29..18be75f6 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt @@ -1,6 +1,7 @@ package xyz.alexcrea.cuanvil.lang import io.delilaheve.CustomAnvil +import org.bukkit.configuration.ConfigurationSection import xyz.alexcrea.cuanvil.config.ConfigHolder object Lang { @@ -27,6 +28,13 @@ object Lang { return default.get(key) ?: key } + fun getSection(key: String): ConfigurationSection? { + val value = lang.getSection(key) + if(value != null) return value + + return default.getSection(key) + } + /* * Config Options & get */ diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt index d6054ba2..0a008bf0 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt @@ -1,6 +1,7 @@ package xyz.alexcrea.cuanvil.lang import io.delilaheve.CustomAnvil +import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.file.FileConfiguration import org.bukkit.configuration.file.YamlConfiguration import java.io.File @@ -50,6 +51,10 @@ class Language(private val id: String, private val default: Boolean = false) { return conf.getString(key) } + fun getSection(key: String): ConfigurationSection? { + return conf.getConfigurationSection(key) + } + val name: String get() = conf.getString("name", id)!! } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt index 53b3dce5..b7f38551 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -3,32 +3,15 @@ package xyz.alexcrea.cuanvil.lang import io.delilaheve.CustomAnvil import net.kyori.adventure.text.Component import org.bukkit.command.CommandSender +import org.bukkit.configuration.ConfigurationSection import xyz.alexcrea.cuanvil.util.ComponentUtil.send +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeLegacy +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.MiniMessageUtil import java.util.logging.Level import kotlin.math.min -interface MessageLike { - - fun log(vararg params: Any) - - fun send(destination: CommandSender, vararg params: Any) - - fun unformatted(vararg params: Any): String - - fun formatted(vararg params: Any): Component - - fun legacy(vararg params: Any): String { - val formated = formatted(*params) - return MiniMessageUtil.legacy_mm.serialize(formated) - } -} - -enum class MessageType { - DEFAULT, WARNING, ERROR, COMMAND, UI, -} - -open class Message(val key: String, vararg val params: String) : MessageLike { +open class Message(val key: String, vararg val params: String) { protected fun replaceParameters(stb: StringBuilder, vararg values: Any) { // replace all placeholder thingy %key -> value @@ -52,7 +35,7 @@ open class Message(val key: String, vararg val params: String) : MessageLike { } } - override fun unformatted(vararg params: Any): String { + private fun unformattedMonoline(vararg params: Any): String { val translated = Lang.getTranslated(key) if(params.isEmpty() && this.params.isEmpty()) return translated @@ -61,19 +44,71 @@ open class Message(val key: String, vararg val params: String) : MessageLike { return stb.toString() } - override fun formatted(vararg params: Any): Component { - val unformatted = unformatted(*params) + private fun unformattedMultiline(section: ConfigurationSection, vararg params: Any): String { + val stb = StringBuilder() - return MiniMessageUtil.mm.deserialize(unformatted) + for(key in section.getKeys(false)) { + if(!section.isString(key)) continue + if(!stb.isEmpty()) stb.append('\n') + + stb.append(section.getString(key)) + } + + replaceParameters(stb, *params) + return stb.toString() } - override fun log(vararg params: Any) { - val text = unformatted(*params) + fun unformatted(vararg params: Any): String { + val section = Lang.getSection(key) + if(section != null) return unformattedMultiline(section, *params) - CustomAnvil.instance.logger.info(text) + return unformattedMonoline(*params) } - override fun send(destination: CommandSender, vararg params: Any) { + private fun formattedMultiline(section: ConfigurationSection, vararg params: Any): List { + val result = ArrayList() + + for(key in section.getKeys(false)) { + if(!section.isString(key)) continue + + val stb = StringBuilder(section.getString(key)) + replaceParameters(stb, *params) + + result.add(MiniMessageUtil.mm.deserialize(stb.toString())) + } + + return result + } + + fun formatted(vararg params: Any): List { + val section = Lang.getSection(key) + if(section != null) return formattedMultiline(section, *params) + + val translated = unformattedMonoline(key, *params) + + return listOf(MiniMessageUtil.mm.deserialize(translated)) + } + + fun legacy(vararg params: Any): String { + val formated = formatted(*params) + + val stb = StringBuilder() + for(component in formated) { + if(!stb.isEmpty()) stb.append('\n') + stb.append(component.serializeLegacy()) + } + return stb.toString() + } + + open fun log(vararg params: Any) { + val texts = formatted(*params) + + for(component in texts) { + CustomAnvil.instance.logger.info(component.serializePlain()) + } + } + + open fun send(destination: CommandSender, vararg params: Any) { formatted(*params).send(destination) } } @@ -81,83 +116,32 @@ open class Message(val key: String, vararg val params: String) : MessageLike { class WarningMessage(key: String, vararg params: String) : Message("warning.$key", *params) { override fun log(vararg params: Any) { - val text = unformatted(*params) + val texts = formatted(*params) - CustomAnvil.instance.logger.warning(text) + for(component in texts) { + CustomAnvil.instance.logger.warning(component.serializePlain()) + } } - } class ErrorMessage(key: String, vararg params: String) : Message("error.$key", *params) { override fun log(vararg params: Any) { - val text = unformatted(*params) + val texts = formatted(*params) - CustomAnvil.logError(text) + for(component in texts) { + CustomAnvil.logError(component.serializePlain()) + } } fun log(e: Throwable, vararg params: Any, level: Level = Level.SEVERE, track: Boolean = true) { - val text = unformatted(*params) + val texts = formatted(*params) - CustomAnvil.logError(text, e, track, level) + for(component in texts) { + CustomAnvil.logError(component.serializePlain(), e, track, level) + } } } - class CommandMessage(key: String, vararg params: String) : Message("command.$key", *params) -class UIMessage(key: String, vararg params: String) : Message("ui.$key", *params) - -class MultiLineMessage(type: MessageType, baseKey: String, count: Int, vararg params: String) : MessageLike { - - private val messages = ArrayList() - - init { - for(i in 1 until count + 1) { - val message = createNew(type, "$baseKey.$i", *params) - messages.add(message) - } - } - - private fun createNew(type: MessageType, key: String, vararg params: String): MessageLike { - return when(type) { - MessageType.DEFAULT -> Message(key, *params) - MessageType.WARNING -> WarningMessage(key, *params) - MessageType.ERROR -> ErrorMessage(key, *params) - MessageType.COMMAND -> CommandMessage(key, *params) - MessageType.UI -> UIMessage(key, *params) - } - } - - override fun log(vararg params: Any) { - for(message in messages) { - message.log(*params) - } - } - - override fun send(destination: CommandSender, vararg params: Any) { - for(message in messages) { - message.send(destination, *params) - } - } - - override fun unformatted(vararg params: Any): String { - val stb = StringBuilder() - stb.append(messages[0].unformatted(*params)) - - for(i in 1 until messages.size) { - stb.append('\n').append(messages[i].unformatted(*params)) - } - - return stb.toString() - } - - override fun formatted(vararg params: Any): Component { - val component = messages[0].formatted(*params) - - for(i in 1 until messages.size) { - component.appendNewline().append(messages[i].formatted(*params)) - } - - return component - } -} \ No newline at end of file +class UIMessage(key: String, vararg params: String) : Message("ui.$key", *params) \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt index fb2d882b..2eed326b 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt @@ -4,12 +4,6 @@ import xyz.alexcrea.cuanvil.lang.CommandMessage as Message object MsgCommand { - fun multiLine(basekey: String, count: Int): MultiLineMessage { - return MultiLineMessage( - MessageType.COMMAND, basekey, count - ) - } - // Root val ROOT_UNKNOWN_SUBCOMMAND = Message("root.warning.unknown-sub", "command") val ROOT_ERROR_SUBCOMMAND = Message("root.error.generic") @@ -42,7 +36,7 @@ object MsgCommand { // Config val CONFIG_DESCRIPTION = Message("config.description") val CONFIG_LEGACY_NAME_WARNING = Message("config.warning.legacy-name") - val CONFIG_FOLIA_ISSUE = multiLine("config.folia-issue", 5) + val CONFIG_FOLIA_ISSUE = Message("config.folia-issue") val CONFIG_ENCHANTMENT_NO_IN_HAND = Message("config.enchantment.no_hand") val CONFIG_ENCHANTMENT_NO_NAME = Message("config.enchantment.no_name", "name") diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt index f58dd814..90eafa56 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt @@ -4,14 +4,6 @@ import xyz.alexcrea.cuanvil.lang.WarningMessage as Message object MsgWarning { - fun multiLine(basekey: String, count: Int): MultiLineMessage { - return MultiLineMessage( - MessageType.WARNING, - basekey, - count - ) - } - /* * ----------------- * Load and reload @@ -19,8 +11,8 @@ object MsgWarning { */ val LOAD_UPDATE_AVAILABLE = Message("load.update.available", "version") - val LOAD_LEGACY_OLD_NAME = multiLine("load.legacy.old-name", 2) - val LOAD_LEGACY_SPIGOT = multiLine("load.legacy.spigot", 2) - val LOAD_LEGACY_SPIGOT_OLD = multiLine("load.legacy.spigot", 2) + val LOAD_LEGACY_OLD_NAME = Message("load.legacy.old-name") + val LOAD_LEGACY_SPIGOT = Message("load.legacy.spigot") + val LOAD_LEGACY_SPIGOT_OLD = Message("load.legacy.spigot-old") } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt index 386a920b..5f192c51 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt @@ -30,6 +30,7 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setComponentDisplayName import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_INPUT_LEFT import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_INPUT_RIGHT import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT_SLOT +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.CustomRecipeUtil import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir import xyz.alexcrea.cuanvil.util.MiniMessageUtil @@ -536,7 +537,7 @@ class AnvilResultListener : Listener { if (bookPage.isNotEmpty()) bookPage.append('\n') if (it == null) return@forEach - bookPage.append(MiniMessageUtil.plain_text_mm.serialize(it)) + bookPage.append(it.serializePlain()) } val resultPage = bookPage.toString() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt index 884675be..2d9ec351 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt @@ -8,7 +8,26 @@ object ComponentUtil { fun Component.send(destination: CommandSender) { if(!destination.sendPaperMessage(this)) - destination.sendMessage(MiniMessageUtil.legacy_mm.serialize(this)) + destination.sendMessage(this.serializeLegacy()) } + fun List.send(destination: CommandSender) { + for(component in this) + component.send(destination) + } + + fun Component.serializeMM(): String { + return MiniMessageUtil.mm.serialize(this) + } + fun Component.serializeMMColor(): String { + return MiniMessageUtil.color_only_mm.serialize(this) + } + fun Component.serializeLegacy(): String { + return MiniMessageUtil.legacy_mm.serialize(this) + } + fun Component.serializePlain(): String { + return MiniMessageUtil.plain_text_mm.serialize(this) + } + + } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MiniMessageUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MiniMessageUtil.kt index c33cb9c5..6780049f 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MiniMessageUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MiniMessageUtil.kt @@ -25,9 +25,4 @@ object MiniMessageUtil { val legacy_mm = LegacyComponentSerializer.legacySection() val plain_text_mm = PlainTextComponentSerializer.plainText() - // Keeping track of this as most use of this can be replaced later on v2 with pure component alternative - fun fromLegacy(legacyText: String): TextComponent { - return legacy_mm.deserialize(legacyText) - } - } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilColorUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilColorUtil.kt index 9564b2e9..44ae8faf 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilColorUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilColorUtil.kt @@ -3,6 +3,9 @@ package xyz.alexcrea.cuanvil.util.anvil import io.delilaheve.util.ConfigOptions import net.kyori.adventure.text.Component import org.bukkit.permissions.Permissible +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeLegacy +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeMM +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.MiniMessageUtil import java.util.regex.Matcher import java.util.regex.Pattern @@ -103,10 +106,10 @@ object AnvilColorUtil { var result: Component = MiniMessageUtil.legacy_mm.deserialize(previousStr) if (permission.canUseMinimessage) { // we dance with formats here - val toMinimessage = MiniMessageUtil.mm.serialize(result) + val toMinimessage = result.serializeMM() val hackySolution = toMinimessage.replace("\\<", "<") val fromMinimessage = MiniMessageUtil.mm.deserialize(hackySolution) - val asPlain = MiniMessageUtil.plain_text_mm.serialize(fromMinimessage) + val asPlain = fromMinimessage.serializePlain() if (previousStr != asPlain) { useColor = true @@ -145,8 +148,8 @@ object AnvilColorUtil { ): String? { if (!permission.allowed() || component == null) return null - val transformed = MiniMessageUtil.mm.serialize(component) - val plainTransform = MiniMessageUtil.plain_text_mm.serialize(component) + val transformed = component.serializeMM() + val plainTransform = component.serializePlain() if (transformed == plainTransform) return null if (permission.onlyMinimessage()) { return transformed @@ -154,7 +157,7 @@ object AnvilColorUtil { // smol dance so we transform the component that may contain other tag into only decoration & color for legacy val coloredMessage = MiniMessageUtil.color_only_mm.deserialize(transformed) - val legacyMessage = StringBuilder(MiniMessageUtil.legacy_mm.serialize(coloredMessage)) + val legacyMessage = StringBuilder(coloredMessage.serializeLegacy()) // Reverse hex pattern if (permission.canUseHexColor) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilLoreEditUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilLoreEditUtil.kt index a021b468..ad827458 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilLoreEditUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/anvil/AnvilLoreEditUtil.kt @@ -10,6 +10,7 @@ import xyz.alexcrea.cuanvil.anvil.AnvilMergeLogic.LoreEditResult import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.componentLore import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setComponentLore +import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.MiniMessageUtil import xyz.alexcrea.cuanvil.util.config.LoreEditConfigUtil import xyz.alexcrea.cuanvil.util.config.LoreEditType @@ -320,7 +321,7 @@ object AnvilLoreEditUtil { hasUndidColor = true result = clearedLine } else { - result = MiniMessageUtil.plain_text_mm.serialize(line) + result = line.serializePlain() } lines[index] = MiniMessageUtil.plain_text_mm.deserialize(result) @@ -354,7 +355,7 @@ object AnvilLoreEditUtil { result = clearedLine } else { // Remove extra tags - result = MiniMessageUtil.plain_text_mm.serialize(coloredComponent) + result = coloredComponent.serializePlain() } line.set(MiniMessageUtil.plain_text_mm.deserialize(result)) From 58d363c4c737637de41c04c17ff113f1a2e14c86 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sat, 15 Aug 2026 21:38:57 +0200 Subject: [PATCH 07/11] fix small translation issue --- .../kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt | 2 +- src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt index 4ed7e0be..5c7bfee6 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt @@ -35,7 +35,7 @@ class DebugToggleExecutor : CASubCommand { } if(args.isEmpty()) { - MsgCommand.SHARED_MISSING_SUBCOMMAND.send(sender) + MsgCommand.SHARED_MISSING_SUBCOMMAND.send(sender, "\"toggle\"", "\"get\"") return true } when(args[0].lowercase()) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt index b7f38551..9c1dd596 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -84,7 +84,7 @@ open class Message(val key: String, vararg val params: String) { val section = Lang.getSection(key) if(section != null) return formattedMultiline(section, *params) - val translated = unformattedMonoline(key, *params) + val translated = unformattedMonoline(*params) return listOf(MiniMessageUtil.mm.deserialize(translated)) } From ec40889118723ef0100c404b41d220d862bb2089 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sun, 16 Aug 2026 07:26:08 +0200 Subject: [PATCH 08/11] progress on translation system --- .../gui/config/ask/ConfirmActionGui.java | 5 +++-- .../gui/config/ask/SelectItemTypeGui.java | 3 ++- .../list/MappedElementListConfigGui.java | 6 ++--- .../config/list/MappedGuiListConfigGui.java | 7 +++--- .../config/list/UnitRepairElementListGui.java | 5 +++-- .../elements/GroupConfigSubSettingGui.java | 3 ++- .../settings/MaterialSelectSettingGui.java | 3 ++- .../settings/WorkPenaltyTypeSettingGui.java | 3 ++- .../cuanvil/gui/util/GuiGlobalActions.java | 9 ++++---- .../cuanvil/command/CustomAnvilCommand.kt | 1 - .../cuanvil/command/EditConfigExecutor.kt | 4 ++-- .../cuanvil/dependency/DependencyManager.kt | 9 +++----- .../xyz/alexcrea/cuanvil/lang/Message.kt | 2 +- .../kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt | 15 +++++++++++++ .../xyz/alexcrea/cuanvil/lang/MsgWarning.kt | 2 ++ src/main/resources/lang/en.yml | 22 ++++++++++++++++++- 16 files changed, 69 insertions(+), 30 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java index 58396638..0b5a08e7 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.MetricsUtil; import java.util.Arrays; @@ -33,7 +34,7 @@ public class ConfirmActionGui extends AbstractAskGui { if (!player.hasPermission(CustomAnvil.editConfigPermission)) { player.closeInventory(); - player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); + MsgUI.INSTANCE.getSHARED_CONFIG_NO_EDIT_PERM().send(player); return; } @@ -47,7 +48,7 @@ public class ConfirmActionGui extends AbstractAskGui { } if (!success) { - event.getWhoClicked().sendMessage("§cAction could not be completed. "); + MsgUI.INSTANCE.getCONFIRM_ACTION_FAILED().send(player); } backOnConfirm.show(player); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java index 66411bd4..f0369e6d 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java @@ -12,6 +12,7 @@ import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.MaterialUtil; import java.util.Arrays; @@ -36,7 +37,7 @@ public class SelectItemTypeGui extends AbstractAskGui { if (!player.hasPermission(CustomAnvil.editConfigPermission)) { player.closeInventory(); - player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); + MsgUI.INSTANCE.getSHARED_CONFIG_NO_EDIT_PERM().send(player); return; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java index 9b6c6100..7bfffdf8 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java @@ -10,6 +10,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.lang.MsgUI; import java.util.Arrays; import java.util.HashMap; @@ -52,13 +53,12 @@ public abstract class MappedElementListConfigGui extends ElementListConfig // check permission if (!player.hasPermission(CustomAnvil.editConfigPermission)) { player.closeInventory(); - player.sendMessage(GuiGlobalActions.NO_EDIT_PERM); + MsgUI.INSTANCE.getSHARED_CONFIG_NO_EDIT_PERM().send(player); return; } player.closeInventory(); - player.sendMessage("§eWrite the " + genericDisplayedName() + " name you want to create in the chat.\n" + - "§eOr write §ccancel §eto go back to " + genericDisplayedName() + " config menu"); + MsgUI.INSTANCE.getELEMENT_LIST_INSTRUCTION_NEW().send(player, genericDisplayedName()); CustomAnvil.Companion.getChatListener().setListenedCallback(player, prepareCreateItemConsumer(player)); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java index 8180694e..d25d6e72 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java @@ -8,6 +8,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.config.list.elements.ElementMappedToListGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.LazyValue; import java.util.Locale; @@ -69,13 +70,13 @@ public abstract class MappedGuiListConfigGuiReloading config..." success: "Config reloaded !" fail: "Config was not able to be reloaded..." - hard-fail: "Hard fail, plugin disabled" \ No newline at end of file + hard-fail: "Hard fail, plugin disabled" + +config-ui: + shared: + no-permission: "You do not have permission to edit the config" + confirm-action: + fail: "Action could not be completed." + element-list: + instruction-new: + 1: "Write the %type name you want to create in the chat." + 2: "Or write cancel to go back to %type config menu" + cancelled-new: "%type creation cancelled..." + duplicated-new: "Please enter a %type name that do not already exist..." + unit-repair: + element: + title: "Select item to be repaired." + description: + 1: "Click here with an item to set the item" + 2: "You like to be repaired by %name" + cannot-damage-new: "This item can't be damaged, so it can't be repaired." + same-type-new: "Item can't repair something of the same type." \ No newline at end of file From 1d402b1e7672eea4d27c4911e31b71da45c07c07 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Mon, 17 Aug 2026 01:38:14 +0200 Subject: [PATCH 09/11] a lot of progress inside the ui --- .../cuanvil/dependency/util/PlatformUtil.kt | 20 +++++ .../gui/config/ask/AbstractAskGui.java | 6 +- .../gui/config/ask/ConfirmActionGui.java | 20 +++-- .../gui/config/ask/SelectItemTypeGui.java | 26 ++++--- .../global/AbstractEnchantConfigGui.java | 5 +- .../config/global/CustomRecipeConfigGui.java | 11 +-- .../gui/config/global/EnchantConflictGui.java | 11 +-- .../config/global/EnchantCostConfigGui.java | 6 +- .../config/global/EnchantLimitConfigGui.java | 5 +- .../global/EnchantMergeLimitConfigGui.java | 6 +- .../gui/config/global/GroupConfigGui.java | 5 +- .../config/global/UnitRepairConfigGui.java | 10 +-- .../gui/config/list/ElementListConfigGui.java | 20 ++--- .../list/MappedElementListConfigGui.java | 9 ++- .../config/list/MappedGuiListConfigGui.java | 17 ++++- .../config/list/SettingGuiListConfigGui.java | 17 ++++- .../config/list/UnitRepairElementListGui.java | 17 +++-- .../elements/CustomRecipeSubSettingGui.java | 30 ++++---- .../EnchantConflictSubSettingGui.java | 43 ++++++----- .../elements/GroupConfigSubSettingGui.java | 55 ++++++++++---- .../elements/MappedToListSubSettingGui.java | 6 +- .../settings/EnchantSelectSettingGui.java | 7 +- .../settings/GroupSelectSettingGui.java | 7 +- .../settings/MaterialSelectSettingGui.java | 10 ++- .../xyz/alexcrea/cuanvil/lang/Message.kt | 20 +++++ .../kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt | 43 ++++++++++- .../alexcrea/cuanvil/util/ComponentUtil.kt | 33 ++++++--- src/main/resources/lang/en.yml | 73 +++++++++++++++++-- 28 files changed, 386 insertions(+), 152 deletions(-) diff --git a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt index 3b47adaa..f1d6fe42 100644 --- a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt +++ b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt @@ -112,6 +112,26 @@ object PlatformUtil { return true } + return false + } /** + * Try to send paper component to the player + * + * @param component The used component + * @return true if sent, else otherwise + */ + + /** + * Try to set component lore of an item + * + * @param components The used component lore + * @return true if sent, else otherwise + */ + fun ItemMeta.setPaperLore(components: List): Boolean { + if(isPaper) { + this.lore(components) + return true + } + return false } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java index 66dd9363..75cdf236 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/AbstractAskGui.java @@ -10,13 +10,15 @@ import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; public abstract class AbstractAskGui extends ChestGui { protected PatternPane pane; - AbstractAskGui(int rows, @NotNull String name, + AbstractAskGui(int rows, + @NotNull Message name, @NotNull String param, Gui backOnCancel){ - super(rows, name, CustomAnvil.instance); + super(rows, name.textHolder(param), CustomAnvil.instance); Pattern pattern = getGuiPattern(); this.pane = new PatternPane(0, 0, pattern.getLength(), pattern.getHeight(), pattern); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java index 0b5a08e7..e3b02a12 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java @@ -9,21 +9,26 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.lang.MsgUI; +import xyz.alexcrea.cuanvil.util.ComponentUtil; import xyz.alexcrea.cuanvil.util.MetricsUtil; +import java.awt.*; import java.util.Arrays; import java.util.function.Supplier; import java.util.logging.Level; public class ConfirmActionGui extends AbstractAskGui { - public ConfirmActionGui(@NotNull String title, String actionDescription, + public ConfirmActionGui(@NotNull Message title, @NotNull String titleParam, + @Nullable Message actionDescription, @NotNull String actionParam, Gui backOnCancel, Gui backOnConfirm, Supplier onConfirm, boolean permanent) { - super(3, title, backOnCancel); + super(3, title, titleParam, backOnCancel); // Save item this.pane.bindItem('S', new GuiItem( @@ -42,7 +47,7 @@ public class ConfirmActionGui extends AbstractAskGui { try { success = onConfirm.get(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "Could not process confirmation supplier.", e); + CustomAnvil.instance.getLogger().log(Level.WARNING, "Could not process confirmation supplier.", e); //TODO MESSAGE MetricsUtil.INSTANCE.trackError(e); success = false; } @@ -58,18 +63,19 @@ public class ConfirmActionGui extends AbstractAskGui { ItemStack infoItem = new ItemStack(Material.PAPER); ItemMeta infoMeta = infoItem.getItemMeta(); - infoMeta.setDisplayName("§eAre you sure ?"); + infoMeta.setDisplayName("§eAre you sure ?"); //TODO MESSAGE if(actionDescription != null){ - infoMeta.setLore(Arrays.asList(actionDescription.split("\n"))); + ComponentUtil.INSTANCE.applyLore(actionDescription.formatted(), infoMeta); } infoItem.setItemMeta(infoMeta); pane.bindItem('I', new GuiItem(infoItem, GuiGlobalActions.stayInPlace, CustomAnvil.instance)); } - public ConfirmActionGui(@NotNull String title, String actionDescription, + public ConfirmActionGui(@NotNull Message title, @NotNull String titleParam, + @Nullable Message actionDescription, @NotNull String actionParam, Gui backOnCancel, Gui backOnConfirm, Supplier onConfirm){ - this(title, actionDescription, backOnCancel, backOnConfirm, onConfirm, true); + this(title, titleParam, actionDescription, actionParam, backOnCancel, backOnConfirm, onConfirm, true); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java index f0369e6d..b4b10b6f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java @@ -12,7 +12,9 @@ import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.lang.MsgUI; +import xyz.alexcrea.cuanvil.util.ComponentUtil; import xyz.alexcrea.cuanvil.util.MaterialUtil; import java.util.Arrays; @@ -22,12 +24,14 @@ import java.util.function.BiConsumer; public class SelectItemTypeGui extends AbstractAskGui { private ItemStack selectedItem; - public SelectItemTypeGui(@NotNull String title, - @NotNull String actionDescription, + public SelectItemTypeGui(@NotNull Message title, + @NotNull String titleParam, + @NotNull Message actionDescription, + @NotNull String descriptionParam, @NotNull Gui backOnCancel, @NotNull BiConsumer onSave, boolean materialOnly) { - super(3, title, backOnCancel); + super(3, title, titleParam, backOnCancel); this.selectedItem = null; // Save item @@ -47,7 +51,7 @@ public class SelectItemTypeGui extends AbstractAskGui { this.pane.bindItem('S', GuiGlobalItems.backgroundItem()); // Select item - ItemStack selectItem = setDisplayMeta(new ItemStack(Material.BARRIER), actionDescription); + ItemStack selectItem = setDisplayMeta(new ItemStack(Material.BARRIER), actionDescription, descriptionParam); AtomicReference selectGuiItem = new AtomicReference<>(); selectGuiItem.set(new GuiItem(selectItem, event -> { @@ -58,7 +62,7 @@ public class SelectItemTypeGui extends AbstractAskGui { ItemStack finalItem; if(materialOnly){ - finalItem = setDisplayMeta(new ItemStack(cursor.getType()), actionDescription); + finalItem = setDisplayMeta(new ItemStack(cursor.getType()), actionDescription, descriptionParam); }else{ finalItem = cursor.clone(); } @@ -76,14 +80,18 @@ public class SelectItemTypeGui extends AbstractAskGui { GuiItem temporaryLeave = GuiGlobalItems.temporaryCloseGuiToSelectItem(Material.YELLOW_STAINED_GLASS_PANE, this); this.pane.bindItem('s', temporaryLeave); - } - private ItemStack setDisplayMeta(ItemStack item, String actionDescription){ + @NotNull + private ItemStack setDisplayMeta( + @NotNull ItemStack item, + @NotNull Message actionDescription, + @NotNull String param + ){ ItemMeta meta = item.getItemMeta(); - meta.setDisplayName("§ePlace an item here"); - meta.setLore(Arrays.asList(actionDescription.split("\n"))); + meta.setDisplayName("§ePlace an item here"); //TODO MESSAGE + ComponentUtil.INSTANCE.applyLore(actionDescription.formatted(param), meta); item.setItemMeta(meta); return item; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java index 5583b382..198f2149 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/AbstractEnchantConfigGui.java @@ -9,6 +9,7 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantmentRegistry; import xyz.alexcrea.cuanvil.gui.config.list.SettingGuiListConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.SettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import java.util.Collection; import java.util.Collections; @@ -27,11 +28,11 @@ public abstract class AbstractEnchantConfigGui getRecipeLore(AnvilCustomRecipe recipe) { boolean shouldWork = recipe.validate(); - ArrayList lore = new ArrayList<>(); + ArrayList lore = new ArrayList<>();//TODO MESSAGE lore.add("§7Is valid: §" + (shouldWork ? "aYes" : "cNo")); lore.add("§7Exact count: §" + (recipe.getExactCount() ? "aYes" : "cNo")); lore.add("§7Recipe Level Cost: §e" + recipe.getLevelCostPerCraft()); @@ -90,7 +91,7 @@ public class CustomRecipeConfigGui extends MappedGuiListConfigGui { NamespacedKey type = MaterialUtil.INSTANCE.getCustomType(itemStack); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java index 19d31d9f..673c2ec8 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/ElementListConfigGui.java @@ -18,6 +18,7 @@ import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import java.util.ArrayList; import java.util.Collection; @@ -32,16 +33,18 @@ public abstract class ElementListConfigGui extends ChestGui implements ValueU public static final int LIST_FILLER_LENGTH = 7; public static final int LIST_FILLER_HEIGHT = 4; - private final String namePrefix; + private final Message rawTitle; + private final String param; protected PatternPane backgroundPane; private Predicate filter = (t) -> true; private boolean hasDefaultFilter = true; - protected ElementListConfigGui(@NotNull String title, Gui parent) { - super(6, title, CustomAnvil.instance); - this.namePrefix = title; + protected ElementListConfigGui(@NotNull Message title, String param, Gui parent) { + super(6, title.textHolder(param, "", ""), CustomAnvil.instance); + this.rawTitle = title; + this.param = param; // Back item panel Pattern pattern = getBackgroundPattern(); @@ -259,13 +262,10 @@ public abstract class ElementListConfigGui extends ChestGui implements ValueU // and add actual page addPane(page); - // set title - StringBuilder title = new StringBuilder(this.namePrefix); + // intended parameter: (page/max_page) //TODO MESSAGE CHECK CHILDS int pagesSize = this.pages.size(); - if (pagesSize > 1) { - title.append(" (").append(pageID + 1).append('/').append(pagesSize).append(')'); - } - setTitle(title.toString()); + var title = this.rawTitle.textHolder(param, pageID + 1, pagesSize); + setTitle(title); super.show(humanEntity); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java index 7bfffdf8..2406fddc 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedElementListConfigGui.java @@ -10,6 +10,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.lang.MsgUI; import java.util.Arrays; @@ -20,14 +21,14 @@ public abstract class MappedElementListConfigGui extends ElementListConfig protected final HashMap elementGuiMap; - protected MappedElementListConfigGui(@NotNull String title, @NotNull Gui parent) { - super(title, parent); + protected MappedElementListConfigGui(@NotNull Message title, @NotNull String param, @NotNull Gui parent) { + super(title, param, parent); this.elementGuiMap = new HashMap<>(); } - protected MappedElementListConfigGui(@NotNull String title) { - this(title, MainConfigGui.getInstance()); + protected MappedElementListConfigGui(@NotNull Message title, @NotNull String param) { + this(title, param, MainConfigGui.getInstance()); } @Override diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java index d25d6e72..5d346a43 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/MappedGuiListConfigGui.java @@ -8,6 +8,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.config.list.elements.ElementMappedToListGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.LazyValue; @@ -19,12 +20,20 @@ import java.util.function.Supplier; public abstract class MappedGuiListConfigGui> extends MappedElementListConfigGui { - protected MappedGuiListConfigGui(@NotNull String title) { - super(title); + protected MappedGuiListConfigGui(@NotNull Message title, @NotNull String param) { + super(title, param); } - protected MappedGuiListConfigGui(@NotNull String title, @NotNull Gui parent) { - super(title, parent); + protected MappedGuiListConfigGui(@NotNull Message title, @NotNull String param, @NotNull Gui parent) { + super(title, param, parent); + } + + protected MappedGuiListConfigGui(@NotNull Message title) { + super(title, ""); + } + + protected MappedGuiListConfigGui(@NotNull Message title, @NotNull Gui parent) { + super(title, "", parent); } @Override diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java index cb55ed08..b7bf0002 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/SettingGuiListConfigGui.java @@ -10,6 +10,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.config.MainConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.SettingGui; +import xyz.alexcrea.cuanvil.lang.Message; import java.util.HashMap; import java.util.List; @@ -20,16 +21,26 @@ public abstract class SettingGuiListConfigGui guiItemMap; protected HashMap factoryMap; - protected SettingGuiListConfigGui(@NotNull String title, Gui parent) { - super(title, parent); + protected SettingGuiListConfigGui(@NotNull Message title, Gui parent) { + super(title, "", parent); this.guiItemMap = new HashMap<>(); this.factoryMap = new HashMap<>(); } - protected SettingGuiListConfigGui(@NotNull String title) { + protected SettingGuiListConfigGui(@NotNull Message title) { this(title, MainConfigGui.getInstance()); } + protected SettingGuiListConfigGui(@NotNull Message title, @NotNull String param, Gui parent) { + super(title, param, parent); + this.guiItemMap = new HashMap<>(); + this.factoryMap = new HashMap<>(); + } + + protected SettingGuiListConfigGui(@NotNull Message title, @NotNull String param) { + this(title, param, MainConfigGui.getInstance()); + } + @Override protected GuiItem prepareCreateNewItem() { ItemStack createItem = new ItemStack(Material.PAPER); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java index f39b7aaf..fcbfa733 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/UnitRepairElementListGui.java @@ -33,12 +33,16 @@ public class UnitRepairElementListGui extends SettingGuiListConfigGui { ItemMeta meta = itemStack.getItemMeta(); NamespacedKey type = MaterialUtil.INSTANCE.getCustomType(itemStack); if (!(meta instanceof Damageable)) { - MsgUI.INSTANCE.getUNIT_REPAIR_ELEMENT_CANNOT_REPAIR_NEW().send(player); + MsgUI.INSTANCE.getUNIT_REPAIR_NEW_ELEMENT_CANNOT_REPAIR().send(player); return; } if (type.equals(this.parentMaterial)) { - MsgUI.INSTANCE.getUNIT_REPAIR_ELEMENT_SAME_TYPE_NEW().send(player); + MsgUI.INSTANCE.getUNIT_REPAIR_NEW_ELEMENT_SAME_TYPE().send(player); return; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java index 9db6d622..83159d04 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/CustomRecipeSubSettingGui.java @@ -19,6 +19,7 @@ import xyz.alexcrea.cuanvil.gui.config.settings.ItemSettingGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe; import xyz.alexcrea.cuanvil.recipe.CustomAnvilRecipeManager; import xyz.alexcrea.cuanvil.util.CasedStringUtil; @@ -36,7 +37,7 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { public CustomRecipeSubSettingGui( @NotNull CustomRecipeConfigGui parent, @NotNull AnvilCustomRecipe anvilRecipe) { - super(4, "§e" + CasedStringUtil.snakeToUpperSpacedCase(anvilRecipe.toString()) + " §8Config"); + super(4, CasedStringUtil.snakeToUpperSpacedCase(anvilRecipe.toString())); this.parent = parent; this.anvilRecipe = anvilRecipe; @@ -73,19 +74,19 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { ItemMeta deleteMeta = deleteItem.getItemMeta(); assert deleteMeta != null; - deleteMeta.setDisplayName("§4DELETE RECIPE"); - deleteMeta.setLore(Collections.singletonList("§cCaution with this button !")); + deleteMeta.setDisplayName("§4DELETE RECIPE");//TODO MESSAGE + deleteMeta.setLore(Collections.singletonList("§cCaution with this button !"));//TODO MESSAGE deleteItem.setItemMeta(deleteMeta); this.pane.bindItem('D', new GuiItem(deleteItem, GuiGlobalActions.openGuiAction(createDeleteGui()), CustomAnvil.instance)); // Displayed item will be updated later IntRange costRange = AnvilCustomRecipe.Companion.getXP_COST_CONFIG_RANGE(); - this.exactCountFactory = new BoolSettingsGui.BoolSettingFactory("§8Exact count ?", this, + this.exactCountFactory = new BoolSettingsGui.BoolSettingFactory("§8Exact count ?", this,//TODO MESSAGE ConfigHolder.CUSTOM_RECIPE_HOLDER, this.anvilRecipe + "." + AnvilCustomRecipe.EXACT_COUNT_CONFIG, AnvilCustomRecipe.DEFAULT_EXACT_COUNT_CONFIG); - this.removeExactLinearXpFactory = new BoolSettingsGui.BoolSettingFactory("§8Remove exact linear xp ?", this, + this.removeExactLinearXpFactory = new BoolSettingsGui.BoolSettingFactory("§8Remove exact linear xp ?", this,//TODO MESSAGE ConfigHolder.CUSTOM_RECIPE_HOLDER, this.anvilRecipe + "." + AnvilCustomRecipe.REMOVE_EXACT_XP_CONFIG, AnvilCustomRecipe.DEFAULT_REMOVE_EXACT_XP_CONFIG); @@ -93,18 +94,18 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { ItemMeta meta = item.getItemMeta(); assert meta != null; - meta.setDisplayName("§cRemove exact linear xp ?"); - meta.setLore(Collections.singletonList("§7Not usable if linear cost is 0")); + meta.setDisplayName("§cRemove exact linear xp ?");//TODO MESSAGE + meta.setLore(Collections.singletonList("§7Not usable if linear cost is 0"));//TODO MESSAGE item.setItemMeta(meta); this.noRemoveExactLinearXp = new GuiItem(item, GuiGlobalActions.stayInPlace, CustomAnvil.instance); - this.levelCostFactory = new IntSettingsGui.IntSettingFactory("§8Recipe Level Cost", this, + this.levelCostFactory = new IntSettingsGui.IntSettingFactory("§8Recipe Level Cost", this,//TODO MESSAGE this.anvilRecipe + "." + AnvilCustomRecipe.XP_LEVEL_COST_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, null, costRange.getFirst(), costRange.getLast(), AnvilCustomRecipe.DEFAULT_XP_LEVEL_COST_CONFIG, 1, 5, 10); - this.linearXpCostFactory = new IntSettingsGui.IntSettingFactory("§8Recipe Linear Xp Cost", this, + this.linearXpCostFactory = new IntSettingsGui.IntSettingFactory("§8Recipe Linear Xp Cost", this,//TODO MESSAGE this.anvilRecipe + "." + AnvilCustomRecipe.LINEAR_XP_COST_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, null, @@ -117,21 +118,21 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_LEFT_ITEM_CONFIG(), "§7Set the left item of the custom craft", - "§7\u25A0 + \u25A1 = \u25A1"); + "§7■ + □ = □");//TODO MESSAGE this.rightItemFactory = new ItemSettingGui.ItemSettingFactory("§eRecipe Right §8Item", this, this.anvilRecipe + "." + AnvilCustomRecipe.RIGHT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_RIGHT_ITEM_CONFIG(), "§7Set the right item of the custom craft", - "§7\u25A1 + \u25A0 = \u25A1"); + "§7□ + ■ = □");//TODO MESSAGE this.resultItemFactory = new ItemSettingGui.ItemSettingFactory("§aRecipe Result §8Item", this, this.anvilRecipe + "." + AnvilCustomRecipe.RESULT_ITEM_CONFIG, ConfigHolder.CUSTOM_RECIPE_HOLDER, AnvilCustomRecipe.Companion.getDEFAULT_RESULT_ITEM_CONFIG(), "§7Set the result item of the custom craft", - "§7\u25A1 + \u25A1 = \u25A0"); + "§7□ + □ = ■");//TODO MESSAGE // Now we update the items updateLocal(); @@ -162,8 +163,9 @@ public class CustomRecipeSubSettingGui extends MappedToListSubSettingGui { return success; }; - return new ConfirmActionGui("§cDelete §e" + CasedStringUtil.snakeToUpperSpacedCase(this.anvilRecipe.toString()) + "§c?", - "§7Confirm that you want to delete this conflict.", + var type = CasedStringUtil.snakeToUpperSpacedCase(this.anvilRecipe.toString()); + return new ConfirmActionGui(MsgUI.INSTANCE.getCUSTOM_RECIPE_ELEMENT_DELETE_TITLE(), type, + MsgUI.INSTANCE.getCUSTOM_RECIPE_ELEMENT_DELETE_DESCRIPTION(), type, this, this.parent, deleteSupplier ); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java index 97bdfcb2..3e109873 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/EnchantConflictSubSettingGui.java @@ -24,6 +24,7 @@ import xyz.alexcrea.cuanvil.gui.config.settings.IntSettingsGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import xyz.alexcrea.cuanvil.util.MetricsUtil; @@ -41,8 +42,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl public EnchantConflictSubSettingGui( @NotNull EnchantConflictGui parent, @NotNull EnchantConflictGroup enchantConflict) { - super(3, - "§e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString()) + " §8Config"); + super(3, CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString())); this.parent = parent; this.enchantConflict = enchantConflict; @@ -71,8 +71,8 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl ItemMeta deleteMeta = deleteItem.getItemMeta(); assert deleteMeta != null; - deleteMeta.setDisplayName("§4DELETE CONFLICT"); - deleteMeta.setLore(Collections.singletonList("§cCaution with this button !")); + deleteMeta.setDisplayName("§4DELETE CONFLICT");//TODO MESSAGE + deleteMeta.setLore(Collections.singletonList("§cCaution with this button !"));//TODO MESSAGE deleteItem.setItemMeta(deleteMeta); this.pane.bindItem('D', new GuiItem(deleteItem, GuiGlobalActions.openGuiAction(createDeleteGui()), CustomAnvil.instance)); @@ -80,22 +80,24 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl // Displayed item will be updated later this.enchantSettingItem = new GuiItem(new ItemStack(Material.ENCHANTED_BOOK), event -> { event.setCancelled(true); + var type = CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString()); EnchantSelectSettingGui enchantGui = new EnchantSelectSettingGui( - "§e" + CasedStringUtil.snakeToUpperSpacedCase(enchantConflict.toString()) + "§5", + MsgUI.INSTANCE.getENCHANTMENT_CONFLICT_ELEMENT_ENCHANTMENTS(), type, this, this); enchantGui.show(event.getWhoClicked()); }, CustomAnvil.instance); this.groupSettingItem = new GuiItem(new ItemStack(Material.PAPER), event -> { event.setCancelled(true); + var type = CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()); GroupSelectSettingGui enchantGui = new GroupSelectSettingGui( - "§e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()) + " §3Groups", + MsgUI.INSTANCE.getENCHANTMENT_CONFLICT_ELEMENT_SUB_GROUPS(), type, this, this, 0); enchantGui.show(event.getWhoClicked()); }, CustomAnvil.instance); this.minBeforeActiveSettingFactory = new IntSettingsGui.IntSettingFactory( - "§8Minimum enchantment count", + "§8Minimum enchantment count",//TODO MESSAGE this, this.enchantConflict + ".maxEnchantmentBeforeConflict", ConfigHolder.CONFLICT_HOLDER, Arrays.asList( "§7Minimum enchantment count set to X mean only X enchantment can be put", @@ -137,8 +139,9 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl return success; }; - return new ConfirmActionGui("§cDelete §e" + CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()) + "§c?", - "§7Confirm that you want to delete this conflict.", + var type = CasedStringUtil.snakeToUpperSpacedCase(this.enchantConflict.toString()); + return new ConfirmActionGui(MsgUI.INSTANCE.getENCHANTMENT_CONFLICT_ELEMENT_DELETE_TITLE(), type, + MsgUI.INSTANCE.getENCHANTMENT_CONFLICT_ELEMENT_DELETE_DESCRIPTION(), type, this, this.parent, deleteSupplier ); } @@ -159,12 +162,12 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl // Prepare enchantment lore ArrayList enchantLore = new ArrayList<>(); - enchantLore.add("§7Allow you to select a list of §5Enchantments §7that this conflict should include"); + enchantLore.add("§7Allow you to select a list of §5Enchantments §7that this conflict should include");//TODO MESSAGE Set enchants = getSelectedEnchantments(); if (enchants.isEmpty()) { - enchantLore.add("§7There is no included enchantment for this conflict."); + enchantLore.add("§7There is no included enchantment for this conflict.");//TODO MESSAGE } else { - enchantLore.add("§7List of included enchantment for this conflict:"); + enchantLore.add("§7List of included enchantment for this conflict:");//TODO MESSAGE Iterator enchantIterator = enchants.iterator(); boolean greaterThanMax = enchants.size() > 5; @@ -175,7 +178,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl enchantLore.add("§7- §5" + formattedName); } if (greaterThanMax) { - enchantLore.add("§7And " + (enchants.size() - 4) + " more..."); + enchantLore.add("§7And " + (enchants.size() - 4) + " more...");//TODO MESSAGE } } @@ -188,7 +191,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl ItemMeta enchantMeta = enchantItem.getItemMeta(); assert enchantMeta != null; - enchantMeta.setDisplayName("§aSelect included §5Enchantments §aSettings"); + enchantMeta.setDisplayName("§aSelect included §5Enchantments §aSettings");//TODO MESSAGE enchantMeta.setLore(enchantLore); enchantItem.setItemMeta(enchantMeta); @@ -200,7 +203,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl ItemMeta groupMeta = groupItem.getItemMeta(); assert groupMeta != null; - groupMeta.setDisplayName("§aSelect Excluded §3Groups §aSettings"); + groupMeta.setDisplayName("§aSelect Excluded §3Groups §aSettings");//TODO MESSAGE groupMeta.setLore(groupLore); groupItem.setItemMeta(groupMeta); @@ -208,7 +211,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl this.groupSettingItem.setItem(groupItem); // Just in case this.pane.bindItem('M', this.minBeforeActiveSettingFactory.getItem(Material.COMMAND_BLOCK, - "Minimum Enchantment Count")); + "Minimum Enchantment Count"));//TODO MESSAGE update(); } @@ -246,7 +249,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @Override public boolean setSelectedEnchantments(Set enchantments) { if (!this.shouldWork) { - CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict + " enchants but sub config is destroyed"); + CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict + " enchants but sub config is destroyed");//TODO MESSAGE return false; } @@ -264,7 +267,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl try { updateGuiValues(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for " + this.enchantConflict, e); + CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating enchants for " + this.enchantConflict, e);//TODO MESSAGE MetricsUtil.INSTANCE.trackError(e); } @@ -291,7 +294,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl @Override public boolean setSelectedGroups(Set groups) { if (!this.shouldWork) { - CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.toString() + " groups but sub config is destroyed"); + CustomAnvil.instance.getLogger().info("Trying to save " + enchantConflict.toString() + " groups but sub config is destroyed");//TODO MESSAGE return false; } @@ -309,7 +312,7 @@ public class EnchantConflictSubSettingGui extends MappedToListSubSettingGui impl try { updateGuiValues(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for " + this.enchantConflict, e); + CustomAnvil.instance.getLogger().log(Level.WARNING, "An error occurred while updating group for " + this.enchantConflict, e);//TODO MESSAGE MetricsUtil.INSTANCE.trackError(e); } diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java index d26c33fe..be841d09 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java @@ -13,6 +13,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; +import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil; import xyz.alexcrea.cuanvil.group.*; import xyz.alexcrea.cuanvil.gui.config.SelectGroupContainer; import xyz.alexcrea.cuanvil.gui.config.SelectMaterialContainer; @@ -20,11 +21,11 @@ import xyz.alexcrea.cuanvil.gui.config.ask.ConfirmActionGui; import xyz.alexcrea.cuanvil.gui.config.global.GroupConfigGui; import xyz.alexcrea.cuanvil.gui.config.settings.GroupSelectSettingGui; import xyz.alexcrea.cuanvil.gui.config.settings.MaterialSelectSettingGui; -import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.CasedStringUtil; +import xyz.alexcrea.cuanvil.util.ComponentUtil; import java.util.*; import java.util.function.Consumer; @@ -40,8 +41,7 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen public GroupConfigSubSettingGui( @NotNull GroupConfigGui parent, @NotNull IncludeGroup group) { - super(3, - "§e" + CasedStringUtil.snakeToUpperSpacedCase(group.getName()) + " §rConfig"); + super(3, CasedStringUtil.snakeToUpperSpacedCase(group.getName())); this.parent = parent; this.group = group; @@ -66,38 +66,60 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemStack deleteItem = new ItemStack(Material.RED_TERRACOTTA); ItemMeta deleteMeta = deleteItem.getItemMeta(); - deleteMeta.setDisplayName("§4DELETE GROUP"); - deleteMeta.setLore(Collections.singletonList("§cCaution with this button !")); + assert deleteMeta != null; + PlatformUtil.INSTANCE.setComponentDisplayName( + deleteMeta, + MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_BUTTON_NAME().formattedConcatenated(), + null + ); + ComponentUtil.INSTANCE.applyLore( + MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_BUTTON_LORE().formatted(), + deleteMeta + ); deleteItem.setItemMeta(deleteMeta); this.pane.bindItem('D', new GuiItem(deleteItem, openGuiAndCheckAction(), CustomAnvil.instance)); // Displayed item will be updated later - String materialSelectionName = "§e" + CasedStringUtil.snakeToUpperSpacedCase(group.getName()) + " §rMaterials"; + var materialSelectionName = MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_SELECTED_MATERIALS(); + var name = CasedStringUtil.snakeToUpperSpacedCase(group.getName()); + ItemStack selectItem = new ItemStack(Material.DIAMOND_SWORD); ItemMeta selectItemMeta = selectItem.getItemMeta(); - selectItemMeta.setDisplayName(materialSelectionName); + assert selectItemMeta != null; + + PlatformUtil.INSTANCE.setComponentDisplayName( + selectItemMeta, + materialSelectionName.formattedConcatenated(name), + null + ); selectItem.setItemMeta(selectItemMeta); this.materialSelection = new GuiItem(selectItem, (event) -> { event.setCancelled(true); MaterialSelectSettingGui selectGui = new MaterialSelectSettingGui(this, - materialSelectionName + materialSelectionName, name , this); selectGui.show(event.getWhoClicked()); }, CustomAnvil.instance); - String selectGroupName = "§e" + CasedStringUtil.snakeToUpperSpacedCase(this.group.getName()) + " §rGroups"; + var selectGroupName = MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_SELECTED_SUB_GROUPS(); ItemStack selectGroup = new ItemStack(Material.CHEST); ItemMeta selectGroupMeta = selectGroup.getItemMeta(); - selectGroupMeta.setDisplayName(selectGroupName); + assert selectGroupMeta != null; + + PlatformUtil.INSTANCE.setComponentDisplayName( + selectGroupMeta, + selectGroupName.formattedConcatenated(name), + null + ); selectGroup.setItemMeta(selectGroupMeta); this.groupSelection = new GuiItem(selectGroup, (event) -> { event.setCancelled(true); GroupSelectSettingGui enchantGui = new GroupSelectSettingGui( - selectGroupName, + selectGroupName, name, this, this, 0); enchantGui.show(event.getWhoClicked()); }, CustomAnvil.instance); @@ -152,8 +174,9 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen return success; }; - return new ConfirmActionGui("§cDelete §e" + CasedStringUtil.snakeToUpperSpacedCase(this.group.toString()) + "§c?", - "§7Confirm that you want to delete this group.", + var type = CasedStringUtil.snakeToUpperSpacedCase(this.group.toString()); + return new ConfirmActionGui(MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_TITLE(), type, + MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_DESCRIPTION(), type, this, this.parent, deleteSupplier ); } @@ -226,7 +249,8 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemStack matSelectItem = this.materialSelection.getItem(); ItemMeta matSelectMeta = matSelectItem.getItemMeta(); - matSelectMeta.setDisplayName("§aSelect included §eMaterials §aSettings"); + assert matSelectMeta != null; + matSelectMeta.setDisplayName("§aSelect included §eMaterials §aSettings");//TODO MESSAGE matSelectMeta.setLore(matLore); matSelectMeta.addItemFlags(ItemFlag.values()); @@ -238,7 +262,8 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemStack groupSelectItem = this.groupSelection.getItem(); ItemMeta groupSelectMeta = groupSelectItem.getItemMeta(); - groupSelectMeta.setDisplayName("§aSelect included §3Groups §aSettings"); + assert groupSelectMeta != null; + groupSelectMeta.setDisplayName("§aSelect included §3Groups §aSettings");//TODO MESSAGE groupSelectMeta.setLore(groupLore); groupSelectItem.setItemMeta(groupSelectMeta); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java index 1d867812..935e8671 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/MappedToListSubSettingGui.java @@ -1,18 +1,18 @@ package xyz.alexcrea.cuanvil.gui.config.list.elements; -import com.github.stefvanschie.inventoryframework.gui.GuiItem; import com.github.stefvanschie.inventoryframework.gui.type.ChestGui; import com.github.stefvanschie.inventoryframework.gui.type.util.Gui; import io.delilaheve.CustomAnvil; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; +import xyz.alexcrea.cuanvil.lang.MsgUI; public abstract class MappedToListSubSettingGui extends ChestGui implements ValueUpdatableGui, ElementMappedToListGui { protected MappedToListSubSettingGui( int rows, - @NotNull String title) { - super(rows, title, CustomAnvil.instance); + @NotNull String type) { + super(rows, MsgUI.INSTANCE.getSHARED_TYPED_CONFIG_TITLE().textHolder(type), CustomAnvil.instance); } @Override diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java index 4473eb29..54251a61 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java @@ -20,6 +20,7 @@ import xyz.alexcrea.cuanvil.gui.config.SelectEnchantmentContainer; import xyz.alexcrea.cuanvil.gui.config.list.SettingGuiListConfigGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.*; @@ -35,8 +36,10 @@ public class EnchantSelectSettingGui extends SettingGuiListConfigGui(enchantContainer.getSelectedEnchantments()); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/GroupSelectSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/GroupSelectSettingGui.java index 578ca89e..2db12c20 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/GroupSelectSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/GroupSelectSettingGui.java @@ -19,6 +19,7 @@ import xyz.alexcrea.cuanvil.gui.ValueUpdatableGui; import xyz.alexcrea.cuanvil.gui.config.SelectGroupContainer; import xyz.alexcrea.cuanvil.gui.config.list.ElementListConfigGui; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import java.util.Collections; @@ -34,8 +35,10 @@ public class GroupSelectSettingGui extends AbstractSettingGui { Set selectedGroups; - public GroupSelectSettingGui(@NotNull String title, ValueUpdatableGui parent, SelectGroupContainer groupContainer, int page) { - super(6, title, parent); + public GroupSelectSettingGui( + @NotNull Message title, @NotNull String param, + ValueUpdatableGui parent, SelectGroupContainer groupContainer, int page) { + super(6, title.textHolder(param), parent); this.groupContainer = groupContainer; //Not used but planned this.page = page; diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/MaterialSelectSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/MaterialSelectSettingGui.java index 0f5759e0..102e1c9f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/MaterialSelectSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/MaterialSelectSettingGui.java @@ -18,6 +18,7 @@ import xyz.alexcrea.cuanvil.gui.config.list.MappedElementListConfigGui; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; +import xyz.alexcrea.cuanvil.lang.Message; import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.CasedStringUtil; import xyz.alexcrea.cuanvil.util.MaterialUtil; @@ -38,9 +39,10 @@ public class MaterialSelectSettingGui extends MappedElementListConfigGui { removeMaterial(material); diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt index 5e9276d3..640ae297 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -1,5 +1,7 @@ package xyz.alexcrea.cuanvil.lang +import com.github.stefvanschie.inventoryframework.adventuresupport.ComponentHolder +import com.github.stefvanschie.inventoryframework.adventuresupport.TextHolder import io.delilaheve.CustomAnvil import net.kyori.adventure.text.Component import org.bukkit.command.CommandSender @@ -22,6 +24,7 @@ open class Message(val key: String, vararg val params: String) { for(i in 0 until min(params.size, values.size)) { val key = params[i] val replacement = values[i].toString() + if(replacement.isEmpty()) continue //May not be good but can be changed if cause an issue var current = 0 while(true) { @@ -77,9 +80,11 @@ open class Message(val key: String, vararg val params: String) { result.add(MiniMessageUtil.mm.deserialize(stb.toString())) } + if(result.isEmpty()) return listOf(Component.text(key)) return result } + // return a list of AT LEAST 1 element. calling first is safe fun formatted(vararg params: Any): List { val section = Lang.getSection(key) if(section != null) return formattedMultiline(section, *params) @@ -89,6 +94,21 @@ open class Message(val key: String, vararg val params: String) { return listOf(MiniMessageUtil.mm.deserialize(translated)) } + fun formattedConcatenated(vararg params: Any): Component { + val formated = formatted(*params) + + var result = formated.first() + for(i in 1 until formated.size) { + result = result.appendNewline().append(formated[i]) + } + + return result + } + + fun textHolder(vararg params: Any): TextHolder { + return ComponentHolder.of(formattedConcatenated(*params)) + } + fun legacy(vararg params: Any): String { val formated = formatted(*params) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt index c144f1fc..c11456be 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt @@ -5,6 +5,7 @@ import xyz.alexcrea.cuanvil.lang.UIMessage as Message object MsgUI { val SHARED_CONFIG_NO_EDIT_PERM = Message("shared.no-permission") + val SHARED_TYPED_CONFIG_TITLE = Message("shared.typed-config-title", "type") val CONFIRM_ACTION_FAILED = Message("confirm-action.fail") @@ -12,10 +13,44 @@ object MsgUI { val ELEMENT_LIST_CANCELLED_NEW = Message("element-list.cancelled-new", "type") val ELEMENT_LIST_DUPLICATED_NEW = Message("element-list.duplicated-new", "type") - val UNIT_REPAIR_ELEMENT_TITLE = Message("unit-repair.element.title") - val UNIT_REPAIR_ELEMENT_DESCRIPTION = Message("unit-repair.element.description") - val UNIT_REPAIR_ELEMENT_CANNOT_REPAIR_NEW = Message("unit-repair.element.cannot-damage-new") - val UNIT_REPAIR_ELEMENT_SAME_TYPE_NEW = Message("unit-repair.element.same-type-new") + val UNIT_REPAIR_TITLE = Message("unit-repair.title") + val UNIT_REPAIR_ELEMENT_TITLE = Message("unit-repair.element_title") + val UNIT_REPAIR_NEW_TITLE = Message("unit-repair.new.title") + val UNIT_REPAIR_NEW_DESCRIPTION = Message("unit-repair.new.description") + val UNIT_REPAIR_NEW_ELEMENT_TITLE = Message("unit-repair.element.new.title", "name") + val UNIT_REPAIR_NEW_ELEMENT_DESCRIPTION = Message("unit-repair.element.new.description", "name") + val UNIT_REPAIR_NEW_ELEMENT_CANNOT_REPAIR = Message("unit-repair.element.new.cannot-damage") + val UNIT_REPAIR_NEW_ELEMENT_SAME_TYPE = Message("unit-repair.element.new.same-type") + + val CUSTOM_RECIPE_TITLE = Message("custom-recipe.title") + + val CUSTOM_RECIPE_ELEMENT_DELETE_TITLE = Message("custom-recipe.element.delete.title", "type") + val CUSTOM_RECIPE_ELEMENT_DELETE_DESCRIPTION = Message("custom-recipe.element.delete.description", "type") + + val ENCHANTMENT_LEVEL_COST_TITLE = Message("enchant-level-cost.title") + + val ENCHANTMENT_LEVEL_LIMIT_TITLE = Message("enchant-level-limit.title") + + val ENCHANTMENT_MERGE_LIMIT_TITLE = Message("enchant-merge-limit.title") + + val ENCHANTMENT_CONFLICT_TITLE = Message("enchant-conflict.title") + val ENCHANTMENT_CONFLICT_ELEMENT_ENCHANTMENTS = Message("enchant-conflict.element.selected-enchantments", "group") + val ENCHANTMENT_CONFLICT_ELEMENT_SUB_GROUPS = Message("enchant-conflict.element.selected-sub-groups", "group") + + val ENCHANTMENT_CONFLICT_ELEMENT_DELETE_TITLE = Message("enchant-conflict.element.delete.title", "type") + val ENCHANTMENT_CONFLICT_ELEMENT_DELETE_DESCRIPTION = Message("enchant-conflict.element.delete.description", "type") + + val MATERIAL_GROUP_TITLE = Message("material-group.title") + val MATERIAL_GROUP_ELEMENT_SELECTED_MATERIALS = Message("material-group.element.selected-materials", "group") + val MATERIAL_GROUP_ELEMENT_SELECTED_SUB_GROUPS = Message("material-group.element.selected-sub-groups", "group") + + val MATERIAL_GROUP_ELEMENT_DELETE_TITLE = Message("material-group.element.delete.title", "type") + val MATERIAL_GROUP_ELEMENT_DELETE_DESCRIPTION = Message("material-group.element.delete.description", "type") + val MATERIAL_GROUP_ELEMENT_DELETE_BUTTON_NAME = Message("material-group.element.delete.button.name") + val MATERIAL_GROUP_ELEMENT_DELETE_BUTTON_LORE = Message("material-group.element.delete.button.lore") + + val MATERIAL_SELECT_CONFIRM_TITLE = Message("material-select.confirm.title","name") + val MATERIAL_SELECT_CONFIRM_DESCRIPTION = Message("material-select.confirm.description","name") } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt index 2d9ec351..76bc7287 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt @@ -2,10 +2,28 @@ package xyz.alexcrea.cuanvil.util import net.kyori.adventure.text.Component import org.bukkit.command.CommandSender +import org.bukkit.inventory.meta.ItemMeta import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.sendPaperMessage +import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setPaperLore object ComponentUtil { + fun Component.serializeMM(): String { + return MiniMessageUtil.mm.serialize(this) + } + + fun Component.serializeMMColor(): String { + return MiniMessageUtil.color_only_mm.serialize(this) + } + + fun Component.serializeLegacy(): String { + return MiniMessageUtil.legacy_mm.serialize(this) + } + + fun Component.serializePlain(): String { + return MiniMessageUtil.plain_text_mm.serialize(this) + } + fun Component.send(destination: CommandSender) { if(!destination.sendPaperMessage(this)) destination.sendMessage(this.serializeLegacy()) @@ -16,18 +34,9 @@ object ComponentUtil { component.send(destination) } - fun Component.serializeMM(): String { - return MiniMessageUtil.mm.serialize(this) + fun List.applyLore(meta: ItemMeta) { + if(!meta.setPaperLore(this)) + meta.lore = this.map {obj -> obj.serializeLegacy()} } - fun Component.serializeMMColor(): String { - return MiniMessageUtil.color_only_mm.serialize(this) - } - fun Component.serializeLegacy(): String { - return MiniMessageUtil.legacy_mm.serialize(this) - } - fun Component.serializePlain(): String { - return MiniMessageUtil.plain_text_mm.serialize(this) - } - } \ No newline at end of file diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml index 75483d16..c6d043a9 100644 --- a/src/main/resources/lang/en.yml +++ b/src/main/resources/lang/en.yml @@ -24,6 +24,7 @@ error: listeners: "error registering listeners" enchant-system: "error initializing enchantment system" non-default-config: "Plugin has an issue while trying to load non default config... exiting..." + reload: resource: fail: "Resource %path Could not be loaded or reloaded." @@ -37,11 +38,13 @@ command: no-permission: "No permission to execute this command" warning: missing-subcmd: "Need to specify a subcommand. for example %example1 or %example2" + root: warning: unknown-sub: "Invalid subcommand. run `%command help` to see available commands" error: generic: "Error running this command" + debug: description: "Used to toggle debug logs and retrieve them" log-cleared: "Log Cleared" @@ -54,10 +57,12 @@ command: unspecified-type: "Need to specify which type of debug to toggle: \"default\" or \"verbose\"" invalid-type: "Invalid debug type \"%type\"" no-log: "No log to show ? make sure you tried with debug log toggled (%command)" + diagnostic: description: "Basic diagnostic of this plugin" had-error: "There was an error running the diagnostic" copy: "Click to copy diagnostic data" + config: description: "Used to edit the configuration of the plugin" folia-issue: @@ -72,6 +77,7 @@ command: warning: legacy-name: "/ca gui has been moved to /ca config" cannot_configure: "Cannot configure the item in hand" + enchant: description: "Allows to set enchantment to holden item" warning: @@ -81,9 +87,11 @@ command: cannot_enchant: "Cannot enchant this item" removed: "%name removed" set: "%name set to level %level" + help: description: "Help command" header: "List of available commands:" + reload: description: "Reload the configuration of this plugin" start: "Reloading config..." @@ -94,19 +102,74 @@ command: config-ui: shared: no-permission: "You do not have permission to edit the config" + typed-config-title: "%type Config" + confirm-action: fail: "Action could not be completed." + element-list: instruction-new: 1: "Write the %type name you want to create in the chat." 2: "Or write cancel to go back to %type config menu" cancelled-new: "%type creation cancelled..." duplicated-new: "Please enter a %type name that do not already exist..." + unit-repair: - element: - title: "Select item to be repaired." + tile: "Unit Repair Config" + new: + title: "Select unit repair item." description: 1: "Click here with an item to set the item" - 2: "You like to be repaired by %name" - cannot-damage-new: "This item can't be damaged, so it can't be repaired." - same-type-new: "Item can't repair something of the same type." \ No newline at end of file + 2: "You like to be an unit repair item" + element: + title: "%type Unit repair" + new: + title: "Select item to be repaired." + description: + 1: "Click here with an item to set the item" + 2: "You like to be repaired by %name" + cannot-damage: "This item can't be damaged, so it can't be repaired." + same-type: "Item can't repair something of the same type." + + custom-recipe: + title: "Custom Recipe Config" + element: + delete: + title: "Delete %type?" + description: "Confirm that you want to delete this recipe." + + enchant-level-cost: + title: "Enchantment Level Limit" + + enchant-level-limit: + title: "Enchantment Level Limit" + + enchant-merge-limit: + title: "Enchantment Maximum Merge Level" + + enchant-conflict: + title: "Conflict Config" + element: + selected-enchantments: "%group" # likely need page and max page + selected-sub-groups: "%group Groups" + delete: + title: "Delete %type?" + description: "Confirm that you want to delete this conflict." + + material-group: + title: "Group Config" + element: + selected-materials: "%group Materials" + selected-sub-groups: "%group Groups" + delete: + title: "Delete %type?" + description: "Confirm that you want to delete this group." + button: + name: "DELETE GROUP" + lore: "Caution with this button !" + + material-select: + new: + confirm: + title: "Remove %name" + description: "Confirm Remove %name from this list." From f373cae10022ae8736695fc07884fffc391b5d50 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Mon, 17 Aug 2026 02:12:10 +0200 Subject: [PATCH 10/11] ask gui translatable --- .../gui/config/ask/ConfirmActionGui.java | 11 +++++----- .../gui/config/ask/SelectItemTypeGui.java | 5 ++--- .../elements/GroupConfigSubSettingGui.java | 21 ++++-------------- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 2 +- .../alexcrea/cuanvil/anvil/AnvilMergeLogic.kt | 2 -- .../cuanvil/command/ReloadExecutor.kt | 2 +- .../kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt | 22 ++++++++++++++++--- .../xyz/alexcrea/cuanvil/lang/MsgError.kt | 9 +++++--- .../kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt | 3 +++ .../cuanvil/listener/AnvilResultListener.kt | 1 - .../alexcrea/cuanvil/util/ComponentUtil.kt | 6 +++++ src/main/resources/lang/en.yml | 7 ++++++ 12 files changed, 54 insertions(+), 37 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java index e3b02a12..b570e1d5 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/ConfirmActionGui.java @@ -13,12 +13,11 @@ import org.jetbrains.annotations.Nullable; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.lang.Message; +import xyz.alexcrea.cuanvil.lang.MsgError; import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.ComponentUtil; -import xyz.alexcrea.cuanvil.util.MetricsUtil; import java.awt.*; -import java.util.Arrays; import java.util.function.Supplier; import java.util.logging.Level; @@ -47,8 +46,7 @@ public class ConfirmActionGui extends AbstractAskGui { try { success = onConfirm.get(); } catch (Exception e) { - CustomAnvil.instance.getLogger().log(Level.WARNING, "Could not process confirmation supplier.", e); //TODO MESSAGE - MetricsUtil.INSTANCE.trackError(e); + CustomAnvil.Companion.logError(MsgError.INSTANCE.getCONFIRM_ACTION_GENERIC().unformatted(), e, true, Level.WARNING); success = false; } @@ -62,10 +60,11 @@ public class ConfirmActionGui extends AbstractAskGui { // Info item ItemStack infoItem = new ItemStack(Material.PAPER); ItemMeta infoMeta = infoItem.getItemMeta(); + assert infoMeta != null; - infoMeta.setDisplayName("§eAre you sure ?"); //TODO MESSAGE + ComponentUtil.INSTANCE.setMessageName(infoMeta, MsgUI.INSTANCE.getCONFIRM_ACTION_ARE_YOU_SURE()); if(actionDescription != null){ - ComponentUtil.INSTANCE.applyLore(actionDescription.formatted(), infoMeta); + ComponentUtil.INSTANCE.applyLore(actionDescription.formatted(actionParam), infoMeta); } infoItem.setItemMeta(infoMeta); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java index b4b10b6f..fc96c282 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/ask/SelectItemTypeGui.java @@ -9,7 +9,6 @@ import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; -import xyz.alexcrea.cuanvil.gui.util.GuiGlobalActions; import xyz.alexcrea.cuanvil.gui.util.GuiGlobalItems; import xyz.alexcrea.cuanvil.gui.util.GuiSharedConstant; import xyz.alexcrea.cuanvil.lang.Message; @@ -17,7 +16,6 @@ import xyz.alexcrea.cuanvil.lang.MsgUI; import xyz.alexcrea.cuanvil.util.ComponentUtil; import xyz.alexcrea.cuanvil.util.MaterialUtil; -import java.util.Arrays; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiConsumer; @@ -89,8 +87,9 @@ public class SelectItemTypeGui extends AbstractAskGui { @NotNull String param ){ ItemMeta meta = item.getItemMeta(); + assert meta != null; - meta.setDisplayName("§ePlace an item here"); //TODO MESSAGE + ComponentUtil.INSTANCE.setMessageName(meta, MsgUI.INSTANCE.getSELECT_ITEM_TYPE_PLACE_HERE()); ComponentUtil.INSTANCE.applyLore(actionDescription.formatted(param), meta); item.setItemMeta(meta); diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java index be841d09..045fdcbe 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java @@ -13,7 +13,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.jetbrains.annotations.NotNull; import xyz.alexcrea.cuanvil.config.ConfigHolder; -import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil; import xyz.alexcrea.cuanvil.group.*; import xyz.alexcrea.cuanvil.gui.config.SelectGroupContainer; import xyz.alexcrea.cuanvil.gui.config.SelectMaterialContainer; @@ -65,13 +64,9 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen // Delete item ItemStack deleteItem = new ItemStack(Material.RED_TERRACOTTA); ItemMeta deleteMeta = deleteItem.getItemMeta(); - assert deleteMeta != null; - PlatformUtil.INSTANCE.setComponentDisplayName( - deleteMeta, - MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_BUTTON_NAME().formattedConcatenated(), - null - ); + + ComponentUtil.INSTANCE.setMessageName(deleteMeta, MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_BUTTON_NAME()); ComponentUtil.INSTANCE.applyLore( MsgUI.INSTANCE.getMATERIAL_GROUP_ELEMENT_DELETE_BUTTON_LORE().formatted(), deleteMeta @@ -88,11 +83,7 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemMeta selectItemMeta = selectItem.getItemMeta(); assert selectItemMeta != null; - PlatformUtil.INSTANCE.setComponentDisplayName( - selectItemMeta, - materialSelectionName.formattedConcatenated(name), - null - ); + ComponentUtil.INSTANCE.setMessageName(selectItemMeta, materialSelectionName); selectItem.setItemMeta(selectItemMeta); this.materialSelection = new GuiItem(selectItem, (event) -> { @@ -109,11 +100,7 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemMeta selectGroupMeta = selectGroup.getItemMeta(); assert selectGroupMeta != null; - PlatformUtil.INSTANCE.setComponentDisplayName( - selectGroupMeta, - selectGroupName.formattedConcatenated(name), - null - ); + ComponentUtil.INSTANCE.setMessageName(selectGroupMeta, selectGroupName); selectGroup.setItemMeta(selectGroupMeta); this.groupSelection = new GuiItem(selectGroup, (event) -> { diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index 7ff46191..d9dfa0a4 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -161,7 +161,7 @@ open class CustomAnvil : JavaPlugin() { // Load language try { - Lang.reload() + Lang.loadDefault() } catch (e: Exception) { logError("error occurred loading language file", e) if(tryDirtyStart()) return diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt index 7d1b745c..8503fc74 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/anvil/AnvilMergeLogic.kt @@ -23,10 +23,8 @@ import xyz.alexcrea.cuanvil.enchant.CAEnchantment import xyz.alexcrea.cuanvil.recipe.AnvilCustomRecipe import xyz.alexcrea.cuanvil.util.CasedStringUtil import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeLegacy -import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.CustomRecipeUtil import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir -import xyz.alexcrea.cuanvil.util.MiniMessageUtil import xyz.alexcrea.cuanvil.util.UnitRepairUtil.getRepair import xyz.alexcrea.cuanvil.util.anvil.AnvilColorUtil import xyz.alexcrea.cuanvil.util.anvil.AnvilLoreEditUtil diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index f5b92b62..9b0bae17 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -62,7 +62,7 @@ class ReloadExecutor : CASubCommand { if(!ConfigHolder.reloadAllFromDisk(hardfail)) return false // reload language config - Lang.reload() + if(!Lang.reload()) return false // Then update all global gui containing value from config BasicConfigGui.getInstance()?.updateGuiValues() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt index 18be75f6..f164b9af 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt @@ -6,10 +6,26 @@ import xyz.alexcrea.cuanvil.config.ConfigHolder object Lang { - private val default = Language(DEFAULT_LANG, false) - private var lang = default + private lateinit var default: Language + private lateinit var lang: Language - fun reload() { + fun loadDefault() { + default = Language(DEFAULT_LANG, false) + lang = default + reload() + } + + fun reload(): Boolean { + try { + unsafeReload() + return true + } catch(e: Exception) { + CustomAnvil.logError("Error loading language $langID", e, false) + return false + } + } + + private fun unsafeReload() { val langID = langID if(lang.name == langID && lang != default) lang.reload() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt index 6e5e26fb..f0b32e26 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt @@ -19,8 +19,11 @@ object MsgError { val RELOAD_HARD_FAIL = ErrorMessage("reload.resource.hardfail") /* - * ---------- - * Commands - * ---------- + * ---- + * UI + * ---- */ + val CONFIRM_ACTION_GENERIC = ErrorMessage("confirm-action.generic") + + } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt index c11456be..6036069e 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt @@ -8,6 +8,9 @@ object MsgUI { val SHARED_TYPED_CONFIG_TITLE = Message("shared.typed-config-title", "type") val CONFIRM_ACTION_FAILED = Message("confirm-action.fail") + val CONFIRM_ACTION_ARE_YOU_SURE = Message("confirm-action.is-user-sure") + + val SELECT_ITEM_TYPE_PLACE_HERE = Message("select-item-type.place-here") val ELEMENT_LIST_INSTRUCTION_NEW = Message("element-list.instruction-new", "type") val ELEMENT_LIST_CANCELLED_NEW = Message("element-list.cancelled-new", "type") diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt index 5f192c51..56f4e689 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/listener/AnvilResultListener.kt @@ -33,7 +33,6 @@ import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.CustomRecipeUtil import xyz.alexcrea.cuanvil.util.MaterialUtil.isAir -import xyz.alexcrea.cuanvil.util.MiniMessageUtil import xyz.alexcrea.cuanvil.util.anvil.AnvilLoreEditUtil import xyz.alexcrea.cuanvil.util.anvil.AnvilXpUtil import xyz.alexcrea.cuanvil.util.config.LoreEditConfigUtil diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt index 76bc7287..bd8014a6 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt @@ -4,7 +4,9 @@ import net.kyori.adventure.text.Component import org.bukkit.command.CommandSender import org.bukkit.inventory.meta.ItemMeta import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.sendPaperMessage +import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setComponentDisplayName import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil.setPaperLore +import xyz.alexcrea.cuanvil.lang.Message object ComponentUtil { @@ -39,4 +41,8 @@ object ComponentUtil { meta.lore = this.map {obj -> obj.serializeLegacy()} } + fun ItemMeta.setMessageName(message: Message) { + this.setComponentDisplayName(message.formattedConcatenated()) + } + } \ No newline at end of file diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml index c6d043a9..26d7efbc 100644 --- a/src/main/resources/lang/en.yml +++ b/src/main/resources/lang/en.yml @@ -30,6 +30,9 @@ error: fail: "Resource %path Could not be loaded or reloaded." hard-fail: "Disabling plugin." + confirm-action: + generic: "Could not process confirmation supplier." + command: shared: no-diag-permission: "You do not have permission to diagnostic this server" @@ -106,6 +109,10 @@ config-ui: confirm-action: fail: "Action could not be completed." + is-user-sure: "Are you sure ?" + + select-item-type: + place-here: "Place an item here" element-list: instruction-new: From fbd3bf2eb25d6ebebfa0331dfe8e57fb69cbb1bc Mon Sep 17 00:00:00 2001 From: alexcrea Date: Mon, 17 Aug 2026 13:54:41 +0200 Subject: [PATCH 11/11] add lang debug command and fix found translation issue --- .../elements/GroupConfigSubSettingGui.java | 4 +- .../cuanvil/command/DebugToggleExecutor.kt | 141 +++++++++++++++++- .../cuanvil/dependency/DependencyManager.kt | 4 +- .../kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt | 13 ++ .../xyz/alexcrea/cuanvil/lang/Language.kt | 39 +++++ .../xyz/alexcrea/cuanvil/lang/Message.kt | 15 +- .../kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt | 4 - .../xyz/alexcrea/cuanvil/lang/MsgCommand.kt | 5 +- .../xyz/alexcrea/cuanvil/lang/MsgError.kt | 2 +- .../kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt | 28 ++-- .../xyz/alexcrea/cuanvil/lang/MsgWarning.kt | 2 +- .../alexcrea/cuanvil/util/ComponentUtil.kt | 4 +- src/main/resources/lang/en.yml | 19 ++- 13 files changed, 240 insertions(+), 40 deletions(-) delete mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java index 045fdcbe..ec8f8617 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/list/elements/GroupConfigSubSettingGui.java @@ -83,7 +83,7 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemMeta selectItemMeta = selectItem.getItemMeta(); assert selectItemMeta != null; - ComponentUtil.INSTANCE.setMessageName(selectItemMeta, materialSelectionName); + ComponentUtil.INSTANCE.setMessageName(selectItemMeta, materialSelectionName, name); selectItem.setItemMeta(selectItemMeta); this.materialSelection = new GuiItem(selectItem, (event) -> { @@ -100,7 +100,7 @@ public class GroupConfigSubSettingGui extends MappedToListSubSettingGui implemen ItemMeta selectGroupMeta = selectGroup.getItemMeta(); assert selectGroupMeta != null; - ComponentUtil.INSTANCE.setMessageName(selectGroupMeta, selectGroupName); + ComponentUtil.INSTANCE.setMessageName(selectGroupMeta, selectGroupName, name); selectGroup.setItemMeta(selectGroupMeta); this.groupSelection = new GuiItem(selectGroup, (event) -> { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt index 5c7bfee6..d42c8d22 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/DebugToggleExecutor.kt @@ -9,11 +9,16 @@ import net.md_5.bungee.api.chat.hover.content.Text import org.bukkit.command.Command import org.bukkit.command.CommandSender import org.bukkit.entity.Player +import xyz.alexcrea.cuanvil.lang.Lang import xyz.alexcrea.cuanvil.lang.Message import xyz.alexcrea.cuanvil.lang.MsgCommand +import xyz.alexcrea.cuanvil.lang.MsgError +import xyz.alexcrea.cuanvil.lang.MsgUI +import xyz.alexcrea.cuanvil.lang.MsgWarning import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain +import java.util.Locale -class DebugToggleExecutor : CASubCommand { +class DebugToggleExecutor: CASubCommand { override fun description(): Message { return MsgCommand.DEBUG_DESCRIPTION @@ -51,6 +56,10 @@ class DebugToggleExecutor : CASubCommand { MsgCommand.DEBUG_LOG_CLEARED.send(sender) } + "lang" -> { + executeLanguageDebug(sender, args) + } + else -> { MsgCommand.SHARED_UNKNOWN_SUB_COMMAND.send(sender) return false @@ -106,14 +115,142 @@ class DebugToggleExecutor : CASubCommand { } } + private fun executeLanguageDebug(sender: CommandSender, args: Array) { + if(args.size > 1 && "details".contentEquals(args[1], ignoreCase = true)) + detailedLangDebug(sender) + else + simpleLangDebug(sender) + + } + + private fun simpleLangDebug(sender: CommandSender) { + var validCount = 0 + // load key from all provider class + MsgCommand.DEBUG_DATA_HEADER + MsgUI.SHARED_CONFIG_NO_EDIT_PERM + MsgError.LOAD_LISTENERS + MsgWarning.ANVIL_GENERIC_EXCEPTION + + val registeredKeys = Message.getValues() + + for(message in registeredKeys) + if(Lang.has(message.key)) validCount++ + + val valid = (100.0 * validCount) / registeredKeys.size + sender.sendMessage("Translated (${Lang.currentLang()}): ${"%.1f".format(Locale.ROOT, valid)}% ($validCount/${registeredKeys.size})") + } + + private fun detailedLangDebug(sender: CommandSender) { + simpleLangDebug(sender) + + val stb = StringBuilder("Report of potential issue for language ${Lang.currentLang()}:\n") + + var hadAny = false + val keySet = mutableSetOf() + val registeredKeys = Message.getValues() + + for(message in registeredKeys) { + val key = message.key + if(!Lang.has(key)) { + stb.append("Missing key inside translation file: $key\n") + hadAny = true + } else if(hashParamIssue(message, stb)) + hadAny = true + + if(keySet.contains(key)) { + stb.append("Duplicate registered key: $key\n") + hadAny = true + } else keySet.add(key) + } + + for(key in Lang.getKeys()) { + if(!keySet.contains(key)) { + stb.append("Found unregistered key: $key\n") + hadAny = true + } + } + + if(hadAny) { + val message = TextComponent(MsgCommand.DEBUG_LANG_COPY.legacy()) + + message.clickEvent = ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, stb.toString()) + message.hoverEvent = HoverEvent( + HoverEvent.Action.SHOW_TEXT, + Text(MsgCommand.SHARED_HOVER_COPY.legacy()) + ) + + sender.spigot().sendMessage(message); + } else { + sender.sendMessage("No additional issue found") + } + } + + private fun hashParamIssue(message: Message, stb: StringBuilder): Boolean { + val section = Lang.getSection(message.key) + val texts = if(section == null) + listOf(Lang.getTranslated(message.key)) + else + section.getValues(false).map { it.value.toString() } + + val textParams = ArrayList() + + for(text in texts) { + var index = 0 + while(true) { + index = text.indexOf('%', index) + //TODO add \% to "ignore" % as param inside param finder + if(index > 0 && text[index-1] == '\\') { + index++ + continue + } + if(index++ < 0) break + + var end = text.indexOf(' ', index) + if(end == -1) end = text.length + val param = text.substring(index, end) + if(!textParams.contains(param)) textParams.add(param) + } + } + + var hadIssue = false + // Check all parameter are valid + val usedParam = mutableSetOf() + for(textParam in textParams) { + var found = false + for(param in message.params) { + if(param.isEmpty()) continue + if(textParam.startsWith(param)) { + found = true + usedParam.add(param) + break + } + } + + if(!found) { + hadIssue = true + stb.append("Did not found param %$textParam in register list for ${message.key}\n") + } + } + + for(param in message.params) { + if(usedParam.contains(param)) continue + if("unused".contentEquals(param)) continue + hadIssue = true + stb.append("Param %$param is not used for key ${message.key}\n") + } + + return hadIssue + } + override fun tabCompleter(sender: CommandSender, args: Array, list: MutableList) { if(!allowed(sender)) return list.addAll( when(args.size) { - 1 -> listOf("toggle", "get", "get-and-clear", "clear") + 1 -> listOf("toggle", "get", "get-and-clear", "clear", "lang") 2 -> when(args[0].lowercase()) { "toggle" -> listOf("default", "verbose") + "lang" -> listOf("details") else -> listOf() } diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index e12aed14..8c22d880 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -3,7 +3,6 @@ package xyz.alexcrea.cuanvil.dependency import io.delilaheve.CustomAnvil import net.kyori.adventure.text.Component import org.bukkit.Bukkit -import org.bukkit.ChatColor import org.bukkit.command.CommandSender import org.bukkit.entity.HumanEntity import org.bukkit.entity.Player @@ -32,7 +31,6 @@ import xyz.alexcrea.cuanvil.lang.MsgWarning import xyz.alexcrea.cuanvil.listener.PrepareAnvilListener.Companion.ANVIL_OUTPUT_SLOT import xyz.alexcrea.cuanvil.util.MetricsUtil.trackError import java.lang.IllegalStateException -import java.util.logging.Level @Suppress("UnstableApiUsage") object DependencyManager { @@ -166,7 +164,7 @@ object DependencyManager { trackError(e) // Finally, warn the player - MsgWarning.DEPENDENCY_GENERIC_EXCEPTION.send(target) + MsgWarning.ANVIL_GENERIC_EXCEPTION.send(target) } private fun logExceptionAndClear(view: AnvilView, e: Exception) { diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt index f164b9af..b559af19 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Lang.kt @@ -3,6 +3,7 @@ package xyz.alexcrea.cuanvil.lang import io.delilaheve.CustomAnvil import org.bukkit.configuration.ConfigurationSection import xyz.alexcrea.cuanvil.config.ConfigHolder +import java.util.stream.Stream object Lang { @@ -51,6 +52,18 @@ object Lang { return default.getSection(key) } + fun currentLang(): String { + return lang.name + } + + fun has(key: String): Boolean { + return lang.has(key) + } + + fun getKeys(): Collection { + return lang.getFilteredKeys() + } + /* * Config Options & get */ diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt index 0a008bf0..88b36b99 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Language.kt @@ -55,6 +55,45 @@ class Language(private val id: String, private val default: Boolean = false) { return conf.getConfigurationSection(key) } + fun has(key: String): Boolean { + if(conf.isString(key)) return true + + // we want at all child key as valid numbers and valid key if claimed to be multi line + val section = getSection(key) ?: return false + for(key in section.getKeys(false)) { + if(key.toUIntOrNull() == null) return false + if(!section.isString(key)) return false + } + + return true + } + + fun getFilteredKeys(): Collection { + val result = ArrayList() + + // First pass we ignore key from root + for(root in conf.getKeys(false)) { + val section = conf.getConfigurationSection(root) ?: continue + + exploreDeeper(section, root, result) + } + + return result + } + + private fun exploreDeeper(section: ConfigurationSection, root: String, result: ArrayList) { + for(key in section.getKeys(false)) { + val newRoot = "$root.$key" + if(has(key)) { + result.add(newRoot) + continue + } + + val newSection = section.getConfigurationSection(key) ?: continue + exploreDeeper(newSection, newRoot, result) + } + } + val name: String get() = conf.getString("name", id)!! } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt index 640ae297..64d9242d 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Message.kt @@ -10,10 +10,23 @@ import xyz.alexcrea.cuanvil.util.ComponentUtil.send import xyz.alexcrea.cuanvil.util.ComponentUtil.serializeLegacy import xyz.alexcrea.cuanvil.util.ComponentUtil.serializePlain import xyz.alexcrea.cuanvil.util.MiniMessageUtil +import java.util.Collections import java.util.logging.Level import kotlin.math.min -open class Message(val key: String, vararg val params: String) { +open class Message(val key: String, vararg val params: String, register: Boolean = true) { + + companion object { + private val values = ArrayList() + + fun getValues(): Collection { + return Collections.unmodifiableCollection(values) + } + } + + init { + if(register) values.add(this) + } protected fun replaceParameters(stb: StringBuilder, vararg values: Any) { // replace all placeholder thingy %key -> value diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt deleted file mode 100644 index 7823f79d..00000000 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/Msg.kt +++ /dev/null @@ -1,4 +0,0 @@ -package xyz.alexcrea.cuanvil.lang - -object Msg { -} \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt index 2eed326b..d135634e 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgCommand.kt @@ -20,6 +20,7 @@ object MsgCommand { val DEBUG_LOG_CLEARED = Message("debug.log-cleared") val DEBUG_TOGGLED = Message("debug.toggled", "type") val DEBUG_COPY = Message("debug.copy") + val DEBUG_LANG_COPY = Message("debug.copy-lang") val DEBUG_DATA_HEADER = Message("debug.data.header") val DEBUG_DATA_LINE_COUNT = Message("debug.data.line-count", "count") @@ -45,8 +46,8 @@ object MsgCommand { // Enchant val ENCHANT_DESCRIPTION = Message("enchant.description") - val ENCHANT_REMOVE = Message("enchant.remove.", "name") - val ENCHANT_SET = Message("enchant.set.", "name", "level") + val ENCHANT_REMOVE = Message("enchant.removed", "name") + val ENCHANT_SET = Message("enchant.set", "name", "level") val ENCHANT_MISSING_PARAMETER_WARNING = Message("enchant.warning.missing_parameter") val ENCHANT_NOT_FOUND_WARNING = Message("enchant.warning.not_found", "path") diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt index f0b32e26..f5d6e826 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgError.kt @@ -16,7 +16,7 @@ object MsgError { val LOAD_NON_DEFAULT_CONFIG = ErrorMessage("load.non-default-config") val RELOAD_FAIL = ErrorMessage("reload.resource.fail", "path") - val RELOAD_HARD_FAIL = ErrorMessage("reload.resource.hardfail") + val RELOAD_HARD_FAIL = ErrorMessage("reload.resource.hard-fail") /* * ---- diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt index 6036069e..1a876e6e 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgUI.kt @@ -16,44 +16,44 @@ object MsgUI { val ELEMENT_LIST_CANCELLED_NEW = Message("element-list.cancelled-new", "type") val ELEMENT_LIST_DUPLICATED_NEW = Message("element-list.duplicated-new", "type") - val UNIT_REPAIR_TITLE = Message("unit-repair.title") - val UNIT_REPAIR_ELEMENT_TITLE = Message("unit-repair.element_title") + val UNIT_REPAIR_TITLE = Message("unit-repair.title", "unused", "page", "max_page") + val UNIT_REPAIR_ELEMENT_TITLE = Message("unit-repair.element.title", "type", "page", "max_page") val UNIT_REPAIR_NEW_TITLE = Message("unit-repair.new.title") val UNIT_REPAIR_NEW_DESCRIPTION = Message("unit-repair.new.description") - val UNIT_REPAIR_NEW_ELEMENT_TITLE = Message("unit-repair.element.new.title", "name") + val UNIT_REPAIR_NEW_ELEMENT_TITLE = Message("unit-repair.element.new.title", "unused") val UNIT_REPAIR_NEW_ELEMENT_DESCRIPTION = Message("unit-repair.element.new.description", "name") val UNIT_REPAIR_NEW_ELEMENT_CANNOT_REPAIR = Message("unit-repair.element.new.cannot-damage") val UNIT_REPAIR_NEW_ELEMENT_SAME_TYPE = Message("unit-repair.element.new.same-type") - val CUSTOM_RECIPE_TITLE = Message("custom-recipe.title") + val CUSTOM_RECIPE_TITLE = Message("custom-recipe.title", "unused", "page", "max_page") val CUSTOM_RECIPE_ELEMENT_DELETE_TITLE = Message("custom-recipe.element.delete.title", "type") - val CUSTOM_RECIPE_ELEMENT_DELETE_DESCRIPTION = Message("custom-recipe.element.delete.description", "type") + val CUSTOM_RECIPE_ELEMENT_DELETE_DESCRIPTION = Message("custom-recipe.element.delete.description", "unused") - val ENCHANTMENT_LEVEL_COST_TITLE = Message("enchant-level-cost.title") + val ENCHANTMENT_LEVEL_COST_TITLE = Message("enchant-level-cost.title", "unused", "page", "max_page") - val ENCHANTMENT_LEVEL_LIMIT_TITLE = Message("enchant-level-limit.title") + val ENCHANTMENT_LEVEL_LIMIT_TITLE = Message("enchant-level-limit.title", "unused", "page", "max_page") - val ENCHANTMENT_MERGE_LIMIT_TITLE = Message("enchant-merge-limit.title") + val ENCHANTMENT_MERGE_LIMIT_TITLE = Message("enchant-merge-limit.title", "unused", "page", "max_page") - val ENCHANTMENT_CONFLICT_TITLE = Message("enchant-conflict.title") + val ENCHANTMENT_CONFLICT_TITLE = Message("enchant-conflict.title", "unused", "page", "max_page") val ENCHANTMENT_CONFLICT_ELEMENT_ENCHANTMENTS = Message("enchant-conflict.element.selected-enchantments", "group") val ENCHANTMENT_CONFLICT_ELEMENT_SUB_GROUPS = Message("enchant-conflict.element.selected-sub-groups", "group") val ENCHANTMENT_CONFLICT_ELEMENT_DELETE_TITLE = Message("enchant-conflict.element.delete.title", "type") - val ENCHANTMENT_CONFLICT_ELEMENT_DELETE_DESCRIPTION = Message("enchant-conflict.element.delete.description", "type") + val ENCHANTMENT_CONFLICT_ELEMENT_DELETE_DESCRIPTION = Message("enchant-conflict.element.delete.description", "unused") - val MATERIAL_GROUP_TITLE = Message("material-group.title") + val MATERIAL_GROUP_TITLE = Message("material-group.title", "unused", "page", "max_page") val MATERIAL_GROUP_ELEMENT_SELECTED_MATERIALS = Message("material-group.element.selected-materials", "group") val MATERIAL_GROUP_ELEMENT_SELECTED_SUB_GROUPS = Message("material-group.element.selected-sub-groups", "group") val MATERIAL_GROUP_ELEMENT_DELETE_TITLE = Message("material-group.element.delete.title", "type") - val MATERIAL_GROUP_ELEMENT_DELETE_DESCRIPTION = Message("material-group.element.delete.description", "type") + val MATERIAL_GROUP_ELEMENT_DELETE_DESCRIPTION = Message("material-group.element.delete.description", "unused") val MATERIAL_GROUP_ELEMENT_DELETE_BUTTON_NAME = Message("material-group.element.delete.button.name") val MATERIAL_GROUP_ELEMENT_DELETE_BUTTON_LORE = Message("material-group.element.delete.button.lore") - val MATERIAL_SELECT_CONFIRM_TITLE = Message("material-select.confirm.title","name") - val MATERIAL_SELECT_CONFIRM_DESCRIPTION = Message("material-select.confirm.description","name") + val MATERIAL_SELECT_CONFIRM_TITLE = Message("material-select.new.confirm.title","name") + val MATERIAL_SELECT_CONFIRM_DESCRIPTION = Message("material-select.new.confirm.description","name") } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt index 486f589d..fb9d6e64 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/lang/MsgWarning.kt @@ -15,6 +15,6 @@ object MsgWarning { val LOAD_LEGACY_SPIGOT = Message("load.legacy.spigot") val LOAD_LEGACY_SPIGOT_OLD = Message("load.legacy.spigot-old") - val DEPENDENCY_GENERIC_EXCEPTION = Message("config-ui.shared.no-permission") + val ANVIL_GENERIC_EXCEPTION = Message("anvil.generic") } \ No newline at end of file diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt index bd8014a6..261e085a 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/ComponentUtil.kt @@ -41,8 +41,8 @@ object ComponentUtil { meta.lore = this.map {obj -> obj.serializeLegacy()} } - fun ItemMeta.setMessageName(message: Message) { - this.setComponentDisplayName(message.formattedConcatenated()) + fun ItemMeta.setMessageName(message: Message, vararg params: Any) { + this.setComponentDisplayName(message.formattedConcatenated(*params)) } } \ No newline at end of file diff --git a/src/main/resources/lang/en.yml b/src/main/resources/lang/en.yml index 26d7efbc..87527ea1 100644 --- a/src/main/resources/lang/en.yml +++ b/src/main/resources/lang/en.yml @@ -14,6 +14,8 @@ warning: 1: "If replace too expensive is not working this is likely because of spigot" 2: "As native nms is not supported for spigot starting 26.1" update.available: "An update may be available: %version" + anvil: + generic: "[CustomAnvil] Error while handling the anvil." error: load: @@ -53,6 +55,7 @@ command: log-cleared: "Log Cleared" toggled: "Debug toggled to %type" copy: "Click to copy log data" + copy-lang: "Click to copy detailed lang issues" data: header: "Debug Log data:" line-count: "Found %count lines" @@ -122,14 +125,14 @@ config-ui: duplicated-new: "Please enter a %type name that do not already exist..." unit-repair: - tile: "Unit Repair Config" + title: "Unit Repair Config (%page/%max_page)" new: title: "Select unit repair item." description: 1: "Click here with an item to set the item" 2: "You like to be an unit repair item" element: - title: "%type Unit repair" + title: "%type Unit repair (%page/%max_page)" new: title: "Select item to be repaired." description: @@ -139,23 +142,23 @@ config-ui: same-type: "Item can't repair something of the same type." custom-recipe: - title: "Custom Recipe Config" + title: "Custom Recipe Config (%page/%max_page)" element: delete: title: "Delete %type?" description: "Confirm that you want to delete this recipe." enchant-level-cost: - title: "Enchantment Level Limit" + title: "Enchantment Level Limit (%page/%max_page)" enchant-level-limit: - title: "Enchantment Level Limit" + title: "Enchantment Level Limit (%page/%max_page)" enchant-merge-limit: - title: "Enchantment Maximum Merge Level" + title: "Enchantment Maximum Merge Level (%page/%max_page)" enchant-conflict: - title: "Conflict Config" + title: "Conflict Config (%page/%max_page)" element: selected-enchantments: "%group" # likely need page and max page selected-sub-groups: "%group Groups" @@ -164,7 +167,7 @@ config-ui: description: "Confirm that you want to delete this conflict." material-group: - title: "Group Config" + title: "Group Config (%page/%max_page)" element: selected-materials: "%group Materials" selected-sub-groups: "%group Groups"