Merge branch 'refs/heads/dev/master'

fzzyhmstrs · Oct 14, 2024 · f294890 · f294890
2 parents c90ecb2 + 1be8a8f
commit f294890
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,7 +2,7 @@
 * None.
 
 ### Changes
-* None.
+* Config settings with names that don't fit into the row (truncated with ellipses) will now have the full name appear in the tooltip
 
 ### Fixes
 * Translatable things now properly have their translations respected if they are wrapped with automatic validation.
diff --git a/src/main/kotlin/me/fzzyhmstrs/fzzy_config/screen/entry/BaseConfigEntry.kt b/src/main/kotlin/me/fzzyhmstrs/fzzy_config/screen/entry/BaseConfigEntry.kt
@@ -127,6 +127,11 @@ internal open class BaseConfigEntry(
 
     private fun createTooltip(): List<OrderedText> {
         val list: MutableList<OrderedText> = mutableListOf()
+        if (truncatedName != name) {
+            list.addAll(MinecraftClient.getInstance().textRenderer.wrapLines(name, 190))
+            if (description.string != "")
+                list.add(FcText.empty().asOrderedText())
+        }
         if (description.string != "") {
             list.addAll(MinecraftClient.getInstance().textRenderer.wrapLines(description, 190))
         }
@@ -135,6 +140,10 @@ internal open class BaseConfigEntry(
 
     private fun createFullTooltip(): List<OrderedText> {
         val list: MutableList<OrderedText> = mutableListOf()
+        if (truncatedName != name) {
+            list.addAll(MinecraftClient.getInstance().textRenderer.wrapLines(name, 190))
+            list.add(FcText.empty().asOrderedText())
+        }
         if (description.string != "") {
             list.addAll(MinecraftClient.getInstance().textRenderer.wrapLines(description, 190))
         }

diff --git a/src/main/kotlin/me/fzzyhmstrs/fzzy_config/validation/misc/ValidatedAny.kt b/src/main/kotlin/me/fzzyhmstrs/fzzy_config/validation/misc/ValidatedAny.kt
@@ -209,19 +209,19 @@ open class ValidatedAny<T: Any>(defaultValue: T): ValidatedField<T>(defaultValue
     }
 
     override fun translationKey(): String {
-        return (storedValue as? Translatable)?.hasTranslation()?.let { (storedValue as? Translatable)?.translationKey() } ?: super.translationKey()
+        return (storedValue as? Translatable)?.translationKey()?.takeIf { (storedValue as? Translatable)?.hasTranslation() == true } ?: super.translationKey()
     }
 
     override fun descriptionKey(): String {
-        return (storedValue as? Translatable)?.hasDescription()?.let { (storedValue as? Translatable)?.descriptionKey() } ?: super.descriptionKey()
+        return (storedValue as? Translatable)?.descriptionKey()?.takeIf { (storedValue as? Translatable)?.hasDescription() == true } ?: super.descriptionKey()
     }
 
     override fun translation(fallback: String?): MutableText {
-        return  (storedValue as? Translatable)?.hasTranslation()?.let { (storedValue as? Translatable)?.translation(fallback) } ?: super.translation(fallback)
+        return  (storedValue as? Translatable)?.translation(fallback)?.takeIf { (storedValue as? Translatable)?.hasTranslation() == true } ?: super.translation(fallback)
     }
 
     override fun description(fallback: String?): MutableText {
-        return (storedValue as? Translatable)?.hasDescription()?.let { (storedValue as? Translatable)?.description(fallback) } ?: super.description(fallback)
+        return (storedValue as? Translatable)?.description(fallback)?.takeIf { (storedValue as? Translatable)?.hasDescription() == true } ?: super.description(fallback)
     }
 
     override fun hasTranslation(): Boolean {

diff --git a/src/testmod/resources/assets/fzzy_config_test/lang/en_us.json b/src/testmod/resources/assets/fzzy_config_test/lang/en_us.json
@@ -22,6 +22,7 @@
   "fzzy_config_test.test_config.EPSILON" : "Epsilon",
   "fzzy_config_test.test_config.EPSILON.desc" : "The fifth choice",
   "fzzy_config_test.test_config.list1" : "Very Wow Long List Name For Testing",
+  "fzzy_config_test.test_config.list1.desc" : "such description. much tip.",
 
   "fzzy_config_test.test_config2.int1" : "Test integer",
   "fzzy_config_test.test_config2.int1.desc" : "Integers have cool descriptions",