v8.6.0

Unit tests are now much more complete.

XTag
A class similar to Spigots XTag, but with more features and directly works with XSeries.
Note that this is a huge class. It's recommended that you exclude this from your project if you don't want to use it.

MaterialUtils
Removed in favor of XTag.

ReflectionUtils
Fixed an issue with 1.17
Attempted to fix a few issues with Bukkit-Forge servers.

XMaterial
Fixed an issue with Regex cache.

XSound
Added a method to stop a particular sound from XSound.Record

NMSExtras
Added support for 1.18 and fixed a small issue for 1.17

XPotion
If you're using this utility, you should consider recoding all those parts.
Most methods are renamed to a shorter and concise version.
Added a wrapper for PotionEffect for chances.
matchXPotion(PotionEffectType) is now extremely more efficient.

Author: CryptoMorin

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Crypto Morin
+Copyright (c) 2022 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

README.md

@@ -76,6 +76,7 @@ To shade the library, add the following under your maven plugins:
                     <exclude>com/cryptomorin/xseries/XBiome*</exclude>
                     <exclude>com/cryptomorin/xseries/NMSExtras*</exclude>
                     <exclude>com/cryptomorin/xseries/NoteBlockMusic*</exclude>
+                    <exclude>com/cryptomorin/xseries/SkullCacheListener*</exclude>
                 </excludes>
             </filter>
         </filters>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>8.5.0.1</version>
+    <version>8.6.0</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -62,14 +62,14 @@
     </repositories>
 
     <properties>
-        <spigotVersion>1.18-rc3-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.18.1-R0.1-SNAPSHOT</spigotVersion>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.18-rc3-R0.1-SNAPSHOT</version>
+            <version>${spigotVersion}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -156,7 +156,6 @@
                     </compilerArgs>
                     <excludes>
                         <exclude>com/cryptomorin/xseries/unused/</exclude>
-                        <exclude>com/cryptomorin/xseries/XMaterialUtil.java</exclude>
                         <exclude>com/cryptomorin/xseries/SkullCacheListener.java</exclude>
                     </excludes>
                 </configuration>
@@ -244,7 +243,7 @@
             <id>18</id>
             <properties>
                 <nms>18_R1</nms>
-                <spigotVersion>1.18-rc3-R0.1-SNAPSHOT</spigotVersion>
+                <spigotVersion>1.18.1-R0.1-SNAPSHOT</spigotVersion>
             </properties>
         </profile>
         <profile>

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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
@@ -241,7 +241,7 @@ public final class NMSExtras {
         SET_BLOCK_DATA = setBlockData;
     }
 
-    private NMSExtras() { }
+    private NMSExtras() {}
 
     public static void setExp(Player player, float bar, int lvl, int exp) {
         try {

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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 @@
  * A useful resource used to compare mappings is <a href="https://minidigger.github.io/MiniMappingViewer/#/spigot">Mini's Mapping Viewer</a>
  *
  * @author Crypto Morin
- * @version 6.0.0
+ * @version 6.0.1
  */
 public final class ReflectionUtils {
     /**
@@ -59,7 +59,34 @@ public final class ReflectionUtils {
      * <p>
      * Performance is not a concern for these specific statically initialized values.
      */
-    public static final String VERSION = parseVersion();
+    public static final String VERSION;
+
+    static {
+        // This package loop is used to avoid implementation-dependant strings like Bukkit.getVersion() or Bukkit.getBukkitVersion()
+        // which allows easier testing as well.
+        String found = null;
+        for (Package pack : Package.getPackages()) {
+            String name = pack.getName();
+            if (name.startsWith("org.bukkit.craftbukkit.v") // .v because there are other packages.
+                    // As a protection for forge+bukkit implementation that tend to mix versions.
+                    // The real CraftPlayer should exist in the package.
+                    // Note: Doesn't seem to function properly. Will need to separate the version
+                    // handler for NMS and CraftBukkit for softwares like catmc.
+                    && name.endsWith("entity")) {
+                found = pack.getName().split("\\.")[3];
+
+                // Just a final guard to make sure it finds this important class.
+                try {
+                    Class.forName("org.bukkit.craftbukkit." + found + ".entity.CraftPlayer");
+                    break;
+                } catch (ClassNotFoundException e) {
+                    found = null;
+                }
+            }
+        }
+        if (found == null) throw new IllegalArgumentException("Failed to parse server version. Could not find any package starting with name: 'org.bukkit.craftbukkit.v'");
+        VERSION = found;
+    }
 
     /**
      * The raw minor version number.
@@ -99,9 +126,8 @@ public final class ReflectionUtils {
         Class<?> playerConnection = getNMSClass("server.network", "PlayerConnection");
 
         MethodHandles.Lookup lookup = MethodHandles.lookup();
-        MethodHandle sendPacket = null;
-        MethodHandle getHandle = null;
-        MethodHandle connection = null;
+        MethodHandle sendPacket = null, getHandle = null, connection = null;
+
         try {
             connection = lookup.findGetter(entityPlayer,
                     v(17, "b").orElse("playerConnection"), playerConnection);
@@ -120,34 +146,6 @@ public final class ReflectionUtils {
 
     private ReflectionUtils() {}
 
-    /**
-     * Gets the package version used for NMS. This method is preferred over
-     * <code>
-     * Bukkit.getServer().getClass().getPackage()
-     * Bukkit.getVersion()
-     * </code>
-     * because the first solution doesn't work with unit tests and the second version
-     * doesn't have the exact package version.
-     * <p>
-     * Performance doesn't matter here as the method is only called once.
-     *
-     * @return the exact package version.
-     * @see #VERSION
-     * @since 6.0.0
-     */
-    private static String parseVersion() {
-        String found = null;
-        for (Package pack : Package.getPackages()) {
-            if (pack.getName().startsWith("org.bukkit.craftbukkit.v")) { // .v because there are other packages.
-                found = pack.getName().split("\\.")[3];
-                break;
-            }
-        }
-
-        if (found == null) throw new IllegalArgumentException("Failed to parse server version. Could not find any package starting with name: 'org.bukkit.craftbukkit.v'");
-        return found;
-    }
-
     /**
      * This method is purely for readability.
      * No performance is gained.
@@ -170,7 +168,7 @@ public static <T> CallableVersionHandler<T> v(int version, Callable<T> handle) {
      * @return true if the version is equal or newer, otherwise false.
      * @since 4.0.0
      */
-    public static boolean supports(int version) { return VER >= version; }
+    public static boolean supports(int version) {return VER >= version;}
 
     /**
      * Get a NMS (net.minecraft.server) class which accepts a package for 1.17 compatibility.

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Crypto Morin
+ * Copyright (c) 2022 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
@@ -82,7 +82,7 @@ public final class XBlock {
         ITEM_TO_BLOCK.put(XMaterial.PUMPKIN_PIE, XMaterial.PUMPKIN);
     }
 
-    private XBlock() { }
+    private XBlock() {}
 
     public static boolean isLit(Block block) {
         if (ISFLAT) {