reintroduce fallback var so i dont have to !! component.fallback(), allow lore to fallback to empty string

Author: ihateblueb

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/i18n/AddonTranslator.kt

@@ -38,8 +38,9 @@ class AddonTranslator(private val addon: PylonAddon) : Translator {
     override fun translate(key: String, locale: Locale): MessageFormat? = null
 
     override fun translate(component: TranslatableComponent, locale: Locale): Component? {
-        var translated = getTranslation(component, locale) 
-            ?: component.fallback()?.let { getTranslation(it, locale) ?: Component.text(fallback) }
+        val fallback = component.fallback()
+        var translated = getTranslation(component, locale)
+            ?: fallback?.let { getTranslation(it, locale) ?: Component.text(fallback) } ?: return null
         for (arg in component.arguments()) {
             val component = arg.asComponent()
             if (component !is VirtualComponent) continue

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/item/PylonItem.kt

@@ -45,44 +45,35 @@ open class PylonItem(val stack: ItemStack) : Keyed {
 
     companion object {
 
-        private val nameAndLoreWarningsSupressed: MutableSet<NamespacedKey> = mutableSetOf()
+        private val nameWarningsSupressed: MutableSet<NamespacedKey> = mutableSetOf()
 
-        private fun checkNameAndLore(schema: PylonItemSchema) {
+        private fun checkName(schema: PylonItemSchema) {
             val translator = AddonTranslator.translators[schema.addon]
             check(translator != null) {
                 "Addon does not have a translator; did you forget to call registerWithPylon()?"
             }
 
             // Adventure is a perfect API with absolutely no problems whatsoever.
             val name = schema.itemStack.getData(DataComponentTypes.ITEM_NAME) as? TranslatableComponent
-            val lore = schema.itemStack.getData(DataComponentTypes.LORE)?.lines()?.get(0) as? TranslatableComponent
 
-            var isNameAndLoreValid = true
+            var isNameValid = true
             if (name == null || name.key() != ItemStackBuilder.nameKey(schema.key)) {
                 PylonCore.logger.warning("Item ${schema.key}'s name is not a translation key; check your item uses ItemStackBuilder.pylonItem(...)")
-                isNameAndLoreValid = false
+                isNameValid = false
             }
 
-            if (lore == null || lore.key() != ItemStackBuilder.loreKey(schema.key)) {
-                PylonCore.logger.warning("Item ${schema.key}'s lore is not a translation key; check your item uses ItemStackBuilder.pylonItem(...)")
-                isNameAndLoreValid = false
-            }
-
-            if (isNameAndLoreValid) {
+            if (isNameValid) {
                 for (locale in schema.addon.languages) {
                     if (!translator.translationKeyExists(name!!.key(), locale)) {
                         PylonCore.logger.warning("${schema.key.namespace} is missing a name translation key for item ${schema.key} (locale: ${locale.displayName} | expected translation key: ${ItemStackBuilder.nameKey(schema.key)}")
                     }
-                    if (!translator.translationKeyExists(lore!!.key(), locale)) {
-                        PylonCore.logger.warning("${schema.key.namespace} is missing a lore translation key for item ${schema.key} (locale: ${locale.displayName} | expected translation key: ${ItemStackBuilder.loreKey(schema.key)}")
-                    }
                 }
             }
         }
 
         private fun register(schema: PylonItemSchema) {
-            if (schema.key !in nameAndLoreWarningsSupressed) {
-                checkNameAndLore(schema)
+            if (schema.key !in nameWarningsSupressed) {
+                checkName(schema)
             }
             PylonRegistry.ITEMS.register(schema)
         }
@@ -116,8 +107,8 @@ open class PylonItem(val stack: ItemStack) : Keyed {
         }
 
         @JvmStatic
-        fun supressNameAndLoreWarnings(key: NamespacedKey) {
-            nameAndLoreWarningsSupressed.add(key)
+        fun supressNameWarnings(key: NamespacedKey) {
+            nameWarningsSupressed.add(key)
         }
     }
 }

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/item/builder/ItemStackBuilder.kt

@@ -75,7 +75,7 @@ open class ItemStackBuilder private constructor(private val stack: ItemStack) :
     fun lore(vararg lore: String) = lore(*lore.map(::fromMiniMessage).toTypedArray())
 
     fun defaultTranslatableLore(key: NamespacedKey) =
-        lore(Component.translatable(loreKey(key)))
+        lore(Component.translatable(loreKey(key), ""))
 
     fun build(): ItemStack = stack.clone()