Finalization for v9.6.0

Author: CryptoMorin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -254,7 +254,7 @@
         <profile>
             <id>latest</id>
             <properties>
-                <nms>19_R0</nms>
+                <nms>20_R0</nms>
             </properties>
         </profile>
         <profile>

src/main/java/com/cryptomorin/xseries/ReflectionUtils.java

@@ -295,6 +295,20 @@ public static boolean supports(int minorNumber) {
         return MINOR_NUMBER >= minorNumber;
     }
 
+    /**
+     * Checks whether the server version is equal or greater than the given version.
+     *
+     * @param minorNumber the minor version to compare the server version with.
+     * @param patchNumber the patch number to compare the server version with.
+     * @return true if the version is equal or newer, otherwise false.
+     * @see #MINOR_NUMBER
+     * @see #PATCH_NUMBER
+     * @since 7.1.0
+     */
+    public static boolean supports(int minorNumber, int patchNumber) {
+        return MINOR_NUMBER == minorNumber ? supportsPatch(patchNumber) : supports(minorNumber);
+    }
+
     /**
      * Checks whether the server version is equal or greater than the given version.
      *

src/main/java/com/cryptomorin/xseries/SkullUtils.java

@@ -294,13 +294,32 @@ public static String getSkinValue(@Nonnull ItemMeta skull) {
 
         if (profile != null && !profile.getProperties().get("textures").isEmpty()) {
             for (Property property : profile.getProperties().get("textures")) {
-                if (!property.getValue().isEmpty()) return property.getValue();
+                String value = getPropertyValue(property);
+                if (!value.isEmpty()) return value;
             }
         }
 
         return null;
     }
 
+    /**
+     * They changed {@link Property} to a Java record in 1.20.2
+     *
+     * @since 4.0.1
+     */
+    private static String getPropertyValue(Property property) {
+        if (ReflectionUtils.supports(12, 2)) {
+            return property.value();
+        } else {
+            try {
+                //noinspection JavaReflectionMemberAccess
+                return (String) Property.class.getMethod("getValue").invoke(property);
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
     /**
      * https://help.minecraft.net/hc/en-us/articles/360034636712
      *

src/main/java/com/cryptomorin/xseries/XSound.java

@@ -55,7 +55,7 @@
  * play command: <a href="https://minecraft.wiki/w/Commands/play">minecraft.wiki/w</a>
  *
  * @author Crypto Morin
- * @version 9.2.0
+ * @version 9.2.1
  * @see Sound
  */
 public enum XSound {
@@ -645,6 +645,12 @@ public enum XSound {
     BLOCK_SOUL_SOIL_HIT,
     BLOCK_SOUL_SOIL_PLACE,
     BLOCK_SOUL_SOIL_STEP,
+    BLOCK_SPONGE_ABSORB,
+    BLOCK_SPONGE_BREAK,
+    BLOCK_SPONGE_FALL,
+    BLOCK_SPONGE_HIT,
+    BLOCK_SPONGE_PLACE,
+    BLOCK_SPONGE_STEP,
     BLOCK_SPORE_BLOSSOM_BREAK,
     BLOCK_SPORE_BLOSSOM_FALL,
     BLOCK_SPORE_BLOSSOM_HIT,
@@ -707,6 +713,11 @@ public enum XSound {
     BLOCK_WET_GRASS_HIT,
     BLOCK_WET_GRASS_PLACE("BLOCK_WET_GRASS_HIT"),
     BLOCK_WET_GRASS_STEP("BLOCK_WET_GRASS_HIT"),
+    BLOCK_WET_SPONGE_BREAK,
+    BLOCK_WET_SPONGE_FALL,
+    BLOCK_WET_SPONGE_HIT,
+    BLOCK_WET_SPONGE_PLACE,
+    BLOCK_WET_SPONGE_STEP,
     BLOCK_WOODEN_BUTTON_CLICK_OFF("WOOD_CLICK", "BLOCK_WOOD_BUTTON_CLICK_OFF"),
     BLOCK_WOODEN_BUTTON_CLICK_ON("WOOD_CLICK", "BLOCK_WOOD_BUTTON_CLICK_ON"),
     BLOCK_WOODEN_DOOR_CLOSE("DOOR_CLOSE"),

src/main/java/com/cryptomorin/xseries/particles/ParticleDisplay.java

@@ -98,7 +98,8 @@ public class ParticleDisplay implements Cloneable {
      * instead of handling the direction in a specific axis.
      * This makes it easier for them as well and allows easier use of the {@link #rotation} API.
      */
-    private Supplier<Vector> direction;
+    private final Vector directionNormal = new Vector(0, 1, 0);
+    private Supplier<Vector> direction = () -> directionNormal;
     @Nonnull
     private Axis[] rotationOrder = DEFAULT_ROTATION_ORDER;
     @Nullable

src/main/java/com/cryptomorin/xseries/particles/XParticle.java

@@ -1442,20 +1442,24 @@ public static BukkitTask atomic(Plugin plugin, int orbits, double radius, double
     /**
      * Spawns animated helix shapes.
      *
-     * @param strings   the amount of helix strings. The rotation angle will split equally for each.
-     * @param radius    the radius of the helix.
-     * @param rate      the rate of helix points.
-     * @param extension the helix circle extension.
-     * @param length    the length of the helix.
-     * @param speed     the speed of the rate builder in each animation tick.
-     * @param fadeUp    helix radius will decrease to zero as it gets closer to the top.
-     * @param fadeDown  helix radius will increase to the original radius as it gets closer to the center.
+     * @param strings      the amount of helix strings. The rotation angle will split equally for each.
+     * @param radius       the radius of the helix.
+     * @param rate         the rate of helix points.
+     * @param extension    the helix circle extension.
+     * @param length       the length of the helix.
+     * @param speed        the amount of blocks the particles advances in one tick. Recommended is 0.5
+     * @param rotationRate The amount particles rotate around the circular reference, should be set depending on the amount of strings.
+     *                     5 is usually a good value.
+     * @param fadeUp       helix radius will decrease to zero as it gets closer to the top.
+     * @param fadeDown     helix radius will increase to the original radius as it gets closer to the center.
      * @return the animation runnable. It will return false when the animation is finished.
      * @see #dnaReplication(double, double, int, double, int, int, ParticleDisplay)
      * @since 3.0.0
      */
-    public static BooleanSupplier helix(int strings, double radius, double rate, double extension, int length, int speed,
-                                        boolean fadeUp, boolean fadeDown, ParticleDisplay display) {
+    public static BooleanSupplier helix(int strings, double radius, double rate, double extension,
+                                        double length, double speed, double rotationRate,
+                                        boolean fadeUp, boolean fadeDown,
+                                        ParticleDisplay display) {
         return new BooleanSupplier() {
             // If we look at a helix string from above, we'll see a circle tunnel.
             // To make this tunnel we're going to generate circles while moving
@@ -1467,17 +1471,13 @@ public static BooleanSupplier helix(int strings, double radius, double rate, dou
             final double radiusDiv2 = fadeUp && fadeDown ? radiusDiv * 2 : radiusDiv;
             double dynamicRadius = fadeDown ? 0 : radius;
             boolean center = !fadeDown;
-            final double rotationRate = distanceBetweenEachCirclePoints / 5;
+            final double calculatedRotRate = distanceBetweenEachCirclePoints / rotationRate;
             double rotation = 0;
-            final boolean done = false;
+            double currentDistance = 0;
 
             @Override
             public boolean getAsBoolean() {
-                if (done) return false;
-
-//                int repeat = speed;
-//                while (repeat-- > 0) {
-//                    y += rate;
+                if (currentDistance >= length) return false;
 
                 if (!center) {
                     dynamicRadius += radiusDiv2;
@@ -1493,13 +1493,10 @@ public boolean getAsBoolean() {
                     display.spawn(x, 0, z);
                 }
 
-                display.advanceInDirection(1);
-                rotation += rotationRate;
-//                if (y > length) {
-//                    done = true;
-//                    return false;
-//                }
-//                }
+                currentDistance += speed;
+                if (currentDistance < length) display.advanceInDirection(speed);
+                else display.advanceInDirection(speed - (currentDistance - length));
+                rotation += calculatedRotRate;
 
                 return true;
             }
@@ -1522,9 +1519,10 @@ public boolean getAsBoolean() {
      * @see #dnaReplication(Plugin, double, double, int, double, int, int, ParticleDisplay)
      * @since 3.0.0
      */
-    public static BukkitTask helix(Plugin plugin, int strings, double radius, double rate, double extension, int height, int speed,
+    public static BukkitTask helix(Plugin plugin, int strings, double radius, double rate,
+                                   double extension, double height, double speed, double rotationRate,
                                    boolean fadeUp, boolean fadeDown, ParticleDisplay display) {
-        BooleanSupplier helix = helix(strings, radius, rate, extension, height, speed, fadeUp, fadeDown, display);
+        BooleanSupplier helix = helix(strings, radius, rate, extension, height, speed, rotationRate, fadeUp, fadeDown, display);
         return new BukkitRunnable() {
             @Override
             public void run() {
@@ -1603,7 +1601,7 @@ public static void lightning(Location start, Vector direction, int entries, int
      * @param hydrogenBondDist    the distance between each hydrogen bond (read inside method). This distance is also affected by rate.
      * @param display             display for strings.
      * @param hydrogenBondDisplay display for hydrogen bonds.
-     * @see #helix(Plugin, int, double, double, double, int, int, boolean, boolean, ParticleDisplay)
+     * @see #helix(int, double, double, double, double, double, double, boolean, boolean, ParticleDisplay)
      * @see #dnaReplication(Plugin, double, double, int, double, int, int, ParticleDisplay)
      * @since 1.0.0
      */

src/test/DifferenceHelper.java

@@ -21,6 +21,8 @@ public class DifferenceHelper {
      */
     public static void versionDifference() {
         Path serverFolder = Bukkit.getWorldContainer().toPath();
+        System.out.println("Server container: " + serverFolder.toAbsolutePath());
+
         Path materials = serverFolder.resolve("XMaterial.txt"),
                 sounds = serverFolder.resolve("XSound.txt"),
                 xPotion = serverFolder.resolve("XPotion.txt"),