Fixes #4 (partially, code is still ran after Skript disables, but signature stuff is fixed)

Author: TPGamesNL

src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java

@@ -1,13 +1,25 @@
 package com.btk5h.skriptmirror;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.lang.function.Function;
-import ch.njol.skript.lang.function.FunctionEvent;
-import ch.njol.skript.lang.function.Functions;
-import ch.njol.skript.lang.function.Parameter;
+import ch.njol.skript.lang.function.*;
 import ch.njol.skript.registrations.Classes;
+import org.eclipse.jdt.annotation.Nullable;
 
 public class FunctionWrapper {
+
+  private static final Function<?> NO_OP_FUNCTION;
+
+  static {
+    NO_OP_FUNCTION = new JavaFunction<Object>("$noop", new Parameter[0], Classes.getExactClassInfo(Object.class),
+      true) {
+      @Nullable
+      @Override
+      public Object[] execute(FunctionEvent e, Object[][] params) {
+        return null;
+      }
+    };
+  }
+
   private final String name;
   private final Object[] arguments;
 
@@ -24,31 +36,14 @@ public Object[] getArguments() {
     return arguments;
   }
 
-  public Function getFunction() {
+  public Function<?> getFunction() {
     Function<?> function = Functions.getFunction(name);
     if (function == null) {
       Skript.warning(String.format("The function '%s' could not be resolved.", name));
-      return NoOpFunction.INSTANCE;
+      return NO_OP_FUNCTION;
     }
     return function;
   }
 
-  private static class NoOpFunction extends Function<Object> {
-    private static NoOpFunction INSTANCE = new NoOpFunction();
-
-    private NoOpFunction() {
-      super("$noop", new Parameter[0], Classes.getExactClassInfo(Object.class), true);
-    }
-
-    @Override
-    public Object[] execute(FunctionEvent e, Object[][] params) {
-      return null;
-    }
-
-    @Override
-    public boolean resetReturnValue() {
-      return false;
-    }
-  }
 }