MC v1.21.7 Support

Author: CryptoMorin

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

@@ -1018,6 +1018,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     MUSIC_DISC_CREATOR,
     MUSIC_DISC_CREATOR_MUSIC_BOX,
     MUSIC_DISC_FAR("RECORD_5"),
+    @XInfo(since = "1.21.7")
+    MUSIC_DISC_LAVA_CHICKEN,
     MUSIC_DISC_MALL("RECORD_6"),
     MUSIC_DISC_MELLOHI("RECORD_7"),
     MUSIC_DISC_OTHERSIDE,

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

@@ -1836,6 +1836,10 @@ public final class XSound extends XModule<XSound, Sound> {
             ITEM_SHEARS_SNIP = std("item.shears.snip"),
             MUSIC_DISC_TEARS = std("music_disc.tears");
 
+    @XInfo(since = "1.21.7")
+    public static final XSound
+            MUSIC_DISC_LAVA_CHICKEN = std("music_disc.lava_chicken");
+
     static {
         REGISTRY.discardMetadata();
     }

core/src/main/java/com/cryptomorin/xseries/XTag.java

@@ -2404,80 +2404,29 @@ public final class XTag<T extends XBase<?, ?>> {
                 XEnchantment.PUNCH,
                 XEnchantment.UNBREAKING);
 
-        CROSSBOW_ENCHANTS = TagBuilder.simple(XEnchantment.VANISHING_CURSE,
-                XEnchantment.MENDING,
-                XEnchantment.MULTISHOT,
-                XEnchantment.PIERCING,
-                XEnchantment.QUICK_CHARGE,
-                XEnchantment.UNBREAKING);
-
+        CROSSBOW_ENCHANTS = TagBuilder.simple(
+                XEnchantment.VANISHING_CURSE, XEnchantment.MENDING, XEnchantment.MULTISHOT,
+                XEnchantment.PIERCING, XEnchantment.QUICK_CHARGE, XEnchantment.UNBREAKING
+        );
 
-        MINEABLE_AXE = TagBuilder.of(XMaterial.COMPOSTER,
-                XMaterial.COCOA,
-                XMaterial.RED_MUSHROOM_BLOCK,
-                XMaterial.CRAFTING_TABLE,
-                XMaterial.TALL_GRASS,
-                XMaterial.BIG_DRIPLEAF_STEM,
-                XMaterial.RED_MUSHROOM,
-                XMaterial.JUKEBOX,
-                XMaterial.WARPED_FUNGUS,
-                XMaterial.DEAD_BUSH,
-                XMaterial.NOTE_BLOCK,
-                XMaterial.CRIMSON_FUNGUS,
-                XMaterial.MUSHROOM_STEM,
-                XMaterial.CHORUS_PLANT,
-                XMaterial.BEE_NEST,
-                XMaterial.BROWN_MUSHROOM_BLOCK,
-                XMaterial.JACK_O_LANTERN,
-                XMaterial.FERN,
-                XMaterial.NETHER_WART,
-                XMaterial.CARTOGRAPHY_TABLE,
-                XMaterial.CHEST,
-                XMaterial.SWEET_BERRY_BUSH,
-                XMaterial.BROWN_MUSHROOM,
-                XMaterial.CARVED_PUMPKIN,
-                XMaterial.SMITHING_TABLE,
-                XMaterial.GLOW_LICHEN,
-                XMaterial.SMALL_DRIPLEAF,
-                XMaterial.LOOM,
-                XMaterial.BEEHIVE,
-                XMaterial.SHORT_GRASS,
-                XMaterial.HANGING_ROOTS,
-                XMaterial.CHORUS_FLOWER,
-                XMaterial.ATTACHED_PUMPKIN_STEM,
-                XMaterial.BIG_DRIPLEAF,
-                XMaterial.DAYLIGHT_DETECTOR,
-                XMaterial.SPORE_BLOSSOM,
-                XMaterial.LILY_PAD,
-                XMaterial.TRAPPED_CHEST,
-                XMaterial.BARREL,
-                XMaterial.LARGE_FERN,
-                XMaterial.LECTERN,
-                XMaterial.SUGAR_CANE,
-                XMaterial.MELON,
-                XMaterial.ATTACHED_MELON_STEM,
-                XMaterial.PUMPKIN,
-                XMaterial.BAMBOO,
-                XMaterial.FLETCHING_TABLE,
-                XMaterial.BOOKSHELF
+        MINEABLE_AXE = TagBuilder.of(
+                XMaterial.COMPOSTER, XMaterial.COCOA, XMaterial.RED_MUSHROOM_BLOCK, XMaterial.CRAFTING_TABLE,
+                XMaterial.TALL_GRASS, XMaterial.BIG_DRIPLEAF_STEM, XMaterial.RED_MUSHROOM, XMaterial.JUKEBOX,
+                XMaterial.WARPED_FUNGUS, XMaterial.DEAD_BUSH, XMaterial.NOTE_BLOCK, XMaterial.CRIMSON_FUNGUS,
+                XMaterial.MUSHROOM_STEM, XMaterial.CHORUS_PLANT, XMaterial.BEE_NEST, XMaterial.BROWN_MUSHROOM_BLOCK,
+                XMaterial.JACK_O_LANTERN, XMaterial.FERN, XMaterial.NETHER_WART, XMaterial.CARTOGRAPHY_TABLE,
+                XMaterial.CHEST, XMaterial.SWEET_BERRY_BUSH, XMaterial.BROWN_MUSHROOM, XMaterial.CARVED_PUMPKIN,
+                XMaterial.SMITHING_TABLE, XMaterial.GLOW_LICHEN, XMaterial.SMALL_DRIPLEAF, XMaterial.LOOM,
+                XMaterial.BEEHIVE, XMaterial.SHORT_GRASS, XMaterial.HANGING_ROOTS, XMaterial.CHORUS_FLOWER,
+                XMaterial.ATTACHED_PUMPKIN_STEM, XMaterial.BIG_DRIPLEAF, XMaterial.DAYLIGHT_DETECTOR,
+                XMaterial.SPORE_BLOSSOM, XMaterial.LILY_PAD, XMaterial.TRAPPED_CHEST, XMaterial.BARREL,
+                XMaterial.LARGE_FERN, XMaterial.LECTERN, XMaterial.SUGAR_CANE, XMaterial.MELON,
+                XMaterial.ATTACHED_MELON_STEM, XMaterial.PUMPKIN, XMaterial.BAMBOO,
+                XMaterial.FLETCHING_TABLE, XMaterial.BOOKSHELF
         ).inheritFrom(
-                BANNERS,
-                SIGNS,
-                CAVE_VINES,
-                CROPS,
-                LOGS,
-                WOODEN_STAIRS,
-                WOODEN_SLABS,
-                WOODEN_PRESSURE_PLATES,
-                WOODEN_FENCES,
-                WOODEN_FENCE_GATES,
-                WOODEN_TRAPDOORS,
-                WOODEN_DOORS,
-                WOODEN_BUTTONS,
-                PLANKS,
-                SAPLINGS,
-                CLIMBABLE,
-                CAMPFIRES
+                WOODEN_STAIRS, WOODEN_SLABS, WOODEN_PRESSURE_PLATES, WOODEN_FENCES,
+                WOODEN_FENCE_GATES, WOODEN_TRAPDOORS, WOODEN_DOORS, WOODEN_BUTTONS,
+                BANNERS, SIGNS, CAVE_VINES, CROPS, LOGS, PLANKS, SAPLINGS, CLIMBABLE, CAMPFIRES
         ).build();
     }
 

core/src/main/java/com/cryptomorin/xseries/base/XRegistry.java

@@ -420,7 +420,7 @@ public XForm getByBukkitForm(BukkitForm bukkit) {
         if (mapping == null) {
             if (!PERFORM_AUTO_ADD) // If you ever get this error, it could mean that you're not following Minecraft's new dot separated namespace format.
                 throw new UnsupportedOperationException("Unknown standard bukkit form (no auto-add) for " + registryName + ": " + bukkit);
-            if (creator == null)
+            if (creator == null) // For enum registries
                 throw new UnsupportedOperationException("Unsupported value for " + registryName + ": " + bukkit);
             XForm xForm = std(bukkit);
             if (xForm == null) throw new IllegalStateException("Unknown " + registryName + ": " + bukkit);

pom.xml

@@ -51,7 +51,7 @@
         <!--##### Latest Versions #####-->
         <!-- https://repo.codemc.io/service/rest/repository/browse/nms/org/spigotmc/spigot/ -->
         <!-- mvn install:install-file "-Dfile=server.jar" -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.21.4-R0.1-EXPR -Dpackaging=jar -DgeneratePom=true -->
-        <spigotVersion>1.21.6-R0.1-SNAPSHOT</spigotVersion>
+        <spigotVersion>1.21.7-R0.1-SNAPSHOT</spigotVersion>
         <jopt>5.0.4</jopt>
         <testVer/>
         <testJavaPath/>