start implementing 24w13a

azalea-rs · mat-1 · Apr 23, 2024 · Jan 18, 2024 · Feb 26, 2024 · Mar 6, 2024
commit c1b9e1894efcaa42b470fc0f4b7379f2518c0e65
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
 
-_Currently supported Minecraft version: `24w03a`._
+_Currently supported Minecraft version: `24w13a`._
 
 > [!WARNING]
 > Azalea is still very unfinished, though most crates are in a somewhat useable state

diff --git a/azalea-block/src/generated.rs b/azalea-block/src/generated.rs
@@ -1917,14 +1917,21 @@ make_block_states! {
         },
         "cracked" => Cracked(bool),
         "crafting" => Crafting(bool),
-        "trial_spawner_state" => State {
+        "ominous" => Ominous(bool),
+        "trial_spawner_state" => TrialSpawnerState {
             Inactive,
             WaitingForPlayers,
             Active,
             WaitingForRewardEjection,
             EjectingReward,
             Cooldown,
         },
+        "vault_state" => VaultState {
+            Inactive,
+            Active,
+            Unlocking,
+            Ejecting,
+        },
     },
     Blocks => {
         air => BlockBehavior::new(), {},
@@ -5376,7 +5383,16 @@ make_block_states! {
             triggered: Triggered(false),
         },
         trial_spawner => BlockBehavior::new().requires_correct_tool_for_drops().strength(50.0, 50.0), {
-            trial_spawner_state: State::Inactive,
+            ominous: Ominous(false),
+            trial_spawner_state: TrialSpawnerState::Inactive,
+        },
+        vault => BlockBehavior::new(), {
+            facing: FacingCardinal::North,
+            ominous: Ominous(false),
+            vault_state: VaultState::Inactive,
+        },
+        heavy_core => BlockBehavior::new(), {
+            waterlogged: Waterlogged(false),
         },
     }
 }
