remove deprecated code use

Author: sovdeeth

src/main/java/com/sovdee/skriptparticles/elements/sections/DrawShapeEffectSection.java

@@ -11,7 +11,6 @@
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.util.Timespan.TimePeriod;
 import ch.njol.skript.variables.Variables;
@@ -40,12 +39,7 @@ public abstract class DrawShapeEffectSection extends EffectSection {
     public static final Timespan ONE_TICK = new Timespan(TimePeriod.TICK, 1);
 
     static {
-        EventValues.registerEventValue(DrawEvent.class, Shape.class, new Getter<Shape, DrawEvent>() {
-            @Override
-            public Shape get(DrawEvent drawEvent) {
-                return drawEvent.getShape();
-            }
-        }, EventValues.TIME_NOW);
+        EventValues.registerEventValue(DrawEvent.class, Shape.class, DrawEvent::getShape, EventValues.TIME_NOW);
     }
 
     protected Expression<Shape> shapes;
@@ -82,7 +76,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
             AtomicBoolean delayed = new AtomicBoolean(false);
             Runnable afterLoading = () -> delayed.set(!getParser().getHasDelayBefore().isFalse());
             assert sectionNode != null;
-            trigger = loadCode(sectionNode, "draw", afterLoading, DrawEvent.class);
+            trigger = loadCode(sectionNode, "draw", null, afterLoading, DrawEvent.class);
             if (delayed.get()) {
                 Skript.error("Delays can't be used within a Draw Shape Effect Section");
                 return false;
@@ -144,10 +138,7 @@ protected TriggerItem walk(Event event) {
         if (trigger != null) {
             consumer = shape -> {
                 DrawEvent drawEvent = new DrawEvent(shape);
-                Variables.setLocalVariables(drawEvent, localVars);
-                TriggerItem.walk(trigger, drawEvent);
-                Variables.setLocalVariables(event, Variables.copyLocalVariables(drawEvent));
-                Variables.removeLocals(drawEvent);
+                Variables.withLocalVariables(event, drawEvent, () -> TriggerItem.walk(trigger, drawEvent));
             };
         } else {
             consumer = null;
@@ -216,11 +207,9 @@ protected void executeSync(Event event, Collection<DynamicLocation> locations, @
             for (DynamicLocation dynamicLocation : locations) {
                 for (Shape shape : shapes.getArray(event)) {
                     if (consumer != null) {
-                        // copy the shape so that it can be modified by the consumer without affecting the original
-                        shapeCopy = shape.clone();
-                        shapeCopy.draw(dynamicLocation, consumer, recipients);
+                        shape.clone().draw(dynamicLocation, consumer, recipients);
                     } else {
-                        shape.draw(dynamicLocation, recipients);
+                        shape.clone().draw(dynamicLocation, recipients);
                     }
                 }
             }
@@ -237,7 +226,7 @@ protected void executeAsync(Collection<DynamicLocation> locations, Collection<Sh
         try {
             for (DynamicLocation dynamicLocation : locations) {
                 for (Shape shape : shapes) {
-                    shape.draw(dynamicLocation, recipients);
+                    shape.clone().draw(dynamicLocation, recipients);
                 }
             }
         } catch (IllegalArgumentException exception) {

src/main/java/com/sovdee/skriptparticles/elements/sections/EffSecDrawShape.java

@@ -8,7 +8,6 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.util.Timespan.TimePeriod;
 import ch.njol.util.Kleenean;
@@ -59,12 +58,7 @@ public class EffSecDrawShape extends DrawShapeEffectSection {
                 "[sync:sync[hronously]] draw [the] shape[s] [of] %shapes% [%-directions% %-locations/entities%] [to %-players%]",
                 "draw [the] shape[s] [of] %shapes% [%-directions% %-locations/entities%] [to %-players%] (duration:for) [duration] %timespan% [with (delay|refresh [rate]) [of] %-timespan%]"
         );
-        EventValues.registerEventValue(EffSecDrawShape.DrawEvent.class, Shape.class, new Getter<Shape, DrawEvent>() {
-            @Override
-            public Shape get(DrawEvent drawEvent) {
-                return drawEvent.getShape();
-            }
-        }, EventValues.TIME_NOW);
+        EventValues.registerEventValue(EffSecDrawShape.DrawEvent.class, Shape.class, DrawEvent::getShape, EventValues.TIME_NOW);
     }
 
     @Nullable

src/main/java/com/sovdee/skriptparticles/shapes/AbstractShape.java

@@ -366,6 +366,8 @@ public Shape copyTo(Shape shape) {
         shape.setStyle(this.style);
         shape.showLocalAxes(this.drawLocalAxes);
         shape.showGlobalAxes(this.drawGlobalAxes);
+        shape.setAnimationDuration(this.animationDuration);
+        shape.setOrdering(this.ordering);
         // ensure that the shape's points are updated, so we don't have to recalculate them unless we change the copy.
         shape.setPoints(this.getPoints());
         shape.setNeedsUpdate(this.needsUpdate);