1.21.4 support

api/build.gradle.kts

@@ -77,7 +77,7 @@ mappingCompression {
         compress("entity/wolf_variant_mappings.json")
 
         compress("item/consume_effect_type_mappings.json")
-        compress("item/item_armor_material_mappings.json")
+        compress("item/equipment_asset_mappings.json")
         compress("item/item_banner_pattern_mappings.json")
         compress("item/item_component_mappings.json")
         compress("item/item_instrument_mappings.json")

api/src/main/java/com/github/retrooper/packetevents/manager/server/ServerVersion.java

@@ -50,7 +50,7 @@ public enum ServerVersion {
     //1.20 and 1.20.1 have the same protocol version. 1.20.3 and 1.20.4 have the same protocol version. 1.20.5 and 1.20.6 have the same protocol version
     V_1_20(763), V_1_20_1(763), V_1_20_2(764), V_1_20_3(765), V_1_20_4(765), V_1_20_5(766), V_1_20_6(766),
     //1.21 and 1.21.1 have the same protocol version. 1.21.2 and 1.21.3 have the same protocol version
-    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768),
+    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768), V_1_21_4(769),
     //TODO UPDATE Add server version constant
     ERROR(-1, true);
 

api/src/main/java/com/github/retrooper/packetevents/protocol/attribute/Attributes.java

@@ -59,82 +59,298 @@ public static Attribute getById(ClientVersion version, int id) {
         return REGISTRY.getById(version, id);
     }
 
