v9.6.0

CryptoMorin · CryptoMorin · commit 8689bf4d18b8 · 2023-08-06T08:10:43.000-07:00
- Updated License year
- Code cleanup
- Fix XItemStack spawners
- Fix 1.11 Titles
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Crypto Morin
- 
+Copyright (c) 2023 Crypto Morin
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>9.4.0</version>
+    <version>9.5.0</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -68,7 +68,7 @@
 
     <properties>
         <!-- Latest version -->
-        <spigotVersion>1.20-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.20.1-R0.1-SNAPSHOT</spigotVersion>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/com/cryptomorin/xseries/NMSExtras.java b/src/main/java/com/cryptomorin/xseries/NMSExtras.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/NoteBlockMusic.java b/src/main/java/com/cryptomorin/xseries/NoteBlockMusic.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/ReflectionUtils.java b/src/main/java/com/cryptomorin/xseries/ReflectionUtils.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/SkullCacheListener.java b/src/main/java/com/cryptomorin/xseries/SkullCacheListener.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/SkullUtils.java b/src/main/java/com/cryptomorin/xseries/SkullUtils.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XBiome.java b/src/main/java/com/cryptomorin/xseries/XBiome.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XBlock.java b/src/main/java/com/cryptomorin/xseries/XBlock.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XEnchantment.java b/src/main/java/com/cryptomorin/xseries/XEnchantment.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XEntity.java b/src/main/java/com/cryptomorin/xseries/XEntity.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XItemStack.java b/src/main/java/com/cryptomorin/xseries/XItemStack.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
  * <a href="https://hub.spigotmc.org/javadocs/spigot/org/bukkit/inventory/ItemStack.html">ItemStack</a>
  *
  * @author Crypto Morin
- * @version 7.3.1
+ * @version 7.3.2
  * @see XMaterial
  * @see XPotion
  * @see SkullUtils
