v9.8.0

Author: CryptoMorin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>9.7.0</version>
+    <version>9.8.0</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -58,6 +58,7 @@
         <repository>
             <id>nms-repo</id>
             <url>https://repo.codemc.org/repository/nms/</url>
+ <!--            https://repo.codemc.io/service/rest/repository/browse/nms/org/spigotmc/spigot/-->
         </repository>
 <!--        <repository>-->
 <!--            &lt;!&ndash; Sometimes codemc's snapshots don't have the mojang packages. &ndash;&gt;-->
@@ -68,7 +69,7 @@
 
     <properties>
         <!-- Latest version -->
-        <spigotVersion>1.20.2-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.20.4-R0.1-SNAPSHOT</spigotVersion>
     </properties>
 
     <dependencies>

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

@@ -47,7 +47,7 @@
  * All the parameters are non-null.
  *
  * @author Crypto Morin
- * @version 5.3.1
+ * @version 5.4.0
  */
 public final class NMSExtras {
     public static final Class<?> EntityLivingClass = getNMSClass("world.entity", "EntityLiving");
@@ -121,7 +121,7 @@ public final class NMSExtras {
             Class<?> DataWatcherObjectClass = getNMSClass("network.syncher", "DataWatcherObject");
 
             getHandle = lookup.findVirtual(CraftEntityClass, "getHandle", MethodType.methodType(nmsEntity));
-            getDataWatcher = lookup.findVirtual(nmsEntity, v(20, 2, "al").v(19, "aj").v(18, "ai").orElse("getDataWatcher"), MethodType.methodType(DataWatcherClass)); // getEntityData()
+            getDataWatcher = lookup.findVirtual(nmsEntity, v(20, 4, "an").v(20, 2, "al").v(19, "aj").v(18, "ai").orElse("getDataWatcher"), MethodType.methodType(DataWatcherClass)); // getEntityData()
             dataWatcherGetItem = lookup.findVirtual(DataWatcherClass, v(18, "b").orElse("get"), MethodType.methodType(Object.class, DataWatcherObjectClass)); //  private <T> Item<T> c(DataWatcherObject<T> datawatcherobject)
             dataWatcherSetItem = lookup.findVirtual(DataWatcherClass, v(18, "b").orElse("set"), MethodType.methodType(void.class, DataWatcherObjectClass, Object.class)); //  private <T> Item<T> c(DataWatcherObject<T> datawatcherobject)
 
@@ -228,7 +228,7 @@ public final class NMSExtras {
 
                 tileEntitySign = lookup.findConstructor(TileEntitySign, MethodType.methodType(void.class, blockPos, BLOCK_DATA));
                 tileEntitySign_getUpdatePacket = lookup.findVirtual(TileEntitySign,
-                        v(20, "j").v(19, "f").v(18, "c").orElse("getUpdatePacket"),
+                        v(20, 4, "m").v(20, "j").v(19, "f").v(18, "c").orElse("getUpdatePacket"),
                         MethodType.methodType(PacketPlayOutTileEntityData));
 
                 if (supports(20)) {

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

@@ -50,7 +50,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 7.1.0
+ * @version 7.1.0.0.1
  */
 public final class ReflectionUtils {
     /**
@@ -105,8 +105,13 @@ public final class ReflectionUtils {
      */
     public static final int MINOR_NUMBER;
     /**
-     * The raw patch version number.
-     * E.g. {@code v1_17_R1} to {@code 1}
+     * The raw patch version number. Refers to the <a href="https://en.wikipedia.org/wiki/Software_versioning">major.minor.patch version scheme</a>.
+     * E.g.
+     * <ul>
+     *     <li>{@code v1.20.4} to {@code 4}</li>
+     *     <li>{@code v1.18.2} to {@code 2}</li>
+     *     <li>{@code v1.19.1} to {@code 1}</li>
+     * </ul>
      * <p>
      * I'd not recommend developers to support individual patches at all. You should always support the latest patch.
      * For example, between v1.14.0, v1.14.1, v1.14.2, v1.14.3 and v1.14.4 you should only support v1.14.4
@@ -194,7 +199,7 @@ public static Integer getLatestPatchNumberOf(int minorVersion) {
                 /* 17 */ 1,//            \_!_/
                 /* 18 */ 2,
                 /* 19 */ 4,
-                /* 20 */ 2,
+                /* 20 */ 4,
         };
 
         if (minorVersion > patches.length) return null;

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

@@ -67,7 +67,7 @@
  * I don't know if this cache system works across other servers or is just specific to one server.
  *
  * @author Crypto Morin
- * @version 6.0.0
+ * @version 6.0.0.1
  * @see XMaterial
  * @see ReflectionUtils
  */
@@ -93,7 +93,7 @@ public class SkullUtils {
      * They don't seem to use anything complicated, but the length is inconsistent for some reasons.
      * It doesn't seem like uppercase characters are used either.
      */
-    private static final Pattern MOJANG_SHA256_APPROX = Pattern.compile("[0-9a-z]{60,70}");
+    private static final Pattern MOJANG_SHA256_APPROX = Pattern.compile("[0-9a-z]{55,70}");
 
     private static final AtomicLong MOJANG_SHA_FAKE_ID_ENUMERATOR = new AtomicLong(1);
 

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

@@ -61,7 +61,7 @@
  * <b>/give @p minecraft:dirt 1 10</b> where 1 is the item amount, and 10 is the data value. The material {@link #DIRT} with a data value of {@code 10} doesn't exist.
  *
  * @author Crypto Morin
- * @version 11.4.1
+ * @version 11.5.0
  * @see Material
  * @see ItemStack
  */
@@ -235,6 +235,7 @@ public enum XMaterial {
     BRAIN_CORAL_FAN,
     BRAIN_CORAL_WALL_FAN,
     BREAD,
+    BREEZE_SPAWN_EGG,
     BREWER_POTTERY_SHERD,
     BREWING_STAND("BREWING_STAND", "BREWING_STAND_ITEM"),
     BRICK("CLAY_BRICK"),
@@ -325,13 +326,16 @@ public enum XMaterial {
     CHICKEN_SPAWN_EGG(93, "MONSTER_EGG"),
     CHIPPED_ANVIL(1, "ANVIL"),
     CHISELED_BOOKSHELF,
+    CHISELED_COPPER,
     CHISELED_DEEPSLATE,
     CHISELED_NETHER_BRICKS(1, "NETHER_BRICKS"),
     CHISELED_POLISHED_BLACKSTONE("POLISHED_BLACKSTONE"),
     CHISELED_QUARTZ_BLOCK(1, "QUARTZ_BLOCK"),
     CHISELED_RED_SANDSTONE(1, "RED_SANDSTONE"),
     CHISELED_SANDSTONE(1, "SANDSTONE"),
     CHISELED_STONE_BRICKS(3, "SMOOTH_BRICK"),
+    CHISELED_TUFF,
+    CHISELED_TUFF_BRICKS,
     CHORUS_FLOWER,
     CHORUS_FRUIT,
     CHORUS_PLANT,
@@ -379,15 +383,20 @@ public enum XMaterial {
     COOKED_SALMON(1, "COOKED_FISH"),
     COOKIE,
     COPPER_BLOCK,
+    COPPER_BULB,
+    COPPER_DOOR,
+    COPPER_GRATE,
     COPPER_INGOT,
     COPPER_ORE,
+    COPPER_TRAPDOOR,
     CORNFLOWER,
     COW_SPAWN_EGG(92, "MONSTER_EGG"),
     CRACKED_DEEPSLATE_BRICKS,
     CRACKED_DEEPSLATE_TILES,
     CRACKED_NETHER_BRICKS(2, "NETHER_BRICKS"),
     CRACKED_POLISHED_BLACKSTONE_BRICKS("POLISHED_BLACKSTONE_BRICKS"),
     CRACKED_STONE_BRICKS(2, "SMOOTH_BRICK"),
+    CRAFTER,
     CRAFTING_TABLE("WORKBENCH"),
     CREEPER_BANNER_PATTERN,
     CREEPER_HEAD(4, "SKULL", "SKULL_ITEM"),
@@ -567,7 +576,12 @@ public enum XMaterial {
     EVOKER_SPAWN_EGG(34, "MONSTER_EGG"),
     EXPERIENCE_BOTTLE("EXP_BOTTLE"),
     EXPLORER_POTTERY_SHERD,
+    EXPOSED_CHISELED_COPPER,
     EXPOSED_COPPER,
+    EXPOSED_COPPER_BULB,
+    EXPOSED_COPPER_DOOR,
+    EXPOSED_COPPER_GRATE,
+    EXPOSED_COPPER_TRAPDOOR,
     EXPOSED_CUT_COPPER,
     EXPOSED_CUT_COPPER_SLAB,
     EXPOSED_CUT_COPPER_STAIRS,
@@ -646,7 +660,6 @@ public enum XMaterial {
     GRANITE_SLAB,
     GRANITE_STAIRS,
     GRANITE_WALL,
-    GRASS(1, "LONG_GRASS"),
     GRASS_BLOCK("GRASS"),
     GRAVEL,
     GRAY_BANNER(8, "STANDING_BANNER", "BANNER"),
@@ -1013,7 +1026,12 @@ public enum XMaterial {
     ORANGE_WALL_BANNER(14, "WALL_BANNER"),
     ORANGE_WOOL(1, "WOOL"),
     OXEYE_DAISY(8, "RED_ROSE"),
+    OXIDIZED_CHISELED_COPPER,
     OXIDIZED_COPPER,
+    OXIDIZED_COPPER_BULB,
+    OXIDIZED_COPPER_DOOR,
+    OXIDIZED_COPPER_GRATE,
+    OXIDIZED_COPPER_TRAPDOOR,
     OXIDIZED_CUT_COPPER,
     OXIDIZED_CUT_COPPER_SLAB,
     OXIDIZED_CUT_COPPER_STAIRS,
@@ -1088,6 +1106,10 @@ public enum XMaterial {
     POLISHED_GRANITE(2, "STONE"),
     POLISHED_GRANITE_SLAB,
     POLISHED_GRANITE_STAIRS,
+    POLISHED_TUFF,
+    POLISHED_TUFF_SLAB,
+    POLISHED_TUFF_STAIRS,
+    POLISHED_TUFF_WALL,
     POPPED_CHORUS_FRUIT("CHORUS_FRUIT_POPPED"),
     POPPY("RED_ROSE"),
     PORKCHOP("PORK"),
@@ -1279,6 +1301,11 @@ public enum XMaterial {
     SHEEP_SPAWN_EGG(91, "MONSTER_EGG"),
     SHELTER_POTTERY_SHERD,
     SHIELD,
+    /**
+     * 1.13.0: LONG_GRASS:1
+     * 1.20.4: GRASS -> SHORT_GRASS
+     */
+    SHORT_GRASS(1, "GRASS", "LONG_GRASS"),
     SHROOMLIGHT,
     SHULKER_BOX("PURPLE_SHULKER_BOX"),
     SHULKER_SHELL,
@@ -1430,6 +1457,8 @@ public enum XMaterial {
     TOTEM_OF_UNDYING("TOTEM"),
     TRADER_LLAMA_SPAWN_EGG,
     TRAPPED_CHEST,
+    TRIAL_KEY,
+    TRIAL_SPAWNER,
     TRIDENT,
     TRIPWIRE,
     TRIPWIRE_HOOK,
@@ -1441,6 +1470,13 @@ public enum XMaterial {
     TUBE_CORAL_FAN,
     TUBE_CORAL_WALL_FAN,
     TUFF,
+    TUFF_BRICKS,
+    TUFF_BRICK_SLAB,
+    TUFF_BRICK_STAIRS,
+    TUFF_BRICK_WALL,
+    TUFF_SLAB,
+    TUFF_STAIRS,
+    TUFF_WALL,
     TURTLE_EGG,
     TURTLE_HELMET,
     TURTLE_SPAWN_EGG,
@@ -1491,24 +1527,49 @@ public enum XMaterial {
     WATER("STATIONARY_WATER"),
     WATER_BUCKET,
     WATER_CAULDRON,
+    WAXED_CHISELED_COPPER,
     WAXED_COPPER_BLOCK,
+    WAXED_COPPER_BULB,
+    WAXED_COPPER_DOOR,
+    WAXED_COPPER_GRATE,
+    WAXED_COPPER_TRAPDOOR,
     WAXED_CUT_COPPER,
     WAXED_CUT_COPPER_SLAB,
     WAXED_CUT_COPPER_STAIRS,
+    WAXED_EXPOSED_CHISELED_COPPER,
     WAXED_EXPOSED_COPPER,
+    WAXED_EXPOSED_COPPER_BULB,
+    WAXED_EXPOSED_COPPER_DOOR,
+    WAXED_EXPOSED_COPPER_GRATE,
+    WAXED_EXPOSED_COPPER_TRAPDOOR,
     WAXED_EXPOSED_CUT_COPPER,
     WAXED_EXPOSED_CUT_COPPER_SLAB,
     WAXED_EXPOSED_CUT_COPPER_STAIRS,
+    WAXED_OXIDIZED_CHISELED_COPPER,
     WAXED_OXIDIZED_COPPER,
+    WAXED_OXIDIZED_COPPER_BULB,
+    WAXED_OXIDIZED_COPPER_DOOR,
+    WAXED_OXIDIZED_COPPER_GRATE,
+    WAXED_OXIDIZED_COPPER_TRAPDOOR,
     WAXED_OXIDIZED_CUT_COPPER,
     WAXED_OXIDIZED_CUT_COPPER_SLAB,
     WAXED_OXIDIZED_CUT_COPPER_STAIRS,
+    WAXED_WEATHERED_CHISELED_COPPER,
     WAXED_WEATHERED_COPPER,
+    WAXED_WEATHERED_COPPER_BULB,
+    WAXED_WEATHERED_COPPER_DOOR,
+    WAXED_WEATHERED_COPPER_GRATE,
+    WAXED_WEATHERED_COPPER_TRAPDOOR,
     WAXED_WEATHERED_CUT_COPPER,
     WAXED_WEATHERED_CUT_COPPER_SLAB,
     WAXED_WEATHERED_CUT_COPPER_STAIRS,
     WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE,
+    WEATHERED_CHISELED_COPPER,
     WEATHERED_COPPER,
+    WEATHERED_COPPER_BULB,
+    WEATHERED_COPPER_DOOR,
+    WEATHERED_COPPER_GRATE,
+    WEATHERED_COPPER_TRAPDOOR,
     WEATHERED_CUT_COPPER,
     WEATHERED_CUT_COPPER_SLAB,
     WEATHERED_CUT_COPPER_STAIRS,
@@ -1657,7 +1718,7 @@ public enum XMaterial {
             // MELON_SLICE, CARROTS, POTATOES, BEETROOTS, GRASS_BLOCK, BRICKS, NETHER_BRICKS, BROWN_MUSHROOM
             // Using the constructor to add elements will decide to allocate more size which we don't need.
             DUPLICATED = new HashSet<>(4);
-            DUPLICATED.add(GRASS.name());
+            DUPLICATED.add("GRASS");
             DUPLICATED.add(MELON.name());
             DUPLICATED.add(BRICK.name());
             DUPLICATED.add(NETHER_BRICK.name());