Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-19 15:09:18 +00:00
Code Issues Releases Activity

fix preprocessors not applying reliably

Browse Source
This commit is contained in:
Julian Krings
2025-10-04 13:39:33 +02:00
parent e1ec6b7827
commit 703e61dd54
7 changed files with 610 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1162
core/src/main/java/com/volmit/iris/engine/IrisEngine.java
View File

File diff suppressed because it is too large Load Diff

2
core/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java
View File

@@ -166,6 +166,8 @@ public class BukkitChunkGenerator extends ChunkGenerator implements PlatformChun
return targetCache.aquire(() -> {
IrisData data = IrisData.get(dataLocation);
data.dump();
data.clearLists();
IrisDimension dimension = data.getDimensionLoader().load(dimensionKey);
if (dimension == null) {

2
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/EngineScript.kt
View File

@@ -14,9 +14,9 @@ abstract class EngineScript
object EngineScriptDefinition : ScriptCompilationConfiguration(listOf(DataScriptDefinition), {
providedProperties(
"engine" to Engine::class,
"complex" to IrisComplex::class,
"seed" to Long::class,
"dimension" to IrisDimension::class,
"complex" to IrisComplex::class,
"biome" to BiomeLookup::class,
)
}) {

11
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/base/PreprocessorScript.kt
View File

@@ -1,6 +1,8 @@
package com.volmit.iris.core.scripting.kotlin.base
import com.volmit.iris.core.loader.IrisRegistrant
import com.volmit.iris.engine.framework.Engine
import com.volmit.iris.engine.`object`.IrisDimension
import kotlin.script.experimental.annotations.KotlinScript
import kotlin.script.experimental.api.ScriptCompilationConfiguration
import kotlin.script.experimental.api.providedProperties
@@ -8,8 +10,13 @@ import kotlin.script.experimental.api.providedProperties
@KotlinScript(fileExtension = "proc.kts", compilationConfiguration = PreprocessorScriptDefinition::class)
abstract class PreprocessorScript
object PreprocessorScriptDefinition : ScriptCompilationConfiguration(listOf(EngineScriptDefinition), {
providedProperties("object" to IrisRegistrant::class)
object PreprocessorScriptDefinition : ScriptCompilationConfiguration(listOf(DataScriptDefinition), {
providedProperties(
"engine" to Engine::class,
"seed" to Long::class,
"dimension" to IrisDimension::class,
"object" to IrisRegistrant::class
)
}) {
private fun readResolve(): Any = PreprocessorScriptDefinition
}

12
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisExecutionEnvironment.kt
View File

@@ -33,18 +33,24 @@ data class IrisExecutionEnvironment(
execute(script, PostMobSpawningScript::class.java, engine.parameters("location" to location, "entity" to mob))
override fun preprocessObject(script: String, `object`: IrisRegistrant) =
execute(script, PreprocessorScript::class.java, engine.parameters("object" to `object`))
execute(script, PreprocessorScript::class.java, engine.limitedParameters("object" to `object`))
override fun updateChunk(script: String, mantleChunk: MantleChunk, chunk: Chunk, executor: UpdateExecutor) =
execute(script, ChunkUpdateScript::class.java, engine.parameters("mantleChunk" to mantleChunk, "chunk" to chunk, "executor" to executor))
private fun Engine.parameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
private fun Engine.limitedParameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
return mapOf(
"data" to data,
"engine" to this,
"complex" to complex,
"seed" to seedManager.seed,
"dimension" to dimension,
*values,
)
}
private fun Engine.parameters(vararg values: Pair<String, Any?>): Map<String, Any?> {
return limitedParameters(
"complex" to complex,
"biome" to BiomeLookup(::getSurfaceBiome),
*values,
)

4
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/environment/IrisSimpleExecutionEnvironment.kt
View File

@@ -7,7 +7,7 @@ import com.volmit.iris.core.scripting.kotlin.base.*
import com.volmit.iris.core.scripting.kotlin.runner.Script
import com.volmit.iris.core.scripting.kotlin.runner.ScriptRunner
import com.volmit.iris.core.scripting.kotlin.runner.classpath
import com.volmit.iris.core.scripting.kotlin.runner.valueOrNull
import com.volmit.iris.core.scripting.kotlin.runner.value
import com.volmit.iris.core.scripting.kotlin.runner.valueOrThrow
import com.volmit.iris.util.collection.KMap
import com.volmit.iris.util.data.KCache
@@ -68,7 +68,7 @@ open class IrisSimpleExecutionEnvironment(
return compile(name, type)
.evaluate(properties)
.valueOrThrow("Failed to evaluate script")
.valueOrNull()
.value()
} catch (e: Throwable) {
e.printStackTrace()
}

5
core/src/main/kotlin/com/volmit/iris/core/scripting/kotlin/runner/Utils.kt
View File

@@ -21,10 +21,11 @@ internal fun <T, R> ResultWithDiagnostics<T>.map(transformer: (T) -> R): ResultW
is ResultWithDiagnostics.Failure -> this
}
internal fun EvaluationResult.valueOrNull() = returnValue.valueOrNull()
internal fun ResultValue.valueOrNull(): Any? =
internal fun EvaluationResult.value() = returnValue.value()
internal fun ResultValue.value(): Any? =
when (this) {
is ResultValue.Value -> value
is ResultValue.Error -> throw error
else -> null
}