Fix btk5h/skript-mirror#105

Author: TPGamesNL

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2018 Bryan Terce
+Copyright (c) 2016-2020, Bryan Terce, TPGamesNL
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,11 +11,9 @@ Downloads: https://github.com/TPGamesNL/skript-mirror/actions (click the version
 If you want to talk about this project or something else, contact me on Discord: TPGamesNL#0880
 
 ## What's been changed in this fork:
-* Custom events
-* Support for more Java versions (Java 13, Java 14, OpenJ9)
+* Added custom events
+* Support for more Java versions (Java 13+, OpenJ9)
 * Support for listening to asynchronous events
-* Suppression of and/or warnings
-* Class proxy fixes
-* Some smaller changes
-* Fixed issues where local variables are deleted
-* Updated documentation
+* Class proxy fixes + documentation
+* Fixed multiple issues with local variables
+* And more

docs/advanced/custom-syntax/README.md

@@ -24,6 +24,25 @@ event-classes
 {% endcode-tabs-item %}
 {% endcode-tabs %}
 
+{% hint style="info" %}
+When used with [the raw expression](../../basics/utilities.md#raw-expression), you can set it to a value, which will change the input value from that argument. This can be used to store data in variables in the calling trigger.
+{% code-tabs %}
+{% code-tabs-item title="example.sk" %}
+```text
+import:
+	ch.njol.skript.lang.Variable
+
+effect put %objects% in %objects%:
+	parse:
+		expr-2 is an instance of Variable # to check if the second argument is a variable
+		continue
+	trigger:
+		set raw expr-2 to expr-1
+```
+{% endcode-tabs-item %}
+{% endcode-tabs %}
+{% endhint %}
+
 ### Matched Pattern
 
 {% code-tabs %}
@@ -72,5 +91,4 @@ continue
 
 {% page-ref page="expressions.md" %}
 
-
-
+{% page-ref page="events.md" %}

docs/basics/utilities.md

@@ -86,6 +86,25 @@ This value may be read from and written to.
 
 Returns the underlying object of an expression.
 
+{% hint style="info" %}
+When used with [the expression-expression](../advanced/custom-syntax/README.md#expression), you can set it to a value, which will change the input value from that argument. This can be used to store data in variables in the calling trigger.
+{% code-tabs %}
+{% code-tabs-item title="example.sk" %}
+```text
+import:
+	ch.njol.skript.lang.Variable
+
+effect put %objects% in %objects%:
+	parse:
+		expr-2 is an instance of Variable # to check if the second argument is a variable
+		continue
+	trigger:
+		set raw expr-2 to expr-1
+```
+{% endcode-tabs-item %}
+{% endcode-tabs %}
+{% endhint %}
+
 ## Members
 
 {% code-tabs %}

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

@@ -1,11 +1,13 @@
 package com.btk5h.skriptmirror.skript.custom;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
+import com.btk5h.skriptmirror.WrappedEvent;
 import com.btk5h.skriptmirror.util.SkriptUtil;
 import org.bukkit.event.Event;
 
@@ -36,6 +38,22 @@ public Class<? extends Expression> getReturnType() {
     return Expression.class;
   }
 
+  @Override
+  public Class<?>[] acceptChange(Changer.ChangeMode changeMode) {
+    return expr instanceof ExprExpression ? new Class[] {Object.class} : null;
+  }
+
+  @Override
+  public void change(Event event, Object[] delta, Changer.ChangeMode changeMode) {
+    if (!(expr instanceof ExprExpression && event instanceof CustomSyntaxEvent))
+      return;
+
+    Expression<?> expr = ((ExprExpression<?>) this.expr).getExpression(event).getSource();
+
+    event = ((WrappedEvent) event).getEvent();
+    expr.change(event, delta, changeMode);
+  }
+
   @Override
   public String toString(Event e, boolean debug) {
     return "raw " + expr.toString(e, debug);

src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomCondition.java

@@ -18,7 +18,6 @@ public class CustomCondition extends Condition {
   private ConditionSyntaxInfo which;
   private Expression<?>[] exprs;
   private SkriptParser.ParseResult parseResult;
-  private Event parseEvent;
   private Object variablesMap;
 
   @Override

src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffect.java

@@ -16,7 +16,6 @@ public class CustomEffect extends Effect {
   private EffectSyntaxInfo which;
   private Expression<?>[] exprs;
   private SkriptParser.ParseResult parseResult;
-  private Event parseEvent;
   private Object variablesMap;
 
   @Override