Skip to content

Commit 20aa329

Browse files
committed
Fix WAILA placeholders
1 parent 1aa249f commit 20aa329

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import org.bukkit.event.player.PlayerJoinEvent
1818
import org.bukkit.event.player.PlayerLocaleChangeEvent
1919
import org.bukkit.event.player.PlayerQuitEvent
2020
import java.text.MessageFormat
21-
import java.util.*
21+
import java.util.Locale
22+
import java.util.WeakHashMap
2223

2324
class AddonTranslator(private val addon: PylonAddon) : Translator {
2425

@@ -44,7 +45,7 @@ class AddonTranslator(private val addon: PylonAddon) : Translator {
4445
val argument = component.renderer() as? PylonArgument ?: continue
4546
val replacer = TextReplacementConfig.builder()
4647
.match("%${argument.name}%")
47-
.replacement(GlobalTranslator.render(argument.value, locale))
48+
.replacement(GlobalTranslator.render(argument.value.asComponent(), locale))
4849
.build()
4950
translated = translated.replaceText(replacer)
5051
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import net.kyori.adventure.text.ComponentLike
55
import net.kyori.adventure.text.TranslationArgument
66
import net.kyori.adventure.text.VirtualComponentRenderer
77

8-
class PylonArgument private constructor(val name: String, val value: Component) : VirtualComponentRenderer<Unit> {
8+
class PylonArgument private constructor(val name: String, val value: ComponentLike) : VirtualComponentRenderer<Unit> {
99

1010
override fun apply(context: Unit): ComponentLike {
1111
return value
@@ -17,8 +17,8 @@ class PylonArgument private constructor(val name: String, val value: Component)
1717
return TranslationArgument.component(
1818
Component.virtual(
1919
Unit::class.java,
20-
PylonArgument(name, value.asComponent())
21-
)
20+
PylonArgument(name, value)
21+
).append(value) // Append the value for comparison purposes, it'll get thrown out anyway
2222
)
2323
}
2424

0 commit comments

Comments
 (0)