feat: added Skript 2.10.0 support (currently not tested)

byPixelTV · Jan 26, 2025 · d0360f6 · d0360f6
1 parent 1ff71e1
commit d0360f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 29 deletions.
diff --git a/src/main/kotlin/de/bypixeltv/skredis/skript/elements/events/EvtRedis.kt b/src/main/kotlin/de/bypixeltv/skredis/skript/elements/events/EvtRedis.kt
@@ -5,37 +5,19 @@ import ch.njol.skript.lang.Literal
 import ch.njol.skript.lang.SkriptEvent
 import ch.njol.skript.lang.SkriptParser
 import ch.njol.skript.registrations.EventValues
-import ch.njol.skript.util.Getter
 import de.bypixeltv.skredis.events.RedisMessageEvent
 import org.bukkit.event.Event
-import java.util.Date
+import java.util.*
 
 class EvtRedis : SkriptEvent() {
 
-    companion object{
+    companion object {
         init {
             Skript.registerEvent("redis message", EvtRedis::class.java, RedisMessageEvent::class.java, "redis message")
 
-            EventValues.registerEventValue(RedisMessageEvent::class.java, String::class.java, object :
-                Getter<String, RedisMessageEvent>() {
-                override fun get(e: RedisMessageEvent): String {
-                    return e.channelName
-                }
-            }, 0)
-
-            EventValues.registerEventValue(RedisMessageEvent::class.java, String::class.java, object :
-                Getter<String, RedisMessageEvent>() {
-                override fun get(e: RedisMessageEvent): String {
-                    return e.message
-                }
-            }, 0)
-
-            EventValues.registerEventValue(RedisMessageEvent::class.java, Date::class.java, object :
-                Getter<Date, RedisMessageEvent>() {
-                override fun get(e: RedisMessageEvent): Date {
-                    return Date(e.date)
-                }
-            }, 0)
+            EventValues.registerEventValue(RedisMessageEvent::class.java, String::class.java, { event -> event.channelName }, 0)
+            EventValues.registerEventValue(RedisMessageEvent::class.java, String::class.java, { event -> event.message }, 0)
+            EventValues.registerEventValue(RedisMessageEvent::class.java, Date::class.java, { event -> Date(event.date) }, 0)
         }
     }
 

diff --git a/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprChannel.kt b/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprChannel.kt
@@ -1,6 +1,5 @@
 package de.bypixeltv.skredis.skript.elements.expressions
 
-import ch.njol.skript.ScriptLoader
 import ch.njol.skript.Skript
 import ch.njol.skript.lang.Expression
 import ch.njol.skript.lang.ExpressionType
@@ -33,7 +32,7 @@ class ExprChannel : SimpleExpression<String>() {
         isDelayed: Kleenean?,
         parseResult: SkriptParser.ParseResult?
     ): Boolean {
-        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent::class.java)) {
+        if (!parser.isCurrentEvent(RedisMessageEvent::class.java)) {
             Skript.error("Cannot use 'redis channel' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR)
             return false
         }

diff --git a/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprMessage.kt b/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprMessage.kt
@@ -1,6 +1,5 @@
 package de.bypixeltv.skredis.skript.elements.expressions
 
-import ch.njol.skript.ScriptLoader
 import ch.njol.skript.Skript
 import ch.njol.skript.lang.Expression
 import ch.njol.skript.lang.ExpressionType
@@ -33,7 +32,7 @@ class ExprMessage : SimpleExpression<String>() {
         isDelayed: Kleenean?,
         parseResult: SkriptParser.ParseResult?
     ): Boolean {
-        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent::class.java)) {
+        if (!parser.isCurrentEvent(RedisMessageEvent::class.java)) {
             Skript.error("Cannot use 'redis message' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR)
             return false
         }

diff --git a/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprMessageDate.kt b/src/main/kotlin/de/bypixeltv/skredis/skript/elements/expressions/ExprMessageDate.kt
@@ -1,6 +1,5 @@
 package de.bypixeltv.skredis.skript.elements.expressions
 
-import ch.njol.skript.ScriptLoader
 import ch.njol.skript.Skript
 import ch.njol.skript.lang.Expression
 import ch.njol.skript.lang.ExpressionType
@@ -34,7 +33,7 @@ class ExprMessageDate : SimpleExpression<String>() {
         isDelayed: Kleenean?,
         parseResult: SkriptParser.ParseResult?
     ): Boolean {
-        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent::class.java)) {
+        if (!parser.isCurrentEvent(RedisMessageEvent::class.java)) {
             Skript.error("Cannot use 'redis message date' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR)
             return false
         }