diff --git a/azalea-core/src/particle.rs b/azalea-core/src/particle.rs
@@ -13,15 +13,21 @@ pub struct Particle {
 
 #[derive(Clone, Debug, McBuf, Default)]
 pub enum ParticleData {
-    AmbientEntityEffect,
     AngryVillager,
-    Block(BlockParticle),
     BlockMarker(BlockParticle),
+    Block(BlockParticle),
     Bubble,
+    BubbleColumnUp,
+    BubblePop,
+    CampfireCosySmoke,
+    CampfireSignalSmoke,
     Cloud,
+    Composter,
     Crit,
+    CurrentDown,
     DamageIndicator,
     DragonBreath,
+    Dolphin,
     DrippingLava,
     FallingLava,
     LandingLava,
@@ -38,72 +44,69 @@ pub enum ParticleData {
     EntityEffect,
     ExplosionEmitter,
     Explosion,
-    Gust,
-    GustEmitter,
     SonicBoom,
     FallingDust(BlockParticle),
+    Gust,
+    SmallGust,
+    GustEmitterLarge,
+    GustEmitterSmall,
     Firework,
     Fishing,
     Flame,
-    CherryLeaves,
+    Infested,
     SculkSoul,
     SculkCharge(SculkChargeParticle),
     SculkChargePop,
-    SoulFireFlame,
     Soul,
+    SoulFireFlame,
     Flash,
     HappyVillager,
-    Composter,
     Heart,
     InstantEffect,
     Item(ItemParticle),
-    Vibration(VibrationParticle),
     ItemSlime,
+    ItemCobweb,
     ItemSnowball,
     LargeSmoke,
     Lava,
     Mycelium,
+    Nautilus,
     Note,
     Poof,
     Portal,
     Rain,
     Smoke,
     WhiteSmoke,
     Sneeze,
+    Snowflake,
     Spit,
-    SquidInk,
     SweepAttack,
     TotemOfUndying,
+    SquidInk,
     Underwater,
     Splash,
     Witch,
-    BubblePop,
-    CurrentDown,
-    BubbleColumnUp,
-    Nautilus,
-    Dolphin,
-    CampfireCozySmoke,
-    CampfireSignalSmoke,
     DrippingHoney,
     FallingHoney,
     LandingHoney,
     FallingNectar,
     FallingSporeBlossom,
+    SporeBlossomAir,
     Ash,
     CrimsonSpore,
     WarpedSpore,
-    SporeBlossomAir,
     DrippingObsidianTear,
     FallingObsidianTear,
     LandingObsidianTear,
     ReversePortal,
     WhiteAsh,
     SmallFlame,
-    Snowflake,
-    DrippingDripstoneLava,
-    FallingDripstoneLava,
     DrippingDripstoneWater,
     FallingDripstoneWater,
+    CherryLeaves,
+    DrippingDripstoneLava,
+    FallingDripstoneLava,
+    Vibration(VibrationParticle),
     GlowSquidInk,
     Glow,
     WaxOn,
@@ -113,8 +116,13 @@ pub enum ParticleData {
     Shriek(ShriekParticle),
     EggCrack,
     DustPlume,
-    GustDust,
     TrialSpawnerDetection,
+    TrialSpawnerDetectionOminous,
+    VaultConnection,
+    DustPillar,
+    RaidOmen,
+    TrialOmen,
+    OminousSpawning,
 }
 
 impl From<ParticleKind> for ParticleData {
@@ -124,7 +132,6 @@ impl From<ParticleKind> for ParticleData {
         // this is mostly just here so it fails to compile when a new particle is added
         // to ParticleKind, since ParticleData has to be updated manually
         match kind {
-            ParticleKind::AmbientEntityEffect => Self::AmbientEntityEffect,
             ParticleKind::AngryVillager => Self::AngryVillager,
             ParticleKind::Block => Self::Block(BlockParticle::default()),
             ParticleKind::BlockMarker => Self::BlockMarker(BlockParticle::default()),
@@ -151,7 +158,6 @@ impl From<ParticleKind> for ParticleData {
             ParticleKind::ExplosionEmitter => Self::ExplosionEmitter,
             ParticleKind::Explosion => Self::Explosion,
             ParticleKind::Gust => Self::Gust,
-            ParticleKind::GustEmitter => Self::GustEmitter,
             ParticleKind::SonicBoom => Self::SonicBoom,
             ParticleKind::FallingDust => Self::FallingDust(BlockParticle::default()),
             ParticleKind::Firework => Self::Firework,
@@ -194,7 +200,7 @@ impl From<ParticleKind> for ParticleData {
             ParticleKind::BubbleColumnUp => Self::BubbleColumnUp,
             ParticleKind::Nautilus => Self::Nautilus,
             ParticleKind::Dolphin => Self::Dolphin,
-            ParticleKind::CampfireCosySmoke => Self::CampfireCozySmoke,
+            ParticleKind::CampfireCosySmoke => Self::CampfireCosySmoke,
             ParticleKind::CampfireSignalSmoke => Self::CampfireSignalSmoke,
             ParticleKind::DrippingHoney => Self::DrippingHoney,
             ParticleKind::FallingHoney => Self::FallingHoney,
@@ -225,8 +231,18 @@ impl From<ParticleKind> for ParticleData {
             ParticleKind::Shriek => Self::Shriek(ShriekParticle::default()),
             ParticleKind::EggCrack => Self::EggCrack,
             ParticleKind::DustPlume => Self::DustPlume,
-            ParticleKind::GustDust => Self::GustDust,
+            ParticleKind::SmallGust => Self::SmallGust,
+            ParticleKind::GustEmitterLarge => Self::GustEmitterLarge,
+            ParticleKind::GustEmitterSmall => Self::GustEmitterSmall,
+            ParticleKind::Infested => Self::Infested,
+            ParticleKind::ItemCobweb => Self::ItemCobweb,
             ParticleKind::TrialSpawnerDetection => Self::TrialSpawnerDetection,
+            ParticleKind::TrialSpawnerDetectionOminous => Self::TrialSpawnerDetectionOminous,
+            ParticleKind::VaultConnection => Self::VaultConnection,
+            ParticleKind::DustPillar => Self::DustPillar,
+            ParticleKind::OminousSpawning => Self::OminousSpawning,
+            ParticleKind::RaidOmen => Self::RaidOmen,
+            ParticleKind::TrialOmen => Self::TrialOmen,
         }
     }
 }

diff --git a/azalea-entity/src/data.rs b/azalea-entity/src/data.rs
@@ -83,11 +83,13 @@ pub enum EntityDataValue {
     OptionalBlockState(azalea_block::BlockState),
     CompoundTag(simdnbt::owned::NbtCompound),
     Particle(Particle),
+    Particles(Vec<Particle>),
     VillagerData(VillagerData),
     // 0 for absent; 1 + actual value otherwise. Used for entity IDs.
     OptionalUnsignedInt(OptionalUnsignedInt),
     Pose(Pose),
     CatVariant(azalea_registry::CatVariant),
+    WolfVariant(azalea_registry::WolfVariant),
     FrogVariant(azalea_registry::FrogVariant),
     OptionalGlobalPos(Option<GlobalPos>),
     PaintingVariant(azalea_registry::PaintingVariant),