Fix computed options

Author: TPGamesNL

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

@@ -9,8 +9,10 @@
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.structures.StructOptions;
 import ch.njol.util.StringUtils;
 import com.btk5h.skriptmirror.skript.custom.CustomSyntaxSection;
+import com.btk5h.skriptmirror.util.SkriptReflection;
 import com.btk5h.skriptmirror.util.SkriptUtil;
 
 import java.util.List;
@@ -88,7 +90,12 @@ protected boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.Parse
   private static void computeOption(String option, Trigger getter) {
     ConstantGetEvent constantEvent = new ConstantGetEvent(0, null);
     getter.execute(constantEvent);
-    ParserInstance.get().getCurrentOptions().put(option, StringUtils.join(constantEvent.getOutput()));
+    // Get result as a string
+    String result = StringUtils.join(constantEvent.getOutput());
+
+    // Get options of current script, and add it to that
+    SkriptReflection.getOptions(ParserInstance.get().getCurrentScript())
+        .put(option, result);
   }
 
 }

src/main/java/com/btk5h/skriptmirror/util/SkriptReflection.java

@@ -12,10 +12,12 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SyntaxElementInfo;
 import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.structures.StructOptions;
 import ch.njol.skript.variables.Variables;
 import com.btk5h.skriptmirror.SkriptMirror;
 import com.btk5h.skriptmirror.skript.custom.event.ExprReplacedEventValue;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.lang.script.Script;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -36,6 +38,7 @@ public class SkriptReflection {
   private static Field PARSED_VALUE;
   private static Method PARSE_I;
   private static Field EXPRESSIONS;
+  private static Field OPTIONS;
 
   static {
     Field _FIELD;
@@ -114,6 +117,14 @@ public class SkriptReflection {
       warning("Skript's expressions field could not be resolved, " +
           "therefore you might get syntax conflict problems");
     }
+
+    try {
+      _FIELD = StructOptions.OptionsData.class.getDeclaredField("options");
+      _FIELD.setAccessible(true);
+      OPTIONS = _FIELD;
+    } catch (NoSuchFieldException e) {
+      warning("Skript's options field could not be resolved, computed options won't work");
+    }
   }
 
   private static void warning(String message) {
@@ -298,4 +309,30 @@ public static SkriptParser.ParseResult parse_i(SkriptParser skriptParser, String
     }
   }
 
+  /**
+   * Gets the modifiable options map from an options data object.
+   *
+   * @param script the script to get the options from.
+   * @return the modifiable options map.
+   *
+   * @throws NullPointerException if the given options data object is null.
+   * @throws IllegalStateException if skript-reflect could not find the modifiable options map.
+   */
+  public static Map<String, String> getOptions(Script script) {
+    if (script == null)
+      throw new NullPointerException();
+
+    if (OPTIONS == null)
+      throw new IllegalStateException("OPTIONS field not initialized, computed options cannot be used");
+
+    StructOptions.OptionsData optionsData = script.getData(StructOptions.OptionsData.class,
+        StructOptions.OptionsData::new);
+
+    try {
+      return (Map<String, String>) OPTIONS.get(optionsData);
+    } catch (IllegalAccessException e) {
+      throw new IllegalStateException(e); // setAccessible called
+    }
+  }
+
 }