-    public static final Attribute GENERIC_ARMOR = define("armor",
+    public static final Attribute ARMOR = define("armor",
             "generic", 0d, 0d, 30d);
-    public static final Attribute GENERIC_ARMOR_TOUGHNESS = define("armor_toughness",
+    public static final Attribute ARMOR_TOUGHNESS = define("armor_toughness",
             "generic", 0d, 0d, 20d);
-    public static final Attribute GENERIC_ATTACK_DAMAGE = define("attack_damage",
+    public static final Attribute ATTACK_DAMAGE = define("attack_damage",
             "generic", 2d, 0d, 2048d);
-    public static final Attribute GENERIC_ATTACK_KNOCKBACK = define("attack_knockback",
+    public static final Attribute ATTACK_KNOCKBACK = define("attack_knockback",
             "generic", 0d, 0d, 5d);
-    public static final Attribute GENERIC_ATTACK_SPEED = define("attack_speed",
+    public static final Attribute ATTACK_SPEED = define("attack_speed",
             "generic", 4d, 0d, 1024d);
-    public static final Attribute GENERIC_FLYING_SPEED = define("flying_speed",
+    public static final Attribute FLYING_SPEED = define("flying_speed",
             "generic", 0.4d, 0d, 1024d);
-    public static final Attribute GENERIC_FOLLOW_RANGE = define("follow_range",
+    public static final Attribute FOLLOW_RANGE = define("follow_range",
             "generic", 32d, 0d, 2048d);
-    @ApiStatus.Obsolete // renamed in 1.20.5
-    public static final Attribute HORSE_JUMP_STRENGTH = define("horse.jump_strength",
-            null, 0.7d, 0d, 2d);
-    public static final Attribute GENERIC_KNOCKBACK_RESISTANCE = define("knockback_resistance",
+    public static final Attribute KNOCKBACK_RESISTANCE = define("knockback_resistance",
             "generic", 0d, 0d, 1d);
-    public static final Attribute GENERIC_LUCK = define("luck",
+    public static final Attribute LUCK = define("luck",
             "generic", 0d, -1024d, 1024d);
-    public static final Attribute GENERIC_MAX_HEALTH = define("max_health",
+    public static final Attribute MAX_HEALTH = define("max_health",
             "generic", 20d, 1d, 1024d);
-    public static final Attribute GENERIC_MOVEMENT_SPEED = define("movement_speed",
+    public static final Attribute MOVEMENT_SPEED = define("movement_speed",
             "generic", 0.7d, 0d, 1024d);
-    public static final Attribute ZOMBIE_SPAWN_REINFORCEMENTS = define("spawn_reinforcements",
+    public static final Attribute SPAWN_REINFORCEMENTS = define("spawn_reinforcements",
             "zombie", 0d, 0d, 1d);
 
-    // Added in 1.20.2
-    public static final Attribute GENERIC_MAX_ABSORPTION = define("max_absorption",
+    /**
+     * Added with 1.20.2
+     */
+    public static final Attribute MAX_ABSORPTION = define("max_absorption",
             "generic", 0d, 0d, 2048d);
 
-    // Added in 1.20.5
-    public static final Attribute PLAYER_BLOCK_BREAK_SPEED = define("block_break_speed",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute BLOCK_BREAK_SPEED = define("block_break_speed",
             "player", 1d, 0d, 1024d);
-    public static final Attribute PLAYER_BLOCK_INTERACTION_RANGE = define("block_interaction_range",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute BLOCK_INTERACTION_RANGE = define("block_interaction_range",
             "player", 4.5d, 0d, 64d);
-    public static final Attribute PLAYER_ENTITY_INTERACTION_RANGE = define("entity_interaction_range",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute ENTITY_INTERACTION_RANGE = define("entity_interaction_range",
             "player", 3d, 0d, 64d);
-    public static final Attribute GENERIC_FALL_DAMAGE_MULTIPLIER = define("fall_damage_multiplier",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute FALL_DAMAGE_MULTIPLIER = define("fall_damage_multiplier",
             "generic", 1d, 0d, 100d);
-    public static final Attribute GENERIC_GRAVITY = define("gravity",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute GRAVITY = define("gravity",
             "generic", 0.08d, -1d, 1d);
-    public static final Attribute GENERIC_JUMP_STRENGTH = define("jump_strength",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute JUMP_STRENGTH = define("jump_strength",
             "generic", 0.42d, 0d, 32d);
-    public static final Attribute GENERIC_SAFE_FALL_DISTANCE = define("safe_fall_distance",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute SAFE_FALL_DISTANCE = define("safe_fall_distance",
             "generic", 3d, 0d, 1024d);
-    public static final Attribute GENERIC_SCALE = define("scale",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute SCALE = define("scale",
             "generic", 1d, 1d / 16d, 16d);
-    public static final Attribute GENERIC_STEP_HEIGHT = define("step_height",
+    /**
+     * Added with 1.20.5
+     */
+    public static final Attribute STEP_HEIGHT = define("step_height",
             "generic", 0.6d, 0d, 10d);
 
-    // Added in 1.21
-    public static final Attribute GENERIC_BURNING_TIME = define("burning_time",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute BURNING_TIME = define("burning_time",
             "generic", 0d, 1d, 1024d);
-    public static final Attribute GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE = define("explosion_knockback_resistance",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute EXPLOSION_KNOCKBACK_RESISTANCE = define("explosion_knockback_resistance",
             "generic", 0d, 0d, 1d);
-    public static final Attribute PLAYER_MINING_EFFICIENCY = define("mining_efficiency",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute MINING_EFFICIENCY = define("mining_efficiency",
             "player", 0d, 0d, 1024d);
-    public static final Attribute GENERIC_MOVEMENT_EFFICIENCY = define("movement_efficiency",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute MOVEMENT_EFFICIENCY = define("movement_efficiency",
             "generic", 0d, 0d, 1d);
-    public static final Attribute GENERIC_OXYGEN_BONUS = define("oxygen_bonus",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute OXYGEN_BONUS = define("oxygen_bonus",
             "generic", 0d, 0d, 1024d);
-    public static final Attribute PLAYER_SNEAKING_SPEED = define("sneaking_speed",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SNEAKING_SPEED = define("sneaking_speed",
             "player", 0.3d, 0d, 1d);
-    public static final Attribute PLAYER_SUBMERGED_MINING_SPEED = define("submerged_mining_speed",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SUBMERGED_MINING_SPEED = define("submerged_mining_speed",
             "player", 0.2d, 0d, 20d);
-    public static final Attribute PLAYER_SWEEPING_DAMAGE_RATIO = define("sweeping_damage_ratio",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute SWEEPING_DAMAGE_RATIO = define("sweeping_damage_ratio",
             "player", 0d, 0d, 1d);
-    public static final Attribute GENERIC_WATER_MOVEMENT_EFFICIENCY = define("water_movement_efficiency",
+    /**
+     * Added with 1.21
+     */
+    public static final Attribute WATER_MOVEMENT_EFFICIENCY = define("water_movement_efficiency",
             "generic", 0d, 0d, 1d);
 
-    // added with 1.21.2
+    /**
+     * Added with 1.21.2
+     */
     public static final Attribute TEMPT_RANGE = define("tempt_range",
             null, 10d, 0d, 2048d);
 
+    /**
+     * This attribute has been renamed in 1.20.5 to {@link #JUMP_STRENGTH}
+     */
+    @ApiStatus.Obsolete
+    public static final Attribute HORSE_JUMP_STRENGTH = define("horse.jump_strength",
+            null, 0.7d, 0d, 2d);
+
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ARMOR = ARMOR;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ARMOR_TOUGHNESS = ARMOR_TOUGHNESS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_DAMAGE = ATTACK_DAMAGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_KNOCKBACK = ATTACK_KNOCKBACK;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_ATTACK_SPEED = ATTACK_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FLYING_SPEED = FLYING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FOLLOW_RANGE = FOLLOW_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_KNOCKBACK_RESISTANCE = KNOCKBACK_RESISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_LUCK = LUCK;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MAX_HEALTH = MAX_HEALTH;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MOVEMENT_SPEED = MOVEMENT_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute ZOMBIE_SPAWN_REINFORCEMENTS = SPAWN_REINFORCEMENTS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MAX_ABSORPTION = MAX_ABSORPTION;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_BLOCK_BREAK_SPEED = BLOCK_BREAK_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_BLOCK_INTERACTION_RANGE = BLOCK_INTERACTION_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_ENTITY_INTERACTION_RANGE = ENTITY_INTERACTION_RANGE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_FALL_DAMAGE_MULTIPLIER = FALL_DAMAGE_MULTIPLIER;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_GRAVITY = GRAVITY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_JUMP_STRENGTH = JUMP_STRENGTH;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_SAFE_FALL_DISTANCE = SAFE_FALL_DISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_SCALE = SCALE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_STEP_HEIGHT = STEP_HEIGHT;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_BURNING_TIME = BURNING_TIME;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_EXPLOSION_KNOCKBACK_RESISTANCE = EXPLOSION_KNOCKBACK_RESISTANCE;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_MINING_EFFICIENCY = MINING_EFFICIENCY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_MOVEMENT_EFFICIENCY = MOVEMENT_EFFICIENCY;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_OXYGEN_BONUS = OXYGEN_BONUS;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SNEAKING_SPEED = SNEAKING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SUBMERGED_MINING_SPEED = SUBMERGED_MINING_SPEED;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute PLAYER_SWEEPING_DAMAGE_RATIO = SWEEPING_DAMAGE_RATIO;
+    /**
+     * All attribute "type" prefixes were removed with 1.21.2
+     */
+    @Deprecated
+    public static final Attribute GENERIC_WATER_MOVEMENT_EFFICIENCY = WATER_MOVEMENT_EFFICIENCY;
+
     static {
         REGISTRY.unloadMappings();
     }

api/src/main/java/com/github/retrooper/packetevents/protocol/color/Color.java

@@ -26,6 +26,7 @@
 import com.github.retrooper.packetevents.protocol.nbt.NBTType;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.util.MathUtil;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import net.kyori.adventure.util.RGBLike;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
@@ -56,6 +57,14 @@ public Color(int rgb) {
         this((rgb >> 16) & BIT_MASK, (rgb >> 8) & BIT_MASK, rgb & BIT_MASK);
     }
 
+    public static Color read(PacketWrapper<?> wrapper) {
+        return new Color(wrapper.readInt());
+    }
+
+    public static void write(PacketWrapper<?> wrapper, Color color) {
+        wrapper.writeInt(color.asRGB());
+    }
+
     public static Color decode(NBT nbt, ClientVersion version) {
         if (nbt instanceof NBTNumber) {
             return new Color(((NBTNumber) nbt).getAsInt());

api/src/main/java/com/github/retrooper/packetevents/protocol/component/ComponentType.java

@@ -22,6 +22,9 @@
 import com.github.retrooper.packetevents.protocol.nbt.NBT;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Function;
 
 public interface ComponentType<T> extends MappedEntity {
 
@@ -33,6 +36,9 @@ public interface ComponentType<T> extends MappedEntity {
 
     NBT encode(T value, ClientVersion version);
 
+    @ApiStatus.Internal
+    <Z> ComponentType<Z> legacyMap(Function<T, Z> mapper, Function<Z, T> unmapper);
+
     interface Decoder<T> {
 
         T decode(NBT nbt, ClientVersion version);