2.14 compat

Author: sovdeeth

build.gradle

@@ -7,7 +7,7 @@ plugins {
 group 'com.sovdee'
 project.ext.jomlVersion = "1.10.5"
 
-configurations.all {
+configurations.configureEach {
     resolutionStrategy.cacheChangingModulesFor 1, 'minutes'
 }
 
@@ -22,8 +22,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("com.github.SkriptLang:Skript:2.12.0")
+    compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
+    compileOnly("com.github.SkriptLang:Skript:2.14.0-pre1")
     implementation "org.joml:joml:${jomlVersion}"
 }
 
@@ -42,7 +42,7 @@ javadoc {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 tasks.register('copyJar', Copy) {

gradle.properties

@@ -1 +1 @@
-version = 1.3.5
+version = 1.4.0

src/main/java/com/sovdee/skriptparticles/elements/effects/EffDrawParticle.java

@@ -29,7 +29,7 @@
         "teleport player to random element of {_locations::*}",
         "",
         "# drawing the shape yourself: (skbee particle syntax)",
-        "draw 1 dust using dustOptions(red, 1) at (particle locations of (circle of radius 10) centered at player)"
+        "draw 1 red dust at (particle locations of (circle of radius 10) centered at player)"
 })
 @Since("1.0.0")
 public class ExprShapeLocations extends SimpleExpression<Location> {

src/main/java/com/sovdee/skriptparticles/elements/expressions/ExprCustomParticle.java

@@ -45,7 +45,7 @@
         "synchronously draw the shape of a sphere with radius 1 at player's location",
         "",
         "draw the shape {_shape} at player's location:",
-            "\tset event-shape's particle to dust using dustOption(red, 1)",
+            "\tset event-shape's particle to red dust",
         "",
         "synchronously draw shape (a sphere with radius 1 and a cube with radius 1) at player's location:",
             "\tset event-shape's radius to 2",

src/main/java/com/sovdee/skriptparticles/elements/expressions/properties/ExprShapeLocations.java

@@ -15,10 +15,10 @@
 import ch.njol.util.Kleenean;
 import com.sovdee.skriptparticles.particles.Particle;
 import com.sovdee.skriptparticles.particles.ParticleMotion;
-import com.sovdee.skriptparticles.util.ParticleUtil;
 import org.bukkit.event.Event;
 import org.bukkit.util.Vector;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.skriptlang.skript.bukkit.particles.particleeffects.ParticleEffect;
 import org.skriptlang.skript.lang.entry.EntryContainer;
 import org.skriptlang.skript.lang.entry.EntryValidator;
 import org.skriptlang.skript.lang.entry.util.ExpressionEntryData;
@@ -35,7 +35,6 @@
             "\tvelocity: vector - the velocity of the particle. Can be a vector or a motion (inwards/clockwise/etc.). (default: 0, 0, 0)",
             "\textra: number - the extra value of the particle. Forces `count` to be 0 and cannot be combined with `offset`. " +
                     "See the Minecraft wiki on /particle for more info. (default: 0)",
-            "\tdata: object - the data value of the particle. For example, `dustOptions()` for the dust particle. See the Minecraft wiki on /particle for more info. (default: null)",
             "\tforce: boolean - whether or not to force the particle to be seen at long range. (default: false)"
 })
 @Examples({
@@ -46,12 +45,11 @@
             "\tforce: true",
         "set {_particle} to last created particle",
         "",
-        "create a new custom dust particle with:",
+        "create a new custom red dust particle with:",
             "\tcount: 0",
             "\tvelocity: inwards",
             "\textra: 0.5",
             "\tforce: true",
-            "\tdata: dustOption(red, 5)",
         "set {_particle} to last created particle",
 })
 @Since("1.0.2")
@@ -63,7 +61,6 @@ public class SecParticle extends Section {
             .addEntryData(new ExpressionEntryData<>("offset", null, true, Vector.class))
             .addEntryData(new ExpressionEntryData<>("velocity", null, true, Object.class))
             .addEntryData(new ExpressionEntryData<>("extra", null, true, Number.class))
-            .addEntryData(new ExpressionEntryData<>("data", null, true, Object.class))
             .addEntryData(new ExpressionEntryData<>("force", null, true, Boolean.class))
             .build();
 
@@ -73,14 +70,13 @@ public class SecParticle extends Section {
     //- offset: vector
     //- velocity: vector or inwards/outwards (exclusive w/ offset & count)
     //- extra: double
-    //- data: dustOptions, item, etc. (take skbee code)
     //- - if particle is dust, allow "color: color" and "size: double"
     //- force: boolean
     static {
         Skript.registerSection(SecParticle.class, "create [a] [new] custom %particle% [particle] [with]");
     }
 
-    private Expression<org.bukkit.Particle> particle;
+    private Expression<ParticleEffect> particle;
     @Nullable
     private Expression<Number> count;
     @Nullable
@@ -90,8 +86,6 @@ public class SecParticle extends Section {
     @Nullable
     private Expression<Number> extra;
     @Nullable
-    private Expression<Object> data;
-    @Nullable
     private Expression<Boolean> force;
 
     @SuppressWarnings("unchecked")
@@ -101,7 +95,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
         if (entryContainer == null)
             return false;
 
-        particle = (Expression<org.bukkit.Particle>) expressions[0];
+        particle = (Expression<ParticleEffect>) expressions[0];
         count = (Expression<Number>) entryContainer.getOptional("count", Expression.class, true);
         offset = (Expression<Vector>) entryContainer.getOptional("offset", Expression.class, true);
         extra = (Expression<Number>) entryContainer.getOptional("extra", Expression.class, true);
@@ -116,15 +110,6 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
             }
         }
 
-        data = (Expression<Object>) entryContainer.getOptional("data", Expression.class, true);
-        if (data != null) {
-            data = LiteralUtils.defendExpression(data);
-            if (!LiteralUtils.canInitSafely(data)){
-                Skript.error("Invalid value for data! Must be a dust options, item, or other particle data!");
-                return false;
-            }
-        }
-
         if (offset != null && velocity != null) {
             Skript.error("You cannot have both an offset and a velocity for a particle!");
             return false;
@@ -141,18 +126,17 @@ protected TriggerItem walk(Event event) {
     }
 
     private void execute(Event event) {
-        org.bukkit. @Nullable Particle bukkitParticle = this.particle.getSingle(event);
-        if (bukkitParticle == null)
+        @Nullable ParticleEffect particleEffect = this.particle.getSingle(event);
+        if (particleEffect == null)
             return;
         @Nullable Number count = this.count.getSingle(event);
         if (count == null)
             return;
         @Nullable Vector offset = this.offset != null ? this.offset.getSingle(event) : null;
         @Nullable Number extra = this.extra != null ? this.extra.getSingle(event) : null;
-        @Nullable Object data = this.data != null ? this.data.getSingle(event) : null;
         @Nullable Boolean force = this.force != null ? this.force.getSingle(event) : null;
 
-        Particle particle = (Particle) new Particle(bukkitParticle).count(count.intValue());
+        Particle particle = Particle.of(particleEffect).count(count.intValue());
 
         if (velocity != null) {
             @Nullable Object v = velocity.getSingle(event);
@@ -169,12 +153,6 @@ private void execute(Event event) {
         if (extra != null)
             particle.extra(extra.doubleValue());
 
-        if (data != null) {
-            data = ParticleUtil.getData(particle.particle(), data);
-            if (data != null)
-                particle.data(data);
-        }
-
         if (force != null)
             particle.force(force);