v1.21.6 Support | XWorldBorder fixes

Fixes #352

Author: CryptoMorin

README.md

@@ -2,7 +2,7 @@
 
 # XSeries
 
-[![Minecraft](https://img.shields.io/badge/Minecraft-1.21.5-dark_green.svg)](https://shields.io/)
+[![Minecraft](https://img.shields.io/badge/Minecraft-1.21.6-dark_green.svg)](https://shields.io/)
 [![Java](https://img.shields.io/badge/Java-8-dark_green.svg)](https://shields.io/)
 [![Build Status](https://api.travis-ci.com/CryptoMorin/XSeries.svg?branch=master)](https://app.travis-ci.com/github/CryptoMorin/XSeries)
 ![maven-central](https://img.shields.io/maven-central/v/com.github.cryptomorin/XSeries)

commons/src/main/java/com/cryptomorin/xseries/AbstractReferencedClass.java

@@ -22,6 +22,10 @@
 
 package com.cryptomorin.xseries;
 
+/**
+ * A class that delegates {@link Object} methods from {@link #object()}.
+ * @param <T>
+ */
 public abstract class AbstractReferencedClass<T> {
     protected abstract T object();
 

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

@@ -23,6 +23,7 @@
 
 import com.cryptomorin.xseries.base.XModule;
 import com.cryptomorin.xseries.base.XRegistry;
+import com.cryptomorin.xseries.base.annotations.XInfo;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.attribute.Attribute;
@@ -76,6 +77,12 @@ public final class XAttribute extends XModule<XAttribute, Attribute> {
             SWEEPING_DAMAGE_RATIO = std(/* v1.20.3+ */ "sweeping_damage_ratio", "player.sweeping_damage_ratio"),
             SPAWN_REINFORCEMENTS = std(/* v1.20.3+ */ "spawn_reinforcements", "zombie.spawn_reinforcements");
 
+    @XInfo(since = "1.21.6")
+    public static final XAttribute
+            CAMERA_DISTANCE = std("camera_distance"),
+            WAYPOINT_TRANSMIT_RANGE = std("waypoint_transmit_range"),
+            WAYPOINT_RECEIVE_RANGE = std("waypoint_receive_range");
+
     private static final boolean SUPPORTS_MODERN_MODIFIERS;
 
     static {

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

@@ -58,6 +58,7 @@
  *
  * @author Crypto Morin
  * @version 4.0.2.1
+ * @see XEntityType
  * @see XMaterial
  * @see XItemStack
  * @see XPotion

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

@@ -34,6 +34,12 @@
 import java.util.Objects;
 import java.util.Optional;
 
+/**
+ * Corresponds to {@link EntityType}
+ *
+ * @version 1.0.1
+ * @see XEntity
+ */
 public enum XEntityType implements XBase<XEntityType, EntityType> {
     ACACIA_BOAT,
     ACACIA_CHEST_BOAT,
@@ -102,6 +108,8 @@ public enum XEntityType implements XBase<XEntityType, EntityType> {
     GLOW_SQUID,
     GOAT,
     GUARDIAN,
+    @XInfo(since = "1.21.6")
+    HAPPY_GHAST,
     HOGLIN,
     HOPPER_MINECART("MINECART_HOPPER"),
     HORSE,
@@ -116,6 +124,8 @@ public enum XEntityType implements XBase<XEntityType, EntityType> {
     JUNGLE_CHEST_BOAT,
     LEASH_KNOT("LEASH_HITCH"),
     LIGHTNING_BOLT("LIGHTNING"),
+    @XInfo(since = "1.21.5")
+    LINGERING_POTION,
     LLAMA,
     LLAMA_SPIT,
     MAGMA_CUBE,
@@ -125,10 +135,8 @@ public enum XEntityType implements XBase<XEntityType, EntityType> {
     MINECART,
     MOOSHROOM("MUSHROOM_COW"),
     MULE,
-
     @XChange(version = "v1.21.2", from = "BOAT", to = "OAK_BOAT")
     OAK_BOAT("BOAT"),
-
     @XChange(version = "v1.21.2", from = "CHEST_BOAT", to = "OAK_CHEST_BOAT")
     OAK_CHEST_BOAT("CHEST_BOAT"),
     OCELOT,
@@ -145,14 +153,6 @@ public enum XEntityType implements XBase<XEntityType, EntityType> {
     PILLAGER,
     PLAYER,
     POLAR_BEAR,
-
-    @XInfo(since = "1.21.5")
-    @XChange(version = "1.21.5", from = "POTION", to = "SPLASH_POTION")
-    SPLASH_POTION("POTION"),
-
-    @XInfo(since = "1.21.5")
-    LINGERING_POTION,
-
     PUFFERFISH,
     RABBIT,
     RAVAGER,
@@ -171,6 +171,9 @@ public enum XEntityType implements XBase<XEntityType, EntityType> {
     SPAWNER_MINECART("MINECART_MOB_SPAWNER"),
     SPECTRAL_ARROW,
     SPIDER,
+    @XInfo(since = "1.21.5")
+    @XChange(version = "1.21.5", from = "POTION", to = "SPLASH_POTION")
+    SPLASH_POTION("POTION"),
     SPRUCE_BOAT,
     SPRUCE_CHEST_BOAT,
     SQUID,

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

@@ -64,7 +64,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 12.0.0
+ * @version 12.0.1
  * @see Material
  * @see XItemStack
  * @see ItemStack
@@ -208,6 +208,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     BLACK_CONCRETE_POWDER(15, "CONCRETE_POWDER"),
     @XInfo(since = "1.14") BLACK_DYE(0, "INK_SACK", "INK_SAC"),
     BLACK_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    BLACK_HARNESS,
     BLACK_SHULKER_BOX,
     BLACK_STAINED_GLASS(15, "STAINED_GLASS"),
     BLACK_STAINED_GLASS_PANE(15, "STAINED_GLASS_PANE"),
@@ -231,6 +233,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     @XInfo(since = "1.21.5")
     BLUE_EGG,
     BLUE_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    BLUE_HARNESS,
     BLUE_ICE,
     BLUE_ORCHID(1, "RED_ROSE"),
     BLUE_SHULKER_BOX,
@@ -275,6 +279,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     @XInfo(since = "1.21.5")
     BROWN_EGG,
     BROWN_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    BROWN_HARNESS,
     BROWN_MUSHROOM,
     BROWN_MUSHROOM_BLOCK("BROWN_MUSHROOM", "HUGE_MUSHROOM_1"),
     BROWN_SHULKER_BOX,
@@ -470,6 +476,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     CYAN_CONCRETE_POWDER(9, "CONCRETE_POWDER"),
     CYAN_DYE(6, "INK_SACK"),
     CYAN_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    CYAN_HARNESS,
     CYAN_SHULKER_BOX,
     CYAN_STAINED_GLASS(9, "STAINED_GLASS"),
     CYAN_STAINED_GLASS_PANE(9, "STAINED_GLASS_PANE"),
@@ -574,6 +582,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     DRAGON_EGG,
     DRAGON_HEAD(5, "SKULL", "SKULL_ITEM"),
     DRAGON_WALL_HEAD(5, "SKULL", "SKULL_ITEM"),
+    @XInfo(since = "1.21.6")
+    DRIED_GHAST,
     DRIED_KELP,
     DRIED_KELP_BLOCK,
     DRIPSTONE_BLOCK,
@@ -711,6 +721,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     GRAY_CONCRETE_POWDER(7, "CONCRETE_POWDER"),
     GRAY_DYE(8, "INK_SACK"),
     GRAY_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    GRAY_HARNESS,
     GRAY_SHULKER_BOX,
     GRAY_STAINED_GLASS(7, "STAINED_GLASS"),
     GRAY_STAINED_GLASS_PANE(7, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -731,6 +743,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
      */
     GREEN_DYE(2, "INK_SACK", "CACTUS_GREEN"),
     GREEN_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    GREEN_HARNESS,
     GREEN_SHULKER_BOX,
     GREEN_STAINED_GLASS(13, "STAINED_GLASS"),
     GREEN_STAINED_GLASS_PANE(13, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -743,6 +757,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     GUSTER_BANNER_PATTERN,
     GUSTER_POTTERY_SHERD,
     HANGING_ROOTS,
+    @XInfo(since = "1.21.6")
+    HAPPY_GHAST_SPAWN_EGG,
     HAY_BLOCK,
     HEARTBREAK_POTTERY_SHERD,
     HEART_OF_THE_SEA,
@@ -856,6 +872,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     LIGHT_BLUE_CONCRETE_POWDER(3, "CONCRETE_POWDER"),
     LIGHT_BLUE_DYE(12, "INK_SACK"),
     LIGHT_BLUE_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    LIGHT_BLUE_HARNESS,
     LIGHT_BLUE_SHULKER_BOX,
     LIGHT_BLUE_STAINED_GLASS(3, "STAINED_GLASS"),
     LIGHT_BLUE_STAINED_GLASS_PANE(3, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -876,6 +894,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
      * Renamed to LIGHT_GRAY_GLAZED_TERRACOTTA in 1.14
      */
     LIGHT_GRAY_GLAZED_TERRACOTTA("SILVER_GLAZED_TERRACOTTA"),
+    @XInfo(since = "1.21.6")
+    LIGHT_GRAY_HARNESS,
     LIGHT_GRAY_SHULKER_BOX("SILVER_SHULKER_BOX"),
     LIGHT_GRAY_STAINED_GLASS(8, "STAINED_GLASS"),
     LIGHT_GRAY_STAINED_GLASS_PANE(8, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -896,6 +916,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     LIME_CONCRETE_POWDER(5, "CONCRETE_POWDER"),
     LIME_DYE(10, "INK_SACK"),
     LIME_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    LIME_HARNESS,
     LIME_SHULKER_BOX,
     LIME_STAINED_GLASS(5, "STAINED_GLASS"),
     LIME_STAINED_GLASS_PANE(5, "STAINED_GLASS_PANE"),
@@ -917,6 +939,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     MAGENTA_CONCRETE_POWDER(2, "CONCRETE_POWDER"),
     MAGENTA_DYE(13, "INK_SACK"),
     MAGENTA_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    MAGENTA_HARNESS,
     MAGENTA_SHULKER_BOX,
     MAGENTA_STAINED_GLASS(2, "STAINED_GLASS"),
     MAGENTA_STAINED_GLASS_PANE(2, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -1002,6 +1026,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     MUSIC_DISC_RELIC,
     MUSIC_DISC_STAL("RECORD_8"),
     MUSIC_DISC_STRAD("RECORD_9"),
+    @XInfo(since = "1.21.6")
+    MUSIC_DISC_TEARS,
     MUSIC_DISC_WAIT("RECORD_12"),
     MUSIC_DISC_WARD("RECORD_10"),
     MUTTON,
@@ -1077,6 +1103,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     ORANGE_CONCRETE_POWDER(1, "CONCRETE_POWDER"),
     ORANGE_DYE(14, "INK_SACK"),
     ORANGE_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    ORANGE_HARNESS,
     ORANGE_SHULKER_BOX,
     ORANGE_STAINED_GLASS(1, "STAINED_GLASS"),
     ORANGE_STAINED_GLASS_PANE(1, "STAINED_GLASS_PANE"),
@@ -1144,6 +1172,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     PINK_CONCRETE_POWDER(6, "CONCRETE_POWDER"),
     PINK_DYE(9, "INK_SACK"),
     PINK_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    PINK_HARNESS,
     PINK_PETALS,
     PINK_SHULKER_BOX,
     PINK_STAINED_GLASS(6, "STAINED_GLASS"),
@@ -1274,6 +1304,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     PURPLE_CONCRETE_POWDER(10, "CONCRETE_POWDER"),
     PURPLE_DYE(5, "INK_SACK"),
     PURPLE_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    PURPLE_HARNESS,
     PURPLE_SHULKER_BOX,
     PURPLE_STAINED_GLASS(10, "STAINED_GLASS"),
     PURPLE_STAINED_GLASS_PANE(10, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -1298,6 +1330,7 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     RAIL("RAILS"),
     RAISER_ARMOR_TRIM_SMITHING_TEMPLATE,
     RAVAGER_SPAWN_EGG,
+
     RAW_COPPER,
     RAW_COPPER_BLOCK,
     RAW_GOLD,
@@ -1328,7 +1361,6 @@ public enum XMaterial implements XBase<XMaterial, Material> {
      * Data value 14 or 0
      */
     RED_BED(supports(12) ? 14 : 0, "BED_BLOCK", "BED"),
-
     RED_BUNDLE,
     RED_CANDLE,
     RED_CANDLE_CAKE,
@@ -1339,6 +1371,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     @XChange(version = "1.13", from = "INK_SACK", to = "ROSE_RED")
     RED_DYE(1, "INK_SACK", "ROSE_RED"),
     RED_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    RED_HARNESS,
     RED_MUSHROOM,
     RED_MUSHROOM_BLOCK("RED_MUSHROOM", "HUGE_MUSHROOM_2"),
     RED_NETHER_BRICKS("RED_NETHER_BRICK"),
@@ -1703,6 +1737,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     WHITE_CONCRETE_POWDER("CONCRETE_POWDER"),
     @XInfo(since = "1.14") WHITE_DYE,
     WHITE_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    WHITE_HARNESS,
     WHITE_SHULKER_BOX,
     WHITE_STAINED_GLASS("STAINED_GLASS"),
     WHITE_STAINED_GLASS_PANE("THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -1734,6 +1770,7 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     YELLOW_BUNDLE,
     YELLOW_CANDLE,
     YELLOW_CANDLE_CAKE,
+
     YELLOW_CARPET(4, "CARPET"),
     YELLOW_CONCRETE(4, "CONCRETE"),
     YELLOW_CONCRETE_POWDER(4, "CONCRETE_POWDER"),
@@ -1743,6 +1780,8 @@ public enum XMaterial implements XBase<XMaterial, Material> {
      */
     YELLOW_DYE(11, "INK_SACK", "DANDELION_YELLOW"),
     YELLOW_GLAZED_TERRACOTTA,
+    @XInfo(since = "1.21.6")
+    YELLOW_HARNESS,
     YELLOW_SHULKER_BOX,
     YELLOW_STAINED_GLASS(4, "STAINED_GLASS"),
     YELLOW_STAINED_GLASS_PANE(4, "THIN_GLASS", "STAINED_GLASS_PANE"),
@@ -1755,7 +1794,9 @@ public enum XMaterial implements XBase<XMaterial, Material> {
     ZOMBIE_SPAWN_EGG(54, "MONSTER_EGG"),
     ZOMBIE_VILLAGER_SPAWN_EGG(27, "MONSTER_EGG"),
     ZOMBIE_WALL_HEAD(2, "SKULL", "SKULL_ITEM"),
-    ZOMBIFIED_PIGLIN_SPAWN_EGG(57, "MONSTER_EGG", "ZOMBIE_PIGMAN_SPAWN_EGG");
+    ZOMBIFIED_PIGLIN_SPAWN_EGG(57, "MONSTER_EGG", "ZOMBIE_PIGMAN_SPAWN_EGG"),
+
+    ;
 
 
     /**

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

@@ -59,7 +59,7 @@
  * play command: <a href="https://minecraft.wiki/w/Commands/play">minecraft.wiki/w</a>
  *
  * @author Crypto Morin
- * @version 11.0.0
+ * @version 11.0.1
  * @see Sound
  */
 public final class XSound extends XModule<XSound, Sound> {
@@ -1804,6 +1804,38 @@ public final class XSound extends XModule<XSound, Sound> {
             ENTITY_WOLF_SAD_PANT = std("entity.wolf_sad.pant"),
             ENTITY_WOLF_SAD_WHINE = std("entity.wolf_sad.whine");
 
+    @XInfo(since = "1.21.6")
+    public static final XSound
+            BLOCK_DRIED_GHAST_AMBIENT = std("block.dried_ghast.ambient"),
+            BLOCK_DRIED_GHAST_AMBIENT_WATER = std("block.dried_ghast.ambient_water"),
+            BLOCK_DRIED_GHAST_BREAK = std("block.dried_ghast.break"),
+            BLOCK_DRIED_GHAST_FALL = std("block.dried_ghast.fall"),
+            BLOCK_DRIED_GHAST_PLACE = std("block.dried_ghast.place"),
+            BLOCK_DRIED_GHAST_PLACE_IN_WATER = std("block.dried_ghast.place_in_water"),
+            BLOCK_DRIED_GHAST_STEP = std("block.dried_ghast.step"),
+            BLOCK_DRIED_GHAST_TRANSITION = std("block.dried_ghast.transition"),
+            BLOCK_DRY_GRASS_AMBIENT = std("block.dry_grass.ambient"),
+            ENTITY_GHASTLING_AMBIENT = std("entity.ghastling.ambient"),
+            ENTITY_GHASTLING_DEATH = std("entity.ghastling.death"),
+            ENTITY_GHASTLING_HURT = std("entity.ghastling.hurt"),
+            ENTITY_GHASTLING_SPAWN = std("entity.ghastling.spawn"),
+            ENTITY_HAPPY_GHAST_AMBIENT = std("entity.happy_ghast.ambient"),
+            ENTITY_HAPPY_GHAST_DEATH = std("entity.happy_ghast.death"),
+            ENTITY_HAPPY_GHAST_EQUIP = std("entity.happy_ghast.equip"),
+            ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = std("entity.happy_ghast.harness_goggles_down"),
+            ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = std("entity.happy_ghast.harness_goggles_up"),
+            ENTITY_HAPPY_GHAST_HURT = std("entity.happy_ghast.hurt"),
+            ENTITY_HAPPY_GHAST_RIDING = std("entity.happy_ghast.riding"),
+            ENTITY_HAPPY_GHAST_UNEQUIP = std("entity.happy_ghast.unequip"),
+            ITEM_HORSE_ARMOR_UNEQUIP = std("item.horse_armor.unequip"),
+            ITEM_LEAD_BREAK = std("item.lead.break"),
+            ITEM_LEAD_TIED = std("item.lead.tied"),
+            ITEM_LEAD_UNTIED = std("item.lead.untied"),
+            ITEM_LLAMA_CARPET_UNEQUIP = std("item.llama_carpet.unequip"),
+            ITEM_SADDLE_UNEQUIP = std("item.saddle.unequip"),
+            ITEM_SHEARS_SNIP = std("item.shears.snip"),
+            MUSIC_DISC_TEARS = std("music_disc.tears");
+
     static {
         REGISTRY.discardMetadata();
     }

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

@@ -23,7 +23,6 @@
 
 import com.cryptomorin.xseries.base.XBase;
 import org.bukkit.Material;
-import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -2537,8 +2536,10 @@ public final class XTag<T extends XBase<?, ?>> {
 
         // Spawn Eggs
         for (XMaterial spawnEgg : SPAWN_EGGS.values) {
-            XEntityType entityType = XEntityType.of(spawnEgg.name())
-                    .orElseThrow(() -> new IllegalStateException("Cannot find entity type for spawn egg: " + spawnEgg));
+            String name = spawnEgg.name().substring(0, spawnEgg.name().length() - "_SPAWN_EGG".length());
+
+            XEntityType entityType = XEntityType.of(name)
+                    .orElseThrow(() -> new IllegalStateException("Cannot find entity type for spawn egg: " + spawnEgg + " named " + name));
             MATERIAL_TO_ENTITY.put(spawnEgg, entityType);
         }
     }