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

Added random function for math taking min and max arguments

Browse Source
This commit is contained in:
often
2024-01-27 14:30:59 +03:00
parent 7defdcc1ff
commit 6b46ea7e67
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/ExpressionHandlers.kt
View File

@@ -5,6 +5,7 @@ import com.github.benmanes.caffeine.cache.Caffeine
import com.willfp.eco.core.integrations.placeholder.PlaceholderManager
import com.willfp.eco.core.placeholder.context.PlaceholderContext
import com.willfp.eco.internal.placeholder.PlaceholderParser
import com.willfp.eco.util.randDouble
import redempt.crunch.CompiledExpression
import redempt.crunch.Crunch
import redempt.crunch.functional.EvaluationEnvironment
@@ -22,6 +23,10 @@ private val max = Function("max", 2) {
max(it[0], it[1])
}
private val rand = Function("random", 2) {
randDouble(it[0], it[1])
}
interface ExpressionHandler {
fun evaluate(expression: String, context: PlaceholderContext): Double?
}
@@ -77,7 +82,7 @@ class ImmediatePlaceholderTranslationExpressionHandler(
.build()
private val env = EvaluationEnvironment().apply {
addFunctions(min, max)
addFunctions(min, max, rand)
}
override fun evaluate(expression: String, context: PlaceholderContext): Double? {
@@ -106,7 +111,7 @@ class LazyPlaceholderTranslationExpressionHandler(
val compiled = cache.getOrPut(expression) {
val env = EvaluationEnvironment()
env.setVariableNames(*placeholders.toTypedArray())
env.addFunctions(min, max)
env.addFunctions(rand, min, max)
runCatching { Crunch.compileExpression(expression, env) }.getOrNull()
}