1.3.4

Author: sovdeeth

build.gradle

@@ -23,7 +23,7 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("com.github.SkriptLang:Skript:2.10.2")
+    compileOnly("com.github.SkriptLang:Skript:2.12.0")
     implementation "org.joml:joml:${jomlVersion}"
 }
 

gradle.properties

@@ -1 +1 @@
-version = 1.3.3
+version = 1.3.4

src/main/java/com/sovdee/skriptparticles/elements/expressions/constructors/ExprBezierCurve.java

@@ -1,16 +1,16 @@
 package com.sovdee.skriptparticles.elements.expressions.constructors;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import com.sovdee.skriptparticles.shapes.BezierCurve;
-import com.sovdee.skriptparticles.shapes.Circle;
-import com.sovdee.skriptparticles.shapes.Shape;
-import com.sovdee.skriptparticles.util.MathUtil;
 import com.sovdee.skriptparticles.util.Point;
 import org.bukkit.event.Event;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -19,6 +19,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Name("Particle Bezier Curve")
+@Description({
+        "Creates a bezier curve between the given start and end points, using the given control points to change the curve."
+})
+@Examples({
+        "set {_shape} to a bezier curve from {a} to {b} with control points {c} and {d}",
+        "set {_shape} to a curve from player to player's target with control point (location 3 above player)"
+})
+@Since("1.3.0")
 public class ExprBezierCurve extends SimpleExpression<BezierCurve> {
 
     static {

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

@@ -15,22 +15,21 @@
 
 @Name("Shape Length/Width/Height")
 @Description({
-        "The length, width, or height of a shape. Changing this will change the size of the shape. Resetting or deleting it will set it back to the default value of 1.",
-        "Be sure to use 'shape length' instead of just 'length' to avoid conflicts with other syntax."
+        "The length, width, or height of a shape. Changing this will change the size of the shape. Resetting or deleting it will set it back to the default value of 1."
 })
 @Examples({
-        "set {_shape}'s length to 5",
-        "set {_shape}'s width to 5",
-        "set {_shape}'s height to 5",
-        "reset {_shape}'s length",
-        "reset {_shape}'s width",
-        "add 6 to {_shape}'s height"
+        "set {_shape}'s shape length to 5",
+        "set {_shape}'s shape width to 5",
+        "set {_shape}'s shape height to 5",
+        "reset {_shape}'s shape length",
+        "reset {_shape}'s shape width",
+        "add 6 to {_shape}'s shape height"
 })
 @Since("1.0.0")
 public class ExprShapeLWH extends SimplePropertyExpression<LWHShape, Number> {
 
     static {
-        register(ExprShapeLWH.class, Number.class, "[shape] (:length|:width|:height)", "lwhshapes");
+        register(ExprShapeLWH.class, Number.class, "shape (:length|:width|:height)", "lwhshapes");
     }
 
     private int lwh;

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

@@ -25,17 +25,17 @@
         "If you want the vectors relative to the center of the shape, use the 'shape points' expression."
 })
 @Examples({
-        "set {_locations::*} to locations of (circle of radius 10) centered at player",
+        "set {_locations::*} to point locations of (circle of radius 10) centered at player",
         "teleport player to random element of {_locations::*}",
         "",
         "# drawing the shape yourself: (skbee particle syntax)",
-        "draw 1 dust using dustOptions(red, 1) at (locations of (circle of radius 10) centered at player)"
+        "draw 1 dust using dustOptions(red, 1) at (particle locations of (circle of radius 10) centered at player)"
 })
 @Since("1.0.0")
 public class ExprShapeLocations extends SimpleExpression<Location> {
 
     static {
-        Skript.registerExpression(ExprShapeLocations.class, Location.class, ExpressionType.COMBINED, "[particle] locations of %shapes% [[centered] %direction% %location%]");
+        Skript.registerExpression(ExprShapeLocations.class, Location.class, ExpressionType.COMBINED, "(particle|point) locations of %shapes% [[centered] %direction% %location%]");
     }
 
     private Expression<Shape> shapeExpr;

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

@@ -18,16 +18,16 @@
         "Changing this will scale the shape accordingly. Resetting or deleting it will set it back to the default scale of 1."
 })
 @Examples({
-        "set {_shape}'s scale to 2",
-        "set scale of {_shape} to 0.5",
-        "set scale of {_shape} to 2 * (scale of {_shape})",
-        "reset {_shape}'s scale"
+        "set {_shape}'s shape scale to 2",
+        "set shape scale of {_shape} to 0.5",
+        "set shape scale of {_shape} to 2 * (scale of {_shape})",
+        "reset {_shape}'s shape scale"
 })
 @Since("1.0.0")
 public class ExprShapeScale extends SimplePropertyExpression<Shape, Number> {
 
     static {
-        PropertyExpression.register(ExprShapeScale.class, Number.class, "scale", "shapes");
+        PropertyExpression.register(ExprShapeScale.class, Number.class, "shape scale", "shapes");
     }
 
     @Override

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

@@ -26,7 +26,7 @@
 public class ExprShapeSides extends SimplePropertyExpression<PolyShape, Integer> {
 
     static {
-        register(ExprShapeSides.class, Integer.class, "side[s| count]", "polyshapes");
+        register(ExprShapeSides.class, Integer.class, "side(s| count)", "polyshapes");
     }
 
     @Override

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

@@ -81,6 +81,7 @@ public class SecParticle extends Section {
     }
 
     private Expression<org.bukkit.Particle> particle;
+    @Nullable
     private Expression<Number> count;
     @Nullable
     private Expression<Vector> offset;
@@ -93,6 +94,7 @@ public class SecParticle extends Section {
     @Nullable
     private Expression<Boolean> force;
 
+    @SuppressWarnings("unchecked")
     @Override
     public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult, SectionNode sectionNode, List<TriggerItem> triggerItems) {
         @Nullable EntryContainer entryContainer = validator.validate(sectionNode);