updated to Skript 2.9 and plugin version to 1.2

gradle.properties

@@ -1,13 +1,13 @@
 # Group and version
 group = me.pesekjak.hippo
-version = 1.1.1
+version = 1.2
 
 # Dependency versions
 jetbrainsKotlinGradle = 1.9.23
 jetbrainsAnnotations = 24.1.0
 junit = 5.10.1
 spigotApi = 1.20.4-R0.1-SNAPSHOT
-skript = 2.9.0-pre1
+skript = 2.9.0
 asm = 9.7
 
 # Plugins

plugin/src/main/java/me/pesekjak/hippo/bukkit/MethodCallEvent.java

@@ -12,10 +12,26 @@ public class MethodCallEvent extends InstanceEvent {
 
     private static final HandlerList HANDLERS = new HandlerList();
 
+    private @Nullable Object returned;
+
     public MethodCallEvent(AbstractClass source, @Nullable Object instance) {
         super(source, instance);
     }
 
+    /**
+     * @return returned object
+     */
+    public @Nullable Object getReturned() {
+        return returned;
+    }
+
+    /**
+     * @param returned new returned object
+     */
+    public void setReturned(@Nullable Object returned) {
+        this.returned = returned;
+    }
+
     @Override
     public @NotNull HandlerList getHandlers() {
         return HANDLERS;

plugin/src/main/java/me/pesekjak/hippo/core/skript/MethodWrapper.java

@@ -7,7 +7,6 @@
 import org.objectweb.asm.Type;
 
 import java.util.List;
-import java.util.function.Supplier;
 
 import static org.objectweb.asm.Opcodes.*;
 
@@ -19,14 +18,10 @@
  * @param method wrapped method
  * @param arguments named parameters of the method
  * @param trigger trigger of the method
- * @param returnSupplier supplier of returned values
  */
 // Named parameters are used because Method object does not store info about parameters names, and
 // they are later used to set variables for the method code execution.
-public record MethodWrapper(Method method,
-                            List<NamedParameter> arguments,
-                            @Nullable Trigger trigger,
-                            @Nullable Supplier<?> returnSupplier) implements ClassContentSkriptWrapper {
+public record MethodWrapper(Method method, List<NamedParameter> arguments, @Nullable Trigger trigger) implements ClassContentSkriptWrapper {
 
     @Override
     public ClassContent content() {

plugin/src/main/java/me/pesekjak/hippo/core/skript/Storage.java

@@ -277,9 +277,7 @@ public Table<String, String, ClassContentSkriptWrapper> getTable() {
         if (event.getThrowable() != null)
             ExceptionThrower.throwException(event.getThrowable());
 
-        if (methodWrapper.returnSupplier() == null) return null; // abstract method
-
-        return methodWrapper.returnSupplier().get();
+        return event.getReturned();
     }
 
     /**

plugin/src/main/java/me/pesekjak/hippo/elements/effects/EffMethod.java

@@ -102,7 +102,7 @@ public boolean init(Expression<?> @NotNull [] expressions,
                 throw new IllegalModifiersException("Method effects need to be abstract");
 
             source.addMethod(method);
-            methodWrapper = new MethodWrapper(method, List.of(namedParameters), null, null);
+            methodWrapper = new MethodWrapper(method, List.of(namedParameters), null);
 
             storage.getTable().put(method.getName(), method.getDescriptor(), methodWrapper);
 

plugin/src/main/java/me/pesekjak/hippo/elements/sections/SecMethod.java

@@ -41,11 +41,6 @@ public class SecMethod extends Section implements ReturnHandler<Object> {
     private Type returnType;
     private MethodWrapper methodWrapper;
 
-    // TODO
-    //  this is temporary solution until Skript introduces
-    //  different API for providing return values
-    private final ThreadLocal<Object> returnedObject = new ThreadLocal<>();
-
     static {
         Skript.registerSection(
                 SecMethod.class,
@@ -105,11 +100,7 @@ public boolean init(Expression<?> @NotNull [] expressions,
             Trigger trigger = loadReturnableSectionCode(sectionNode, "method", new Class[] {MethodCallEvent.class});
 
             source.addMethod(method);
-            methodWrapper = new MethodWrapper(method, List.of(namedParameters), trigger, () -> {
-                Object returned = getReturnValue();
-                resetReturnValue();
-                return returned;
-            });
+            methodWrapper = new MethodWrapper(method, List.of(namedParameters), trigger);
 
             storage.getTable().put(method.getName(), method.getDescriptor(), methodWrapper);
 
@@ -141,9 +132,9 @@ public Type getReturnType() {
     }
 
     @Override
-    public void returnValues(Object @Nullable [] values) {
-        Object value = values != null && values.length > 0 ? values[0] : null;
-        returnedObject.set(value);
+    public void returnValues(@NotNull Event event, @NotNull Expression<?> expression) {
+        if (!(event instanceof MethodCallEvent methodCall)) return;
+        methodCall.setReturned(expression.getSingle(event));
     }
 
     @Override
@@ -156,12 +147,4 @@ public boolean isSingleReturnValue() {
         return Object.class;
     }
 
-    public @Nullable Object getReturnValue() {
-        return returnedObject.get();
-    }
-
-    public void resetReturnValue() {
-        returnedObject.remove();
-    }
-
 }

plugin/src/main/resources/lang/english.lang

@@ -1,4 +1,4 @@
-version: 1.1.1
+version: 1.2
 types:
   modifier: modifier¦s @a
   annotation: annotation¦s @an