Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Added placeholder injections to strings

Browse Source
This commit is contained in:
Auxilor
2022-05-18 16:02:36 +01:00
parent cf152215d3
commit bb1da29704
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
View File

@@ -3,6 +3,7 @@ package com.willfp.eco.internal.config
import com.willfp.eco.core.config.ConfigType import com.willfp.eco.core.config.ConfigType
import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.core.placeholder.InjectablePlaceholder import com.willfp.eco.core.placeholder.InjectablePlaceholder
import com.willfp.eco.core.placeholder.StaticPlaceholder
import com.willfp.eco.util.StringUtils import com.willfp.eco.util.StringUtils
import org.bukkit.configuration.file.YamlConfiguration import org.bukkit.configuration.file.YamlConfiguration
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
@@ -137,7 +138,12 @@ open class EcoConfig(
format: Boolean, format: Boolean,
option: StringUtils.FormatOption option: StringUtils.FormatOption
): String? { ): String? {
val string = get(path)?.toString() ?: return null var string = get(path)?.toString() ?: return null
for (injection in placeholderInjections) {
if (injection is StaticPlaceholder) {
string = string.replace("%${injection.identifier}%", injection.value)
}
}
return if (format) StringUtils.format(string, option) else string return if (format) StringUtils.format(string, option) else string
} }
@@ -146,7 +152,18 @@ open class EcoConfig(
format: Boolean, format: Boolean,
option: StringUtils.FormatOption option: StringUtils.FormatOption
): List<String>? { ): List<String>? {
val strings = (get(path) as? Iterable<*>)?.map { it.toString() } ?: return null val strings = (get(path) as? Iterable<*>)?.map { it.toString() }?.toMutableList() ?: return null
if (placeholderInjections.isNotEmpty()) {
strings.replaceAll {
var string = it
for (injection in placeholderInjections) {
if (injection is StaticPlaceholder) {
string = string.replace("%${injection.identifier}%", injection.value)
}
}
string
}
}
return if (format) StringUtils.formatList(strings, option) else strings return if (format) StringUtils.formatList(strings, option) else strings
} }