Update more code for 2.7, change deprecated code usages

Author: TPGamesNL

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

@@ -1,8 +1,13 @@
 package com.btk5h.skriptmirror;
 
+import ch.njol.skript.config.Config;
 import ch.njol.skript.lang.function.Function;
 import ch.njol.skript.lang.function.Functions;
+import ch.njol.skript.lang.parser.ParserInstance;
+import com.btk5h.skriptmirror.util.SkriptReflection;
+import com.btk5h.skriptmirror.util.SkriptUtil;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 public class FunctionWrapper {
 
@@ -24,7 +29,14 @@ public Object[] getArguments() {
 
   @Nullable
   public Function<?> getFunction() {
-    return Functions.getFunction(name);
+    // Get current script file name
+    String script = null;
+    ParserInstance parserInstance = ParserInstance.get();
+    if (parserInstance.isActive()) {
+      script = parserInstance.getCurrentScript().getConfig().getFileName();
+    }
+
+    return Functions.getFunction(name, script);
   }
 
 }

src/main/java/com/btk5h/skriptmirror/skript/ExprArrayAccess.java

@@ -6,14 +6,14 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.iterator.ArrayIterator;
 import com.btk5h.skriptmirror.ObjectWrapper;
 import com.btk5h.skriptmirror.util.JavaUtil;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.lang.reflect.Array;
 import java.util.Iterator;

src/main/java/com/btk5h/skriptmirror/skript/ExprSpread.java

@@ -6,7 +6,6 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
@@ -15,6 +14,7 @@
 import com.btk5h.skriptmirror.util.JavaUtil;
 import com.btk5h.skriptmirror.util.SkriptUtil;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -82,7 +82,7 @@ public T[] getAll(Event e) {
 
     obj = JavaUtil.boxPrimitiveArray(obj);
 
-    return Converters.convertArray((Object[]) obj, types, superType);
+    return Converters.convert((Object[]) obj, types, superType);
   }
 
   private Object[] toArray(Iterator<?> iter) {

src/main/java/com/btk5h/skriptmirror/skript/Types.java

@@ -5,7 +5,6 @@
 import ch.njol.skript.classes.Serializer;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.yggdrasil.Fields;
 import com.btk5h.skriptmirror.JavaType;
 import com.btk5h.skriptmirror.LibraryLoader;
@@ -16,6 +15,7 @@
 import com.btk5h.skriptmirror.util.JavaUtil;
 import com.btk5h.skriptmirror.util.SkriptUtil;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.io.File;
 import java.io.NotSerializableException;

src/main/java/com/btk5h/skriptmirror/skript/custom/CustomSyntaxSection.java

@@ -219,7 +219,7 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
 
     if (isPreload)
       preloadLogHandler = SkriptLogger.startRetainingLog();
-    getParser().setCurrentSkriptEvent(this);
+    getParser().setCurrentStructure(this);
     preloadSuccess = init(args, matchedPattern, parseResult, node, isPreload);
     if (isPreload) {
       preloadLogHandler.stop();

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java

@@ -7,7 +7,6 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.log.ErrorQuality;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
@@ -20,6 +19,7 @@
 import com.btk5h.skriptmirror.util.JavaUtil;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.Iterator;
 
@@ -105,7 +105,7 @@ public T[] getAll(Event e) {
       return JavaUtil.newArray(superType, 0);
     }
 
-    return Converters.convertArray(expr.getAll(e), types, superType);
+    return Converters.convert(expr.getAll(e), types, superType);
   }
 
   @Nullable

src/main/java/com/btk5h/skriptmirror/skript/custom/expression/EffReturn.java

@@ -3,7 +3,6 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.TriggerSection;
@@ -17,6 +16,7 @@
 import com.btk5h.skriptmirror.skript.reflect.sections.SectionEvent;
 import com.btk5h.skriptmirror.util.SkriptUtil;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.structure.Structure;
 
 public class EffReturn extends Effect {
 
@@ -51,7 +51,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
       }
     }
 
-    SkriptEvent skriptEvent = getParser().getCurrentSkriptEvent();
+    Structure skriptEvent = getParser().getCurrentStructure();
     if (expr != null && skriptEvent instanceof CustomExpressionSection) {
       CustomExpressionSection customExpressionSection = (CustomExpressionSection) skriptEvent;
       ExpressionSyntaxInfo which = customExpressionSection.getFirstWhich();

src/main/java/com/btk5h/skriptmirror/skript/custom/expression/ExprChangeValue.java

@@ -7,13 +7,13 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.log.ErrorQuality;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.iterator.ArrayIterator;
 import com.btk5h.skriptmirror.util.JavaUtil;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.Iterator;
 
@@ -69,7 +69,7 @@ public T[] getAll(Event e) {
     if (delta == null) {
       return JavaUtil.newArray(superType, 0);
     }
-    return Converters.convertArray(delta, types, superType);
+    return Converters.convert(delta, types, superType);
   }
 
   @Override

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java

@@ -8,7 +8,6 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.registrations.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
@@ -28,6 +27,7 @@
 import com.btk5h.skriptmirror.util.lookup.LookupGetter;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.io.File;
 import java.io.PrintWriter;