@@ -642,10 +642,14 @@ public static ItemStack edit(@Nonnull ItemStack item,
             BlockState state = bsm.getBlockState();
 
             if (state instanceof CreatureSpawner) {
+                // Do we still need this? XMaterial handles it, doesn't it?
                 CreatureSpawner spawner = (CreatureSpawner) state;
-                spawner.setSpawnedType(Enums.getIfPresent(EntityType.class, config.getString("spawner").toUpperCase(Locale.ENGLISH)).orNull());
-                spawner.update(true);
-                bsm.setBlockState(spawner);
+                String spawnerStr = config.getString("spawner");
+                if (!Strings.isNullOrEmpty(spawnerStr)) {
+                    spawner.setSpawnedType(Enums.getIfPresent(EntityType.class, spawnerStr.toUpperCase(Locale.ENGLISH)).orNull());
+                    spawner.update(true);
+                    bsm.setBlockState(spawner);
+                }
             } else if (supports(11) && state instanceof ShulkerBox) {
                 ConfigurationSection shulkerSection = config.getConfigurationSection("contents");
                 if (shulkerSection != null) {
diff --git a/src/main/java/com/cryptomorin/xseries/XMaterial.java b/src/main/java/com/cryptomorin/xseries/XMaterial.java
@@ -2,7 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Hex_27
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XPotion.java b/src/main/java/com/cryptomorin/xseries/XPotion.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XSound.java b/src/main/java/com/cryptomorin/xseries/XSound.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/XTag.java b/src/main/java/com/cryptomorin/xseries/XTag.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/messages/ActionBar.java b/src/main/java/com/cryptomorin/xseries/messages/ActionBar.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/com/cryptomorin/xseries/messages/Titles.java b/src/main/java/com/cryptomorin/xseries/messages/Titles.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@
  * PacketPlayOutTitle: https://wiki.vg/Protocol#Title
  *
  * @author Crypto Morin
- * @version 3.0.0
+ * @version 3.1.0
  * @see ReflectionUtils
  */
 public final class Titles implements Cloneable {
@@ -65,6 +65,12 @@ public final class Titles implements Cloneable {
     private String title, subtitle;
     private final int fadeIn, stay, fadeOut;
 
+    /**
+     * From the latest 1.11.2 not checked with supports() to prevent
+     * errors on outdated 1.11 versions.
+     */
+    private static final boolean SUPPORTS_TITLES;
+
     static {
         MethodHandle packetCtor = null;
         MethodHandle chatComp = null;
@@ -74,7 +80,19 @@ public final class Titles implements Cloneable {
         Object subtitle = null;
         Object clear = null;
 
-        if (!ReflectionUtils.supports(11)) {
+
+        boolean SUPPORTS_TITLES1;
+        try {
+            Player.class.getDeclaredMethod("sendTitle",
+                    String.class, String.class,
+                    int.class, int.class, int.class);
+            SUPPORTS_TITLES1 = true;
+        } catch (NoSuchMethodException e) {
+            SUPPORTS_TITLES1 = false;
+        }
+        SUPPORTS_TITLES = SUPPORTS_TITLES1;
+
+        if (!SUPPORTS_TITLES) {
             Class<?> chatComponentText = ReflectionUtils.getNMSClass("ChatComponentText");
             Class<?> packet = ReflectionUtils.getNMSClass("PacketPlayOutTitle");
             Class<?> titleTypes = packet.getDeclaredClasses()[0];
@@ -151,7 +169,7 @@ public static void sendTitle(@Nonnull Player player,
                                  @Nullable String title, @Nullable String subtitle) {
         Objects.requireNonNull(player, "Cannot send title to null player");
         if (title == null && subtitle == null) return;
-        if (ReflectionUtils.supports(11)) {
+        if (SUPPORTS_TITLES) {
             player.sendTitle(title, subtitle, fadeIn, stay, fadeOut);
             return;
         }
diff --git a/src/main/java/com/cryptomorin/xseries/particles/ParticleDisplay.java b/src/main/java/com/cryptomorin/xseries/particles/ParticleDisplay.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -58,7 +58,7 @@
  * <code>[r, g, b, size]</code>
  *
  * @author Crypto Morin
- * @version 7.1.0
+ * @version 7.2.0
  * @see XParticle
  */
 public class ParticleDisplay implements Cloneable {
@@ -404,11 +404,15 @@ public static void serialize(ParticleDisplay display, ConfigurationSection secti
         }
 
         if (display.offset != null) {
-            section.set("offset", display.offset.getX() + ", " + display.offset.getY() + ", " + display.offset.getZ());
+            Vector offset = display.offset;
+            section.set("offset", offset.getX() + ", " + offset.getY() + ", " + offset.getZ());
         }
 
         if (display.rotation != null) {
-            section.set("rotation", Math.toDegrees(display.rotation.getX()) + ", " + Math.toDegrees(display.rotation.getY()) + ", " + Math.toDegrees(display.rotation.getZ()));
+            Vector rotation = display.rotation;
+            section.set("rotation", Math.toDegrees(rotation.getX()) + ", " +
+                    Math.toDegrees(rotation.getY()) + ", " +
+                    Math.toDegrees(rotation.getZ()));
         }
 
         if (display.rotationOrder != DEFAULT_ROTATION_ORDER) {
diff --git a/src/main/java/com/cryptomorin/xseries/particles/XParticle.java b/src/main/java/com/cryptomorin/xseries/particles/XParticle.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Crypto Morin
+ * Copyright (c) 2023 Crypto Morin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -100,14 +100,18 @@
  * Getting started with <a href="https://www.spigotmc.org/wiki/vector-programming-for-beginners/">Vectors</a><br>
  * Extra stuff if you want to read more: https://www.spigotmc.org/threads/418399/<br>
  * Particles: https://minecraft.gamepedia.com/Particles<br>
+ * <p>
+ * This class also uses {@link BooleanSupplier} and {@link Runnable} for repeating/delayed tasks
+ * in order to be compatible with other server softwares such as <a href="https://papermc.io/software/folia">Folia</a>.
  *
  * @author Crypto Morin
- * @version 5.0.1
+ * @version 6.0.0
  * @see ParticleDisplay
  * @see Particle
  * @see Location
  * @see Vector
  */
+@SuppressWarnings("JavadocLinkAsPlainText")
 public final class XParticle {
     /**
      * A full circle has two PIs.
@@ -415,6 +419,7 @@ public static void flower(int count, double radius, ParticleDisplay display, Run
     public static void filledCircle(double radius, double rate, double radiusRate, ParticleDisplay display) {
         double dynamicRate = 0;
         for (double i = 0.1; i < radius; i += radiusRate) {
+            //noinspection ConstantValue
             if (i > radius) i = radius;
             dynamicRate += rate / (radius / radiusRate);
             circle(i, dynamicRate, display);
@@ -433,7 +438,7 @@ public static void filledCircle(double radius, double rate, double radiusRate, P
      * <p>
      * Changing the mass or length to a lower value can make the
      * shape stop producing new paths since it reaches the doubles limit.
-     * Source: https://www.myphysicslab.com/pendulum/double-pendulum-en.html
+     * Source: <a href="https://www.myphysicslab.com/pendulum/double-pendulum-en.html">myphysicslab</a>
      *
      * @param radius     the radius of the pendulum. Yes this doesn't depend on length since the length needs to be a really
      *                   high value and this won't work with Minecraft's xyz.
@@ -525,7 +530,7 @@ public void run() {
      * <p>
      * Changing the mass or length to a lower value can make the
      * shape stop producing new paths since it reaches the doubles limit.
-     * Source: https://www.myphysicslab.com/pendulum/double-pendulum-en.html
+     * <a href="https://www.myphysicslab.com/pendulum/double-pendulum-en.html">Source</a>
      *
      * @param plugin     the timer handler.
      * @param radius     the radius of the pendulum. Yes this doesn't depend on length since the length needs to be a really
@@ -1193,7 +1198,7 @@ public static BukkitTask guard(Plugin plugin, long update, double rate, double o
 
     /**
      * Spawn a sphere.
-     * Tutorial: https://www.spigotmc.org/threads/146338/
+     * <a href="https://www.spigotmc.org/threads/146">Spigot Thread Tutorial</a>
      * Also uses its own unique directional pattern.
      *
      * @param radius the circle radius.
@@ -1789,7 +1794,7 @@ public static BukkitTask cloud(Plugin plugin, ParticleDisplay cloud, ParticleDis
 
     /**
      * Spawns a line from a location to another.
-     * Tutorial: https://www.spigotmc.org/threads/176695/
+     * <a href="https://www.spigotmc.org/threads/176695/">Spigot Thread Tutorial</a>
      * This method is a modified version to get the best performance.
      *
      * @param start the starting point of the line.
@@ -1814,6 +1819,7 @@ public static void line(Location start, Location end, double rate, ParticleDispl
         for (double i = 0; i < length; i += rate) {
             // Since the rate can be any number it's possible to get a higher number than
             // the length in the last loop.
+            //noinspection ConstantValue
             if (i > length) i = length;
             clone.spawn(x * i, y * i, z * i);
         }
@@ -2001,10 +2007,10 @@ public static void structuredCube(Location start, Location end, double rate, Par
     /**
      * Inaccurate representation of hypercubes. Just a bunch of tesseracts.
      * New smaller tesseracts will be created as the dimension increases.
-     * https://en.wikipedia.org/wiki/Hypercube
+     * <a href="https://en.wikipedia.org/wiki/Hypercube">Hypercube</a>
      * <p>
      * I'm still looking for a way to make this animated
-     * but it's damn confusing: https://www.youtube.com/watch?v=iGO12Z5Lw8s
+     * but it's damn confusing: <a href="https://www.youtube.com/watch?v=iGO12Z5Lw8s">YouTube</a>
      *
      * @param startOrigin the starting point for the original cube.
      * @param endOrigin   the endnig point for the original cube.

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* The MIT License (MIT)`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2022 Crypto Morin`
	`4`	`+ * Copyright (c) 2023 Crypto Morin`
`5`	`5`	`*`
`6`	`6`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`7`	`7`	`* of this software and associated documentation files (the "Software"), to deal`