Experimental | Fix Build

TheFloodDragon · Jul 15, 2024 · d6cd747 · d6cd747
1 parent 7e57572
commit d6cd747
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...src/main/kotlin/cn/fd/ratziel/module/item/impl/feature/action/triggers/InteractTrigger.kt b/...src/main/kotlin/cn/fd/ratziel/module/item/impl/feature/action/triggers/InteractTrigger.kt
@@ -2,7 +2,7 @@ package cn.fd.ratziel.module.item.impl.feature.action.triggers
 
 import cn.fd.ratziel.module.item.api.feature.ItemTrigger
 import cn.fd.ratziel.module.item.impl.feature.action.ActionManager
-import cn.fd.ratziel.script.SimpleScriptEnv
+import cn.fd.ratziel.script.impl.SimpleScriptEnvironment
 import org.bukkit.event.block.Action.*
 import org.bukkit.event.player.PlayerInteractEvent
 import taboolib.common.platform.event.SubscribeEvent
@@ -25,7 +25,7 @@ object InteractTrigger {
         val item = event.item ?: return
         val neoItem = AttackTrigger.asNeo(item) ?: return
         // 环境
-        val env = SimpleScriptEnv().apply {
+        val env = SimpleScriptEnvironment().apply {
             set("event", event)
             set("item", item)
             set("neoItem", neoItem)

diff --git a/project/module-script/src/main/java/cn/fd/ratziel/script/api/ScriptContent.java b/project/module-script/src/main/java/cn/fd/ratziel/script/api/ScriptContent.java
@@ -1,5 +1,7 @@
 package cn.fd.ratziel.script.api;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * ScriptContent
  *
@@ -11,6 +13,7 @@ public interface ScriptContent {
     /**
      * 获取脚本原始内容
      */
+    @NotNull
     String getContent();
 
 }
diff --git a/project/runtime-bukkit/src/main/kotlin/cn/fd/ratziel/bukkit/element/action/ActionElement.kt b/project/runtime-bukkit/src/main/kotlin/cn/fd/ratziel/bukkit/element/action/ActionElement.kt
@@ -5,9 +5,9 @@ import cn.fd.ratziel.common.element.registry.NewElement
 import cn.fd.ratziel.core.element.Element
 import cn.fd.ratziel.core.element.api.ElementHandler
 import cn.fd.ratziel.core.serialization.toBasic
-import cn.fd.ratziel.script.KetherLang
 import cn.fd.ratziel.script.ScriptBlockBuilder
-import cn.fd.ratziel.script.SimpleScriptEnv
+import cn.fd.ratziel.script.ScriptTypes
+import cn.fd.ratziel.script.impl.SimpleScriptEnvironment
 import taboolib.common.LifeCycle
 
 /**
@@ -27,7 +27,7 @@ object ActionElement : ElementHandler {
         element.property.let { json ->
             val block = ScriptBlockBuilder.build(json.toBasic())
             println(block)
-            val result = block.evaluate(KetherLang, SimpleScriptEnv())
+            val result = block.evaluate(ScriptTypes.KETHER.executor, SimpleScriptEnvironment())
             println(result)
         }
     }