2.10 support

Author: sovdeeth

build.gradle

@@ -26,7 +26,7 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("com.github.SkriptLang:Skript:2.8.4")
+    compileOnly("com.github.SkriptLang:Skript:2.10.0-pre1")
     shadow "org.bstats:bstats-bukkit:3.0.2"
     implementation "org.joml:joml:${jomlVersion}"
 }

gradle.properties

@@ -1 +1 @@
-version = 1.3.0
+version = 1.3.2

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

@@ -11,8 +11,8 @@
 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;
 import ch.njol.util.Kleenean;
 import com.sovdee.skriptparticles.SkriptParticle;
@@ -36,15 +36,10 @@
 
 public abstract class DrawShapeEffectSection extends EffectSection {
 
-    public static final Timespan ONE_TICK = Timespan.fromTicks(1);
+    public static final Timespan ONE_TICK = new Timespan(TimePeriod.TICK, 1);
 
     static {
-        EventValues.registerEventValue(DrawEvent.class, Shape.class, new Getter<>() {
-            @Override
-            public Shape get(DrawEvent event) {
-                return event.getShape();
-            }
-        }, EventValues.TIME_NOW);
+        EventValues.registerEventValue(DrawEvent.class, Shape.class, DrawEvent::getShape, EventValues.TIME_NOW);
     }
 
     protected Expression<Shape> shapes;

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

@@ -8,8 +8,8 @@
 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;
 import com.sovdee.skriptparticles.shapes.Shape;
 import com.sovdee.skriptparticles.util.DynamicLocation;
@@ -58,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<>() {
-            @Override
-            public Shape get(EffSecDrawShape.DrawEvent event) {
-                return event.getShape();
-            }
-        }, EventValues.TIME_NOW);
+        EventValues.registerEventValue(EffSecDrawShape.DrawEvent.class, Shape.class, DrawEvent::getShape, EventValues.TIME_NOW);
     }
 
     @Nullable
@@ -91,8 +86,8 @@ protected void setupAsync(Event event, Collection<DynamicLocation> locations, Co
             @Nullable Timespan duration = this.duration.getSingle(event);
             if (delay == null || duration == null) return;
 
-            period = Math.max(delay.getTicks(), 1);
-            iterations = Math.max(duration.getTicks() / period, 1);
+            period = Math.max(delay.getAs(TimePeriod.TICK), 1);
+            iterations = Math.max(duration.getAs(TimePeriod.TICK) / period, 1);
         }
         AtomicLong currentIteration = new AtomicLong(0);
         BukkitRunnable runnable = new BukkitRunnable() {

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

@@ -8,6 +8,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
 import ch.njol.util.Kleenean;
 import com.sovdee.skriptparticles.shapes.Shape;
 import com.sovdee.skriptparticles.util.DynamicLocation;
@@ -51,8 +52,8 @@ protected void executeSync(Event event, Collection<DynamicLocation> locations, @
 
     @Override
     protected void setupAsync(Event event, Collection<DynamicLocation> locations, Collection<Shape> shapes, Collection<Player> recipients) {
-        Timespan duration = this.duration.getOptionalSingle(event).orElse(Timespan.fromTicks(0));
-        long milliseconds = duration.getMilliSeconds();
+        Timespan duration = this.duration.getOptionalSingle(event).orElse(new Timespan(TimePeriod.TICK, 0));
+        long milliseconds = duration.getAs(TimePeriod.MILLISECOND);
         for (Shape shape : shapes) {
             shape.setAnimationDuration(milliseconds);
         }

src/main/java/com/sovdee/skriptparticles/elements/types/ParticleTypes.java

@@ -11,6 +11,7 @@
 import ch.njol.skript.registrations.DefaultClasses;
 import ch.njol.skript.util.Color;
 import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
 import com.sovdee.skriptparticles.particles.ParticleMotion;
 import com.sovdee.skriptparticles.util.ParticleUtil;
 import org.bukkit.Location;
@@ -169,7 +170,7 @@ public Vibration[] executeSimple(Object[][] params) {
                         return new Vibration[0];
                     }
                     Location destination = (Location) params[0][0];
-                    int arrivalTime = (int) ((Timespan) params[1][0]).getTicks();
+                    int arrivalTime = (int) ((Timespan) params[1][0]).getAs(TimePeriod.TICK);
                     Vibration vibration = new Vibration(new Vibration.Destination.BlockDestination(destination), arrivalTime);
                     return new Vibration[]{vibration};
                 }

src/main/java/com/sovdee/skriptparticles/util/ReflectionUtils.java

@@ -9,12 +9,12 @@
  */
 
 public class ReflectionUtils {
-    private static final String VERSION = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3] + ".";
+    private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
     private static final boolean DEBUG = false; //SkBee.getPlugin().getPluginConfig().SETTINGS_DEBUG;
 
     @Nullable
     public static Class<?> getOBCClass(String obcClassString) {
-        String name = "org.bukkit.craftbukkit." + VERSION + obcClassString;
+        String name = CRAFTBUKKIT_PACKAGE + obcClassString;
         try {
             return Class.forName(name);
         } catch (ClassNotFoundException e) {