v9.3.1

1.19.4 support

Author: CryptoMorin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>9.3.0</version>
+    <version>9.3.1</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>
@@ -59,14 +59,25 @@
             <id>nms-repo</id>
             <url>https://repo.codemc.org/repository/nms/</url>
         </repository>
+<!--        <repository>-->
+<!--            &lt;!&ndash; Sometimes codemc's snapshots don't have the mojang packages. &ndash;&gt;-->
+<!--            <id>minecraft-repo</id>-->
+<!--            <url>https://libraries.minecraft.net/</url>-->
+<!--        </repository>-->
     </repositories>
 
     <properties>
         <!-- Latest version -->
-        <spigotVersion>1.19.3-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.19.4-R0.1-SNAPSHOT</spigotVersion>
     </properties>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.mojang</groupId>-->
+<!--            <artifactId>authlib</artifactId>-->
+<!--            <version>1.5.25</version>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>

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

@@ -192,7 +192,9 @@ public final class NMSExtras {
 
             Class<?> blockPos = getNMSClass("core", "BlockPosition");
             Class<?> block = getNMSClass("world.level.block", "Block");
-            blockPosition = lookup.findConstructor(blockPos, MethodType.methodType(void.class, double.class, double.class, double.class));
+            blockPosition = lookup.findConstructor(blockPos,
+                    v(19, MethodType.methodType(void.class, int.class, int.class, int.class)).orElse(
+                            MethodType.methodType(void.class, double.class, double.class, double.class)));
             getBlockType = lookup.findVirtual(world, v(18, "a_").orElse("getType"), MethodType.methodType(BLOCK_DATA, blockPos));
             getBlock = lookup.findVirtual(BLOCK_DATA, v(18, "b").orElse("getBlock"), MethodType.methodType(block));
             playBlockAction = lookup.findVirtual(world, v(18, "a").orElse("playBlockAction"), MethodType.methodType(void.class, blockPos, block, int.class, int.class));

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

@@ -45,14 +45,15 @@
  * <a href="https://minecraft.fandom.com/wiki/Java_Edition_1.18">1.18 removed biomes issue.</a>
  *
  * @author Crypto Morin
- * @version 6.1.0
+ * @version 6.1.1
  * @see Biome
  */
 public enum XBiome {
     WINDSWEPT_HILLS("MOUNTAINS", "EXTREME_HILLS"),
     SNOWY_PLAINS("SNOWY_TUNDRA", "ICE_FLATS", "ICE_PLAINS"),
     SPARSE_JUNGLE("JUNGLE_EDGE", "JUNGLE_EDGE"),
     STONY_SHORE("STONE_SHORE", "STONE_BEACH"),
+    CHERRY_GROVE,
     OLD_GROWTH_PINE_TAIGA("GIANT_TREE_TAIGA", "REDWOOD_TAIGA", "MEGA_TAIGA"),
     WINDSWEPT_FOREST("WOODED_MOUNTAINS", "EXTREME_HILLS_WITH_TREES", "EXTREME_HILLS_PLUS"),
     WOODED_BADLANDS("WOODED_BADLANDS_PLATEAU", "MESA_ROCK", "MESA_PLATEAU_FOREST"),
@@ -69,7 +70,6 @@ public enum XBiome {
     JAGGED_PEAKS,
     STONY_PEAKS,
     CUSTOM,
-
     BADLANDS("MESA"),
     BADLANDS_PLATEAU(WOODED_BADLANDS, "MESA_CLEAR_ROCK", "MESA_PLATEAU"),
     BEACH("BEACHES"),

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.3.0
+ * @version 11.4.0
  * @see Material
  * @see ItemStack
  */
@@ -254,6 +254,7 @@ public enum XMaterial {
     BROWN_TERRACOTTA(12, "STAINED_CLAY"),
     BROWN_WALL_BANNER(3, "WALL_BANNER"),
     BROWN_WOOL(12, "WOOL"),
+    BRUSH,
     BUBBLE_COLUMN,
     BUBBLE_CORAL,
     BUBBLE_CORAL_BLOCK,
@@ -292,6 +293,25 @@ public enum XMaterial {
     CHAINMAIL_LEGGINGS,
     CHAIN_COMMAND_BLOCK("COMMAND", "COMMAND_CHAIN"),
     CHARCOAL(1, "COAL"),
+    CHERRY_BOAT,
+    CHERRY_BUTTON,
+    CHERRY_CHEST_BOAT,
+    CHERRY_DOOR,
+    CHERRY_FENCE,
+    CHERRY_FENCE_GATE,
+    CHERRY_HANGING_SIGN,
+    CHERRY_LEAVES,
+    CHERRY_LOG,
+    CHERRY_PLANKS,
+    CHERRY_PRESSURE_PLATE,
+    CHERRY_SAPLING,
+    CHERRY_SIGN,
+    CHERRY_SLAB,
+    CHERRY_STAIRS,
+    CHERRY_TRAPDOOR,
+    CHERRY_WALL_HANGING_SIGN,
+    CHERRY_WALL_SIGN,
+    CHERRY_WOOD,
     CHEST("LOCKED_CHEST"),
     CHEST_MINECART("STORAGE_MINECART"),
     CHICKEN("RAW_CHICKEN"),
@@ -315,6 +335,7 @@ public enum XMaterial {
     COAL_BLOCK,
     COAL_ORE,
     COARSE_DIRT(1, "DIRT"),
+    COAST_ARMOR_TRIM_SMITHING_TEMPLATE,
     COBBLED_DEEPSLATE,
     COBBLED_DEEPSLATE_SLAB,
     COBBLED_DEEPSLATE_STAIRS,
@@ -454,6 +475,7 @@ public enum XMaterial {
     DEAD_TUBE_CORAL_FAN,
     DEAD_TUBE_CORAL_WALL_FAN,
     DEBUG_STICK,
+    DECORATED_POT,
     DEEPSLATE,
     DEEPSLATE_BRICKS,
     DEEPSLATE_BRICK_SLAB,
@@ -507,6 +529,7 @@ public enum XMaterial {
     DRIPSTONE_BLOCK,
     DROPPER,
     DROWNED_SPAWN_EGG,
+    DUNE_ARMOR_TRIM_SMITHING_TEMPLATE,
     ECHO_SHARD,
     EGG,
     ELDER_GUARDIAN_SPAWN_EGG(4, "MONSTER_EGG"),
@@ -539,6 +562,7 @@ public enum XMaterial {
     EXPOSED_CUT_COPPER,
     EXPOSED_CUT_COPPER_SLAB,
     EXPOSED_CUT_COPPER_STAIRS,
+    EYE_ARMOR_TRIM_SMITHING_TEMPLATE,
     FARMLAND("SOIL"),
     FEATHER,
     FERMENTED_SPIDER_EYE,
@@ -911,6 +935,7 @@ public enum XMaterial {
     NETHERITE_SCRAP,
     NETHERITE_SHOVEL,
     NETHERITE_SWORD,
+    NETHERITE_UPGRADE_SMITHING_TEMPLATE,
     NETHERRACK,
     NETHER_BRICK("NETHER_BRICK_ITEM"),
     NETHER_BRICKS("NETHER_BRICK"),
@@ -1002,6 +1027,7 @@ public enum XMaterial {
     PINK_CONCRETE_POWDER(6, "CONCRETE_POWDER"),
     PINK_DYE(9, "INK_SACK"),
     PINK_GLAZED_TERRACOTTA,
+    PINK_PETALS,
     PINK_SHULKER_BOX,
     PINK_STAINED_GLASS(6, "STAINED_GLASS"),
     PINK_STAINED_GLASS_PANE(6, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -1056,6 +1082,7 @@ public enum XMaterial {
     POTTED_BLUE_ORCHID(1, "FLOWER_POT"),
     POTTED_BROWN_MUSHROOM("FLOWER_POT"),
     POTTED_CACTUS("FLOWER_POT"),
+    POTTED_CHERRY_SAPLING,
     POTTED_CORNFLOWER,
     POTTED_CRIMSON_FUNGUS,
     POTTED_CRIMSON_ROOTS,
@@ -1075,10 +1102,15 @@ public enum XMaterial {
     POTTED_RED_MUSHROOM("FLOWER_POT"),
     POTTED_RED_TULIP(4, "FLOWER_POT"),
     POTTED_SPRUCE_SAPLING(1, "FLOWER_POT"),
+    POTTED_TORCHFLOWER,
     POTTED_WARPED_FUNGUS,
     POTTED_WARPED_ROOTS,
     POTTED_WHITE_TULIP(6, "FLOWER_POT"),
     POTTED_WITHER_ROSE,
+    POTTERY_SHARD_ARCHER,
+    POTTERY_SHARD_ARMS_UP,
+    POTTERY_SHARD_PRIZE,
+    POTTERY_SHARD_SKULL,
     POWDER_SNOW,
     POWDER_SNOW_BUCKET,
     POWDER_SNOW_CAULDRON,
@@ -1194,6 +1226,7 @@ public enum XMaterial {
     REPEATER("DIODE_BLOCK_ON", "DIODE_BLOCK_OFF", "DIODE"),
     REPEATING_COMMAND_BLOCK("COMMAND", "COMMAND_REPEATING"),
     RESPAWN_ANCHOR,
+    RIB_ARMOR_TRIM_SMITHING_TEMPLATE,
     ROOTED_DIRT,
     ROSE_BUSH(4, "DOUBLE_PLANT"),
     ROTTEN_FLESH,
@@ -1216,6 +1249,7 @@ public enum XMaterial {
     SEAGRASS,
     SEA_LANTERN,
     SEA_PICKLE,
+    SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE,
     SHEARS,
     SHEEP_SPAWN_EGG(91, "MONSTER_EGG"),
     SHIELD,
@@ -1248,6 +1282,8 @@ public enum XMaterial {
     SMOOTH_SANDSTONE_STAIRS,
     SMOOTH_STONE,
     SMOOTH_STONE_SLAB,
+    SNIFFER_SPAWN_EGG,
+    SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE,
     SNOW,
     SNOWBALL("SNOW_BALL"),
     SNOW_BLOCK,
@@ -1263,6 +1299,7 @@ public enum XMaterial {
     SPECTRAL_ARROW,
     SPIDER_EYE,
     SPIDER_SPAWN_EGG(52, "MONSTER_EGG"),
+    SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE,
     SPLASH_POTION,
     SPONGE,
     SPORE_BLOSSOM,
@@ -1312,6 +1349,8 @@ public enum XMaterial {
     STRIPPED_BAMBOO_BLOCK,
     STRIPPED_BIRCH_LOG,
     STRIPPED_BIRCH_WOOD,
+    STRIPPED_CHERRY_LOG,
+    STRIPPED_CHERRY_WOOD,
     STRIPPED_CRIMSON_HYPHAE,
     STRIPPED_CRIMSON_STEM,
     STRIPPED_DARK_OAK_LOG,
@@ -1338,6 +1377,7 @@ public enum XMaterial {
      */
     SUGAR_CANE("SUGAR_CANE_BLOCK"),
     SUNFLOWER("DOUBLE_PLANT"),
+    SUSPICIOUS_SAND,
     SUSPICIOUS_STEW,
     SWEET_BERRIES,
     SWEET_BERRY_BUSH,
@@ -1347,11 +1387,15 @@ public enum XMaterial {
     TALL_SEAGRASS,
     TARGET,
     TERRACOTTA("HARD_CLAY"),
+    TIDE_ARMOR_TRIM_SMITHING_TEMPLATE,
     TINTED_GLASS,
     TIPPED_ARROW,
     TNT,
     TNT_MINECART("EXPLOSIVE_MINECART"),
     TORCH,
+    TORCHFLOWER,
+    TORCHFLOWER_CROP,
+    TORCHFLOWER_SEEDS,
     TOTEM_OF_UNDYING("TOTEM"),
     TRADER_LLAMA_SPAWN_EGG,
     TRAPPED_CHEST,
@@ -1372,6 +1416,7 @@ public enum XMaterial {
     TWISTING_VINES,
     TWISTING_VINES_PLANT,
     VERDANT_FROGLIGHT,
+    VEX_ARMOR_TRIM_SMITHING_TEMPLATE,
     VEX_SPAWN_EGG(35, "MONSTER_EGG"),
     VILLAGER_SPAWN_EGG(120, "MONSTER_EGG"),
     VINDICATOR_SPAWN_EGG(36, "MONSTER_EGG"),
@@ -1385,6 +1430,7 @@ public enum XMaterial {
     WALL_TORCH("TORCH"),
     WANDERING_TRADER_SPAWN_EGG,
     WARDEN_SPAWN_EGG,
+    WARD_ARMOR_TRIM_SMITHING_TEMPLATE,
     WARPED_BUTTON,
     WARPED_DOOR,
     WARPED_FENCE,
@@ -1458,6 +1504,7 @@ public enum XMaterial {
     WHITE_TULIP(6, "RED_ROSE"),
     WHITE_WALL_BANNER(15, "WALL_BANNER"),
     WHITE_WOOL("WOOL"),
+    WILD_ARMOR_TRIM_SMITHING_TEMPLATE,
     WITCH_SPAWN_EGG(66, "MONSTER_EGG"),
     WITHER_ROSE,
     WITHER_SKELETON_SKULL(1, "SKULL", "SKULL_ITEM"),