22w13a

2024-12-26 16:12:42 +01:00 · 2022-03-31 18:12:06 +02:00 · 2022-03-31 18:12:06 +02:00 · 596a42e312
Commit 596a42e312
--- a/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java
@ -64,7 +64,7 @@ public interface ViaAPI<T> {
     * @return API version incremented with meaningful API changes
     */
    default int apiVersion() {
-        return 10;
+        return 11;
    }

    /**
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/Entity1_19Types.java
@ -28,196 +28,197 @@ public enum Entity1_19Types implements EntityType {

    ENTITY(-1),

-    AREA_EFFECT_CLOUD(0, ENTITY),
-    END_CRYSTAL(20, ENTITY),
-    EVOKER_FANGS(25, ENTITY),
-    EXPERIENCE_ORB(26, ENTITY),
-    EYE_OF_ENDER(27, ENTITY),
-    FALLING_BLOCK(28, ENTITY),
-    FIREWORK_ROCKET(29, ENTITY),
-    ITEM(43, ENTITY),
-    LLAMA_SPIT(49, ENTITY),
-    TNT(71, ENTITY),
-    SHULKER_BULLET(78, ENTITY),
-    FISHING_BOBBER(116, ENTITY),
+    AREA_EFFECT_CLOUD(1, ENTITY),
+    END_CRYSTAL(21, ENTITY),
+    EVOKER_FANGS(26, ENTITY),
+    EXPERIENCE_ORB(27, ENTITY),
+    EYE_OF_ENDER(28, ENTITY),
+    FALLING_BLOCK(29, ENTITY),
+    FIREWORK_ROCKET(30, ENTITY),
+    ITEM(44, ENTITY),
+    LLAMA_SPIT(50, ENTITY),
+    TNT(72, ENTITY),
+    SHULKER_BULLET(79, ENTITY),
+    FISHING_BOBBER(117, ENTITY),

    LIVINGENTITY(-1, ENTITY),
-    ARMOR_STAND(1, LIVINGENTITY),
-    MARKER(51, ENTITY),
-    PLAYER(115, LIVINGENTITY),
+    ARMOR_STAND(2, LIVINGENTITY),
+    MARKER(52, ENTITY),
+    PLAYER(116, LIVINGENTITY),

    ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
-    ENDER_DRAGON(21, ABSTRACT_INSENTIENT),
+    ENDER_DRAGON(22, ABSTRACT_INSENTIENT),

-    BEE(5, ABSTRACT_INSENTIENT),
+    BEE(6, ABSTRACT_INSENTIENT),

    ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT),

    ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE),
-    VILLAGER(101, ABSTRACT_AGEABLE),
-    WANDERING_TRADER(103, ABSTRACT_AGEABLE),
+    VILLAGER(102, ABSTRACT_AGEABLE),
+    WANDERING_TRADER(104, ABSTRACT_AGEABLE),

    // Animals
    ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE),
-    AXOLOTL(3, ABSTRACT_ANIMAL),
-    DOLPHIN(15, ABSTRACT_INSENTIENT),
-    CHICKEN(11, ABSTRACT_ANIMAL),
-    COW(13, ABSTRACT_ANIMAL),
-    MOOSHROOM(60, COW),
-    PANDA(63, ABSTRACT_INSENTIENT),
-    PIG(66, ABSTRACT_ANIMAL),
-    POLAR_BEAR(70, ABSTRACT_ANIMAL),
-    RABBIT(73, ABSTRACT_ANIMAL),
-    SHEEP(76, ABSTRACT_ANIMAL),
-    TURTLE(99, ABSTRACT_ANIMAL),
-    FOX(30, ABSTRACT_ANIMAL),
-    FROG(31, ABSTRACT_ANIMAL),
-    GOAT(36, ABSTRACT_ANIMAL),
+    AXOLOTL(4, ABSTRACT_ANIMAL),
+    DOLPHIN(16, ABSTRACT_INSENTIENT),
+    CHICKEN(12, ABSTRACT_ANIMAL),
+    COW(14, ABSTRACT_ANIMAL),
+    MOOSHROOM(61, COW),
+    PANDA(64, ABSTRACT_INSENTIENT),
+    PIG(67, ABSTRACT_ANIMAL),
+    POLAR_BEAR(71, ABSTRACT_ANIMAL),
+    RABBIT(74, ABSTRACT_ANIMAL),
+    SHEEP(77, ABSTRACT_ANIMAL),
+    TURTLE(100, ABSTRACT_ANIMAL),
+    FOX(31, ABSTRACT_ANIMAL),
+    FROG(32, ABSTRACT_ANIMAL),
+    GOAT(37, ABSTRACT_ANIMAL),

    ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL),
-    CAT(9, ABSTRACT_TAMEABLE_ANIMAL),
-    OCELOT(61, ABSTRACT_TAMEABLE_ANIMAL),
-    WOLF(109, ABSTRACT_TAMEABLE_ANIMAL),
+    CAT(10, ABSTRACT_TAMEABLE_ANIMAL),
+    OCELOT(62, ABSTRACT_TAMEABLE_ANIMAL),
+    WOLF(110, ABSTRACT_TAMEABLE_ANIMAL),

    ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL),
-    PARROT(64, ABSTRACT_PARROT),
+    PARROT(65, ABSTRACT_PARROT),

    // Horses
    ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL),
    CHESTED_HORSE(-1, ABSTRACT_HORSE),
-    DONKEY(16, CHESTED_HORSE),
-    MULE(59, CHESTED_HORSE),
-    LLAMA(48, CHESTED_HORSE),
-    TRADER_LLAMA(97, CHESTED_HORSE),
-    HORSE(39, ABSTRACT_HORSE),
-    SKELETON_HORSE(81, ABSTRACT_HORSE),
-    ZOMBIE_HORSE(112, ABSTRACT_HORSE),
+    DONKEY(17, CHESTED_HORSE),
+    MULE(60, CHESTED_HORSE),
+    LLAMA(49, CHESTED_HORSE),
+    TRADER_LLAMA(98, CHESTED_HORSE),
+    HORSE(40, ABSTRACT_HORSE),
+    SKELETON_HORSE(82, ABSTRACT_HORSE),
+    ZOMBIE_HORSE(113, ABSTRACT_HORSE),

    // Golem
    ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE),
-    SNOW_GOLEM(84, ABSTRACT_GOLEM),
-    IRON_GOLEM(42, ABSTRACT_GOLEM),
-    SHULKER(77, ABSTRACT_GOLEM),
+    SNOW_GOLEM(85, ABSTRACT_GOLEM),
+    IRON_GOLEM(43, ABSTRACT_GOLEM),
+    SHULKER(78, ABSTRACT_GOLEM),

    // Fish
    ABSTRACT_FISHES(-1, ABSTRACT_CREATURE),
-    COD(12, ABSTRACT_FISHES),
-    PUFFERFISH(72, ABSTRACT_FISHES),
-    SALMON(75, ABSTRACT_FISHES),
-    TROPICAL_FISH(98, ABSTRACT_FISHES),
+    COD(13, ABSTRACT_FISHES),
+    PUFFERFISH(73, ABSTRACT_FISHES),
+    SALMON(76, ABSTRACT_FISHES),
+    TROPICAL_FISH(99, ABSTRACT_FISHES),

    // Monsters
    ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE),
-    BLAZE(6, ABSTRACT_MONSTER),
-    CREEPER(14, ABSTRACT_MONSTER),
-    ENDERMITE(23, ABSTRACT_MONSTER),
-    ENDERMAN(22, ABSTRACT_MONSTER),
-    GIANT(33, ABSTRACT_MONSTER),
-    SILVERFISH(79, ABSTRACT_MONSTER),
-    VEX(100, ABSTRACT_MONSTER),
-    WITCH(105, ABSTRACT_MONSTER),
-    WITHER(106, ABSTRACT_MONSTER),
-    RAVAGER(74, ABSTRACT_MONSTER),
+    BLAZE(7, ABSTRACT_MONSTER),
+    CREEPER(15, ABSTRACT_MONSTER),
+    ENDERMITE(24, ABSTRACT_MONSTER),
+    ENDERMAN(23, ABSTRACT_MONSTER),
+    GIANT(34, ABSTRACT_MONSTER),
+    SILVERFISH(80, ABSTRACT_MONSTER),
+    VEX(101, ABSTRACT_MONSTER),
+    WITCH(106, ABSTRACT_MONSTER),
+    WITHER(107, ABSTRACT_MONSTER),
+    RAVAGER(75, ABSTRACT_MONSTER),

    ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER),

-    PIGLIN(67, ABSTRACT_PIGLIN),
-    PIGLIN_BRUTE(68, ABSTRACT_PIGLIN),
+    PIGLIN(68, ABSTRACT_PIGLIN),
+    PIGLIN_BRUTE(69, ABSTRACT_PIGLIN),

-    HOGLIN(38, ABSTRACT_ANIMAL),
-    STRIDER(90, ABSTRACT_ANIMAL),
-    TADPOLE(90, ABSTRACT_FISHES),
-    ZOGLIN(110, ABSTRACT_MONSTER),
-    WARDEN(104, ABSTRACT_MONSTER),
+    HOGLIN(39, ABSTRACT_ANIMAL),
+    STRIDER(91, ABSTRACT_ANIMAL),
+    TADPOLE(91, ABSTRACT_FISHES),
+    ZOGLIN(111, ABSTRACT_MONSTER),
+    WARDEN(105, ABSTRACT_MONSTER),

    // Illagers
    ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),
    ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE),
-    EVOKER(24, ABSTRACT_EVO_ILLU_ILLAGER),
-    ILLUSIONER(41, ABSTRACT_EVO_ILLU_ILLAGER),
-    VINDICATOR(102, ABSTRACT_ILLAGER_BASE),
-    PILLAGER(69, ABSTRACT_ILLAGER_BASE),
+    EVOKER(25, ABSTRACT_EVO_ILLU_ILLAGER),
+    ILLUSIONER(42, ABSTRACT_EVO_ILLU_ILLAGER),
+    VINDICATOR(103, ABSTRACT_ILLAGER_BASE),
+    PILLAGER(70, ABSTRACT_ILLAGER_BASE),

    // Skeletons
    ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER),
-    SKELETON(80, ABSTRACT_SKELETON),
-    STRAY(89, ABSTRACT_SKELETON),
-    WITHER_SKELETON(107, ABSTRACT_SKELETON),
+    SKELETON(81, ABSTRACT_SKELETON),
+    STRAY(90, ABSTRACT_SKELETON),
+    WITHER_SKELETON(108, ABSTRACT_SKELETON),

    // Guardians
-    GUARDIAN(37, ABSTRACT_MONSTER),
-    ELDER_GUARDIAN(19, GUARDIAN),
+    GUARDIAN(38, ABSTRACT_MONSTER),
+    ELDER_GUARDIAN(20, GUARDIAN),

    // Spiders
-    SPIDER(87, ABSTRACT_MONSTER),
-    CAVE_SPIDER(10, SPIDER),
+    SPIDER(88, ABSTRACT_MONSTER),
+    CAVE_SPIDER(11, SPIDER),

    // Zombies
-    ZOMBIE(111, ABSTRACT_MONSTER),
-    DROWNED(18, ZOMBIE),
-    HUSK(40, ZOMBIE),
-    ZOMBIFIED_PIGLIN(114, ZOMBIE),
-    ZOMBIE_VILLAGER(113, ZOMBIE),
+    ZOMBIE(112, ABSTRACT_MONSTER),
+    DROWNED(19, ZOMBIE),
+    HUSK(41, ZOMBIE),
+    ZOMBIFIED_PIGLIN(115, ZOMBIE),
+    ZOMBIE_VILLAGER(114, ZOMBIE),

    // Flying entities
    ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT),
-    GHAST(32, ABSTRACT_FLYING),
-    PHANTOM(65, ABSTRACT_FLYING),
+    GHAST(33, ABSTRACT_FLYING),
+    PHANTOM(66, ABSTRACT_FLYING),

    ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT),
-    BAT(4, ABSTRACT_AMBIENT),
+    BAT(5, ABSTRACT_AMBIENT),
+    ALLAY(0, ABSTRACT_CREATURE),

    ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT),
-    SQUID(88, ABSTRACT_WATERMOB),
-    GLOW_SQUID(35, SQUID),
+    SQUID(89, ABSTRACT_WATERMOB),
+    GLOW_SQUID(36, SQUID),

    // Slimes
-    SLIME(82, ABSTRACT_INSENTIENT),
-    MAGMA_CUBE(50, SLIME),
+    SLIME(83, ABSTRACT_INSENTIENT),
+    MAGMA_CUBE(51, SLIME),

    // Hangable objects
    ABSTRACT_HANGING(-1, ENTITY),
-    LEASH_KNOT(46, ABSTRACT_HANGING),
-    ITEM_FRAME(44, ABSTRACT_HANGING),
-    GLOW_ITEM_FRAME(34, ITEM_FRAME),
-    PAINTING(62, ABSTRACT_HANGING),
+    LEASH_KNOT(47, ABSTRACT_HANGING),
+    ITEM_FRAME(45, ABSTRACT_HANGING),
+    GLOW_ITEM_FRAME(35, ITEM_FRAME),
+    PAINTING(63, ABSTRACT_HANGING),

    ABSTRACT_LIGHTNING(-1, ENTITY),
-    LIGHTNING_BOLT(47, ABSTRACT_LIGHTNING),
+    LIGHTNING_BOLT(48, ABSTRACT_LIGHTNING),

    // Arrows
    ABSTRACT_ARROW(-1, ENTITY),
-    ARROW(2, ABSTRACT_ARROW),
-    SPECTRAL_ARROW(86, ABSTRACT_ARROW),
-    TRIDENT(96, ABSTRACT_ARROW),
+    ARROW(3, ABSTRACT_ARROW),
+    SPECTRAL_ARROW(87, ABSTRACT_ARROW),
+    TRIDENT(97, ABSTRACT_ARROW),

    // Fireballs
    ABSTRACT_FIREBALL(-1, ENTITY),
-    DRAGON_FIREBALL(17, ABSTRACT_FIREBALL),
-    FIREBALL(45, ABSTRACT_FIREBALL),
-    SMALL_FIREBALL(83, ABSTRACT_FIREBALL),
-    WITHER_SKULL(108, ABSTRACT_FIREBALL),
+    DRAGON_FIREBALL(18, ABSTRACT_FIREBALL),
+    FIREBALL(46, ABSTRACT_FIREBALL),
+    SMALL_FIREBALL(84, ABSTRACT_FIREBALL),
+    WITHER_SKULL(109, ABSTRACT_FIREBALL),

    // Projectiles
    PROJECTILE_ABSTRACT(-1, ENTITY),
-    SNOWBALL(85, PROJECTILE_ABSTRACT),
-    ENDER_PEARL(93, PROJECTILE_ABSTRACT),
-    EGG(92, PROJECTILE_ABSTRACT),
-    POTION(95, PROJECTILE_ABSTRACT),
-    EXPERIENCE_BOTTLE(94, PROJECTILE_ABSTRACT),
+    SNOWBALL(86, PROJECTILE_ABSTRACT),
+    ENDER_PEARL(94, PROJECTILE_ABSTRACT),
+    EGG(93, PROJECTILE_ABSTRACT),
+    POTION(96, PROJECTILE_ABSTRACT),
+    EXPERIENCE_BOTTLE(95, PROJECTILE_ABSTRACT),

    // Vehicles
    MINECART_ABSTRACT(-1, ENTITY),
    CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT),
-    CHEST_MINECART(53, CHESTED_MINECART_ABSTRACT),
-    HOPPER_MINECART(56, CHESTED_MINECART_ABSTRACT),
-    MINECART(52, MINECART_ABSTRACT),
-    FURNACE_MINECART(55, MINECART_ABSTRACT),
-    COMMAND_BLOCK_MINECART(54, MINECART_ABSTRACT),
-    TNT_MINECART(58, MINECART_ABSTRACT),
-    SPAWNER_MINECART(57, MINECART_ABSTRACT),
-    BOAT(7, ENTITY),
-    CHEST_BOAT(8, BOAT);
+    CHEST_MINECART(54, CHESTED_MINECART_ABSTRACT),
+    HOPPER_MINECART(57, CHESTED_MINECART_ABSTRACT),
+    MINECART(53, MINECART_ABSTRACT),
+    FURNACE_MINECART(56, MINECART_ABSTRACT),
+    COMMAND_BLOCK_MINECART(55, MINECART_ABSTRACT),
+    TNT_MINECART(59, MINECART_ABSTRACT),
+    SPAWNER_MINECART(58, MINECART_ABSTRACT),
+    BOAT(8, ENTITY),
+    CHEST_BOAT(9, BOAT);

    private static final EntityType[] TYPES;

--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@ -80,7 +80,7 @@ public class ProtocolVersion {
    public static final ProtocolVersion v1_17_1 = register(756, "1.17.1");
    public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1));
    public static final ProtocolVersion v1_18_2 = register(758, "1.18.2");
-    public static final ProtocolVersion v1_19 = register(759, 75, "1.19");
+    public static final ProtocolVersion v1_19 = register(759, 76, "1.19");
    public static final ProtocolVersion unknown = register(-1, "UNKNOWN");

    public static ProtocolVersion register(int version, String name) {
--- a/common/src/main/resources/assets/viaversion/data/mapping-1.19.json
+++ b/common/src/main/resources/assets/viaversion/data/mapping-1.19.json
--- a/gradle.properties
+++ b/gradle.properties
@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.3.0-22w12a-SNAPSHOT
+projectVersion=4.3.0-22w13a-SNAPSHOT

 # Gradle properties
 org.gradle.daemon=true