diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2025-12-09 11:23:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-09 11:23:45 -0600 |
| commit | 84cd261118c9d1e3145d4d1751c0d22098cd8cd8 (patch) | |
| tree | f9beeb5697a4b895423ef24989044fca8afc5594 /azalea-registry/src | |
| parent | 676707aab320339b4c7406ee4f494b530f44e926 (diff) | |
| download | azalea-drasl-84cd261118c9d1e3145d4d1751c0d22098cd8cd8.tar.xz | |
1.21.11 (#273)
* run codegen for 25w44a
* 25w44a
* 25w46a
* rename ResourceLocation to Identifier per mojmap changes
* update changelog
* 1.21.11-pre1
* 1.21.11-pre2
* 1.21.11-pre3
* add AttackRange fields from pre4
* 1.21.11-rc3
* 1.21.11
Diffstat (limited to 'azalea-registry/src')
| -rw-r--r-- | azalea-registry/src/data.rs | 5 | ||||
| -rw-r--r-- | azalea-registry/src/lib.rs | 432 | ||||
| -rw-r--r-- | azalea-registry/src/tags/blocks.rs | 11 | ||||
| -rw-r--r-- | azalea-registry/src/tags/entities.rs | 63 | ||||
| -rw-r--r-- | azalea-registry/src/tags/items.rs | 137 |
5 files changed, 545 insertions, 103 deletions
diff --git a/azalea-registry/src/data.rs b/azalea-registry/src/data.rs index c1c1efe5..5355ac01 100644 --- a/azalea-registry/src/data.rs +++ b/azalea-registry/src/data.rs @@ -54,6 +54,10 @@ macro_rules! data_registry { }; } +// TODO: these should be represented as an enum with like a "Custom(u32)" +// variant, this is necessary to have a correct `impl DefaultableComponent for +// DamageType` + data_registry! {Enchantment, "enchantment"} data_registry! {DimensionType, "dimension_type"} data_registry! {DamageKind, "damage_kind"} @@ -68,6 +72,7 @@ data_registry! {CatVariant, "cat_variant"} data_registry! {PigVariant, "pig_variant"} data_registry! {PaintingVariant, "painting_variant"} data_registry! {WolfVariant, "wolf_variant"} +data_registry! {ZombieNautilusVariant, "zombie_nautilus_variant"} data_registry! { /// An opaque biome identifier. diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index b16e572b..42950167 100644 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -179,8 +179,8 @@ impl<D: Registry, Identifier: AzaleaRead + AzaleaWrite> Default for HolderSet<D, } } -/// A reference to either a registry or a custom value (usually something with a -/// Identifier). +/// A reference to either a registry or a custom value (usually something with +/// an `Identifier`). pub enum Holder<R: Registry, Direct: AzaleaRead + AzaleaWrite> { Reference(R), Direct(Direct), @@ -1686,6 +1686,7 @@ enum CustomStat { AviateOneCm => "minecraft:aviate_one_cm", SwimOneCm => "minecraft:swim_one_cm", StriderOneCm => "minecraft:strider_one_cm", + NautilusOneCm => "minecraft:nautilus_one_cm", Jump => "minecraft:jump", Drop => "minecraft:drop", DamageDealt => "minecraft:damage_dealt", @@ -1766,6 +1767,7 @@ enum EntityKind { Breeze => "minecraft:breeze", BreezeWindCharge => "minecraft:breeze_wind_charge", Camel => "minecraft:camel", + CamelHusk => "minecraft:camel_husk", Cat => "minecraft:cat", CaveSpider => "minecraft:cave_spider", CherryBoat => "minecraft:cherry_boat", @@ -1833,6 +1835,7 @@ enum EntityKind { Minecart => "minecraft:minecart", Mooshroom => "minecraft:mooshroom", Mule => "minecraft:mule", + Nautilus => "minecraft:nautilus", OakBoat => "minecraft:oak_boat", OakChestBoat => "minecraft:oak_chest_boat", Ocelot => "minecraft:ocelot", @@ -1841,6 +1844,7 @@ enum EntityKind { PaleOakBoat => "minecraft:pale_oak_boat", PaleOakChestBoat => "minecraft:pale_oak_chest_boat", Panda => "minecraft:panda", + Parched => "minecraft:parched", Parrot => "minecraft:parrot", Phantom => "minecraft:phantom", Pig => "minecraft:pig", @@ -1895,6 +1899,7 @@ enum EntityKind { Zoglin => "minecraft:zoglin", Zombie => "minecraft:zombie", ZombieHorse => "minecraft:zombie_horse", + ZombieNautilus => "minecraft:zombie_nautilus", ZombieVillager => "minecraft:zombie_villager", ZombifiedPiglin => "minecraft:zombified_piglin", Player => "minecraft:player", @@ -3150,89 +3155,93 @@ enum Item { Cauldron => "minecraft:cauldron", EnderEye => "minecraft:ender_eye", GlisteringMelonSlice => "minecraft:glistering_melon_slice", - ArmadilloSpawnEgg => "minecraft:armadillo_spawn_egg", - AllaySpawnEgg => "minecraft:allay_spawn_egg", - AxolotlSpawnEgg => "minecraft:axolotl_spawn_egg", - BatSpawnEgg => "minecraft:bat_spawn_egg", - BeeSpawnEgg => "minecraft:bee_spawn_egg", - BlazeSpawnEgg => "minecraft:blaze_spawn_egg", - BoggedSpawnEgg => "minecraft:bogged_spawn_egg", - BreezeSpawnEgg => "minecraft:breeze_spawn_egg", - CatSpawnEgg => "minecraft:cat_spawn_egg", - CamelSpawnEgg => "minecraft:camel_spawn_egg", - CaveSpiderSpawnEgg => "minecraft:cave_spider_spawn_egg", ChickenSpawnEgg => "minecraft:chicken_spawn_egg", - CodSpawnEgg => "minecraft:cod_spawn_egg", - CopperGolemSpawnEgg => "minecraft:copper_golem_spawn_egg", CowSpawnEgg => "minecraft:cow_spawn_egg", - CreeperSpawnEgg => "minecraft:creeper_spawn_egg", - DolphinSpawnEgg => "minecraft:dolphin_spawn_egg", + PigSpawnEgg => "minecraft:pig_spawn_egg", + SheepSpawnEgg => "minecraft:sheep_spawn_egg", + CamelSpawnEgg => "minecraft:camel_spawn_egg", DonkeySpawnEgg => "minecraft:donkey_spawn_egg", - DrownedSpawnEgg => "minecraft:drowned_spawn_egg", - ElderGuardianSpawnEgg => "minecraft:elder_guardian_spawn_egg", - EnderDragonSpawnEgg => "minecraft:ender_dragon_spawn_egg", - EndermanSpawnEgg => "minecraft:enderman_spawn_egg", - EndermiteSpawnEgg => "minecraft:endermite_spawn_egg", - EvokerSpawnEgg => "minecraft:evoker_spawn_egg", + HorseSpawnEgg => "minecraft:horse_spawn_egg", + MuleSpawnEgg => "minecraft:mule_spawn_egg", + CatSpawnEgg => "minecraft:cat_spawn_egg", + ParrotSpawnEgg => "minecraft:parrot_spawn_egg", + WolfSpawnEgg => "minecraft:wolf_spawn_egg", + ArmadilloSpawnEgg => "minecraft:armadillo_spawn_egg", + BatSpawnEgg => "minecraft:bat_spawn_egg", + BeeSpawnEgg => "minecraft:bee_spawn_egg", FoxSpawnEgg => "minecraft:fox_spawn_egg", - FrogSpawnEgg => "minecraft:frog_spawn_egg", - GhastSpawnEgg => "minecraft:ghast_spawn_egg", - HappyGhastSpawnEgg => "minecraft:happy_ghast_spawn_egg", - GlowSquidSpawnEgg => "minecraft:glow_squid_spawn_egg", GoatSpawnEgg => "minecraft:goat_spawn_egg", - GuardianSpawnEgg => "minecraft:guardian_spawn_egg", - HoglinSpawnEgg => "minecraft:hoglin_spawn_egg", - HorseSpawnEgg => "minecraft:horse_spawn_egg", - HuskSpawnEgg => "minecraft:husk_spawn_egg", - IronGolemSpawnEgg => "minecraft:iron_golem_spawn_egg", LlamaSpawnEgg => "minecraft:llama_spawn_egg", - MagmaCubeSpawnEgg => "minecraft:magma_cube_spawn_egg", - MooshroomSpawnEgg => "minecraft:mooshroom_spawn_egg", - MuleSpawnEgg => "minecraft:mule_spawn_egg", OcelotSpawnEgg => "minecraft:ocelot_spawn_egg", PandaSpawnEgg => "minecraft:panda_spawn_egg", - ParrotSpawnEgg => "minecraft:parrot_spawn_egg", - PhantomSpawnEgg => "minecraft:phantom_spawn_egg", - PigSpawnEgg => "minecraft:pig_spawn_egg", - PiglinSpawnEgg => "minecraft:piglin_spawn_egg", - PiglinBruteSpawnEgg => "minecraft:piglin_brute_spawn_egg", - PillagerSpawnEgg => "minecraft:pillager_spawn_egg", PolarBearSpawnEgg => "minecraft:polar_bear_spawn_egg", - PufferfishSpawnEgg => "minecraft:pufferfish_spawn_egg", RabbitSpawnEgg => "minecraft:rabbit_spawn_egg", - RavagerSpawnEgg => "minecraft:ravager_spawn_egg", + AxolotlSpawnEgg => "minecraft:axolotl_spawn_egg", + CodSpawnEgg => "minecraft:cod_spawn_egg", + DolphinSpawnEgg => "minecraft:dolphin_spawn_egg", + FrogSpawnEgg => "minecraft:frog_spawn_egg", + GlowSquidSpawnEgg => "minecraft:glow_squid_spawn_egg", + NautilusSpawnEgg => "minecraft:nautilus_spawn_egg", + PufferfishSpawnEgg => "minecraft:pufferfish_spawn_egg", SalmonSpawnEgg => "minecraft:salmon_spawn_egg", - SheepSpawnEgg => "minecraft:sheep_spawn_egg", - ShulkerSpawnEgg => "minecraft:shulker_spawn_egg", - SilverfishSpawnEgg => "minecraft:silverfish_spawn_egg", - SkeletonSpawnEgg => "minecraft:skeleton_spawn_egg", - SkeletonHorseSpawnEgg => "minecraft:skeleton_horse_spawn_egg", - SlimeSpawnEgg => "minecraft:slime_spawn_egg", - SnifferSpawnEgg => "minecraft:sniffer_spawn_egg", - SnowGolemSpawnEgg => "minecraft:snow_golem_spawn_egg", - SpiderSpawnEgg => "minecraft:spider_spawn_egg", SquidSpawnEgg => "minecraft:squid_spawn_egg", - StraySpawnEgg => "minecraft:stray_spawn_egg", - StriderSpawnEgg => "minecraft:strider_spawn_egg", TadpoleSpawnEgg => "minecraft:tadpole_spawn_egg", - TraderLlamaSpawnEgg => "minecraft:trader_llama_spawn_egg", TropicalFishSpawnEgg => "minecraft:tropical_fish_spawn_egg", TurtleSpawnEgg => "minecraft:turtle_spawn_egg", - VexSpawnEgg => "minecraft:vex_spawn_egg", + AllaySpawnEgg => "minecraft:allay_spawn_egg", + MooshroomSpawnEgg => "minecraft:mooshroom_spawn_egg", + SnifferSpawnEgg => "minecraft:sniffer_spawn_egg", + CopperGolemSpawnEgg => "minecraft:copper_golem_spawn_egg", + IronGolemSpawnEgg => "minecraft:iron_golem_spawn_egg", + SnowGolemSpawnEgg => "minecraft:snow_golem_spawn_egg", + TraderLlamaSpawnEgg => "minecraft:trader_llama_spawn_egg", VillagerSpawnEgg => "minecraft:villager_spawn_egg", - VindicatorSpawnEgg => "minecraft:vindicator_spawn_egg", WanderingTraderSpawnEgg => "minecraft:wandering_trader_spawn_egg", - WardenSpawnEgg => "minecraft:warden_spawn_egg", - WitchSpawnEgg => "minecraft:witch_spawn_egg", + BoggedSpawnEgg => "minecraft:bogged_spawn_egg", + CamelHuskSpawnEgg => "minecraft:camel_husk_spawn_egg", + DrownedSpawnEgg => "minecraft:drowned_spawn_egg", + HuskSpawnEgg => "minecraft:husk_spawn_egg", + ParchedSpawnEgg => "minecraft:parched_spawn_egg", + SkeletonSpawnEgg => "minecraft:skeleton_spawn_egg", + SkeletonHorseSpawnEgg => "minecraft:skeleton_horse_spawn_egg", + StraySpawnEgg => "minecraft:stray_spawn_egg", WitherSpawnEgg => "minecraft:wither_spawn_egg", WitherSkeletonSpawnEgg => "minecraft:wither_skeleton_spawn_egg", - WolfSpawnEgg => "minecraft:wolf_spawn_egg", - ZoglinSpawnEgg => "minecraft:zoglin_spawn_egg", - CreakingSpawnEgg => "minecraft:creaking_spawn_egg", ZombieSpawnEgg => "minecraft:zombie_spawn_egg", ZombieHorseSpawnEgg => "minecraft:zombie_horse_spawn_egg", + ZombieNautilusSpawnEgg => "minecraft:zombie_nautilus_spawn_egg", ZombieVillagerSpawnEgg => "minecraft:zombie_villager_spawn_egg", + CaveSpiderSpawnEgg => "minecraft:cave_spider_spawn_egg", + SpiderSpawnEgg => "minecraft:spider_spawn_egg", + BreezeSpawnEgg => "minecraft:breeze_spawn_egg", + CreakingSpawnEgg => "minecraft:creaking_spawn_egg", + CreeperSpawnEgg => "minecraft:creeper_spawn_egg", + ElderGuardianSpawnEgg => "minecraft:elder_guardian_spawn_egg", + GuardianSpawnEgg => "minecraft:guardian_spawn_egg", + PhantomSpawnEgg => "minecraft:phantom_spawn_egg", + SilverfishSpawnEgg => "minecraft:silverfish_spawn_egg", + SlimeSpawnEgg => "minecraft:slime_spawn_egg", + WardenSpawnEgg => "minecraft:warden_spawn_egg", + WitchSpawnEgg => "minecraft:witch_spawn_egg", + EvokerSpawnEgg => "minecraft:evoker_spawn_egg", + PillagerSpawnEgg => "minecraft:pillager_spawn_egg", + RavagerSpawnEgg => "minecraft:ravager_spawn_egg", + VindicatorSpawnEgg => "minecraft:vindicator_spawn_egg", + VexSpawnEgg => "minecraft:vex_spawn_egg", + BlazeSpawnEgg => "minecraft:blaze_spawn_egg", + GhastSpawnEgg => "minecraft:ghast_spawn_egg", + HappyGhastSpawnEgg => "minecraft:happy_ghast_spawn_egg", + HoglinSpawnEgg => "minecraft:hoglin_spawn_egg", + MagmaCubeSpawnEgg => "minecraft:magma_cube_spawn_egg", + PiglinSpawnEgg => "minecraft:piglin_spawn_egg", + PiglinBruteSpawnEgg => "minecraft:piglin_brute_spawn_egg", + StriderSpawnEgg => "minecraft:strider_spawn_egg", + ZoglinSpawnEgg => "minecraft:zoglin_spawn_egg", ZombifiedPiglinSpawnEgg => "minecraft:zombified_piglin_spawn_egg", + EnderDragonSpawnEgg => "minecraft:ender_dragon_spawn_egg", + EndermanSpawnEgg => "minecraft:enderman_spawn_egg", + EndermiteSpawnEgg => "minecraft:endermite_spawn_egg", + ShulkerSpawnEgg => "minecraft:shulker_spawn_egg", ExperienceBottle => "minecraft:experience_bottle", FireCharge => "minecraft:fire_charge", WindCharge => "minecraft:wind_charge", @@ -3275,6 +3284,7 @@ enum Item { IronHorseArmor => "minecraft:iron_horse_armor", GoldenHorseArmor => "minecraft:golden_horse_armor", DiamondHorseArmor => "minecraft:diamond_horse_armor", + NetheriteHorseArmor => "minecraft:netherite_horse_armor", LeatherHorseArmor => "minecraft:leather_horse_armor", Lead => "minecraft:lead", NameTag => "minecraft:name_tag", @@ -3311,6 +3321,13 @@ enum Item { TippedArrow => "minecraft:tipped_arrow", LingeringPotion => "minecraft:lingering_potion", Shield => "minecraft:shield", + WoodenSpear => "minecraft:wooden_spear", + StoneSpear => "minecraft:stone_spear", + CopperSpear => "minecraft:copper_spear", + IronSpear => "minecraft:iron_spear", + GoldenSpear => "minecraft:golden_spear", + DiamondSpear => "minecraft:diamond_spear", + NetheriteSpear => "minecraft:netherite_spear", TotemOfUndying => "minecraft:totem_of_undying", ShulkerShell => "minecraft:shulker_shell", IronNugget => "minecraft:iron_nugget", @@ -3341,6 +3358,11 @@ enum Item { DiscFragment5 => "minecraft:disc_fragment_5", Trident => "minecraft:trident", NautilusShell => "minecraft:nautilus_shell", + IronNautilusArmor => "minecraft:iron_nautilus_armor", + GoldenNautilusArmor => "minecraft:golden_nautilus_armor", + DiamondNautilusArmor => "minecraft:diamond_nautilus_armor", + NetheriteNautilusArmor => "minecraft:netherite_nautilus_armor", + CopperNautilusArmor => "minecraft:copper_nautilus_armor", HeartOfTheSea => "minecraft:heart_of_the_sea", Crossbow => "minecraft:crossbow", SuspiciousStew => "minecraft:suspicious_stew", @@ -3577,6 +3599,7 @@ enum LootFunctionKind { ToggleTooltips => "minecraft:toggle_tooltips", SetOminousBottleAmplifier => "minecraft:set_ominous_bottle_amplifier", SetCustomModelData => "minecraft:set_custom_model_data", + Discard => "minecraft:discard", } } @@ -3605,6 +3628,7 @@ enum LootPoolEntryKind { LootTable => "minecraft:loot_table", Dynamic => "minecraft:dynamic", Tag => "minecraft:tag", + Slots => "minecraft:slots", Alternatives => "minecraft:alternatives", Sequence => "minecraft:sequence", Group => "minecraft:group", @@ -3677,6 +3701,13 @@ enum MemoryModuleKind { VisitedBlockPositions => "minecraft:visited_block_positions", UnreachableTransportBlockPositions => "minecraft:unreachable_transport_block_positions", TransportItemsCooldownTicks => "minecraft:transport_items_cooldown_ticks", + ChargeCooldownTicks => "minecraft:charge_cooldown_ticks", + AttackTargetCooldown => "minecraft:attack_target_cooldown", + SpearFleeingTime => "minecraft:spear_fleeing_time", + SpearFleeingPosition => "minecraft:spear_fleeing_position", + SpearChargePosition => "minecraft:spear_charge_position", + SpearEngageTime => "minecraft:spear_engage_time", + SpearStatus => "minecraft:spear_status", AngryAt => "minecraft:angry_at", UniversalAnger => "minecraft:universal_anger", AdmiringItem => "minecraft:admiring_item", @@ -3774,6 +3805,7 @@ enum MobEffect { Weaving => "minecraft:weaving", Oozing => "minecraft:oozing", Infested => "minecraft:infested", + BreathOfTheNautilus => "minecraft:breath_of_the_nautilus", } } @@ -4040,15 +4072,6 @@ enum RuleTest { } registry! { -enum Schedule { - Empty => "minecraft:empty", - Simple => "minecraft:simple", - VillagerBaby => "minecraft:villager_baby", - VillagerDefault => "minecraft:villager_default", -} -} - -registry! { enum SensorKind { Dummy => "minecraft:dummy", NearestItems => "minecraft:nearest_items", @@ -4067,16 +4090,12 @@ enum SensorKind { NearestAdult => "minecraft:nearest_adult", NearestAdultAnyType => "minecraft:nearest_adult_any_type", AxolotlAttackables => "minecraft:axolotl_attackables", - AxolotlTemptations => "minecraft:axolotl_temptations", - GoatTemptations => "minecraft:goat_temptations", + FoodTemptations => "minecraft:food_temptations", FrogTemptations => "minecraft:frog_temptations", - CamelTemptations => "minecraft:camel_temptations", - ArmadilloTemptations => "minecraft:armadillo_temptations", - HappyGhastTemptations => "minecraft:happy_ghast_temptations", + NautilusTemptations => "minecraft:nautilus_temptations", FrogAttackables => "minecraft:frog_attackables", IsInWater => "minecraft:is_in_water", WardenEntitySensor => "minecraft:warden_entity_sensor", - SnifferTemptations => "minecraft:sniffer_temptations", BreezeAttackEntitySensor => "minecraft:breeze_attack_entity_sensor", } } @@ -4166,6 +4185,8 @@ enum SoundEvent { ItemArmorEquipTurtle => "minecraft:item.armor.equip_turtle", ItemArmorEquipWolf => "minecraft:item.armor.equip_wolf", ItemArmorUnequipWolf => "minecraft:item.armor.unequip_wolf", + ItemArmorEquipNautilus => "minecraft:item.armor.equip_nautilus", + ItemArmorUnequipNautilus => "minecraft:item.armor.unequip_nautilus", EntityArmorStandBreak => "minecraft:entity.armor_stand.break", EntityArmorStandFall => "minecraft:entity.armor_stand.fall", EntityArmorStandHit => "minecraft:entity.armor_stand.hit", @@ -4193,6 +4214,15 @@ enum SoundEvent { BlockAzaleaLeavesHit => "minecraft:block.azalea_leaves.hit", BlockAzaleaLeavesPlace => "minecraft:block.azalea_leaves.place", BlockAzaleaLeavesStep => "minecraft:block.azalea_leaves.step", + EntityBabyNautilusAmbient => "minecraft:entity.baby_nautilus.ambient", + EntityBabyNautilusAmbientLand => "minecraft:entity.baby_nautilus.ambient_land", + EntityBabyNautilusDeath => "minecraft:entity.baby_nautilus.death", + EntityBabyNautilusDeathLand => "minecraft:entity.baby_nautilus.death_land", + EntityBabyNautilusEat => "minecraft:entity.baby_nautilus.eat", + EntityBabyNautilusHurt => "minecraft:entity.baby_nautilus.hurt", + EntityBabyNautilusHurtLand => "minecraft:entity.baby_nautilus.hurt_land", + EntityNautilusRiding => "minecraft:entity.nautilus.riding", + EntityBabyNautilusSwim => "minecraft:entity.baby_nautilus.swim", BlockBambooBreak => "minecraft:block.bamboo.break", BlockBambooFall => "minecraft:block.bamboo.fall", BlockBambooHit => "minecraft:block.bamboo.hit", @@ -4323,6 +4353,17 @@ enum SoundEvent { BlockCalcitePlace => "minecraft:block.calcite.place", BlockCalciteHit => "minecraft:block.calcite.hit", BlockCalciteFall => "minecraft:block.calcite.fall", + EntityCamelHuskAmbient => "minecraft:entity.camel_husk.ambient", + EntityCamelHuskDash => "minecraft:entity.camel_husk.dash", + EntityCamelHuskDashReady => "minecraft:entity.camel_husk.dash_ready", + EntityCamelHuskDeath => "minecraft:entity.camel_husk.death", + EntityCamelHuskEat => "minecraft:entity.camel_husk.eat", + EntityCamelHuskHurt => "minecraft:entity.camel_husk.hurt", + EntityCamelHuskSaddle => "minecraft:entity.camel_husk.saddle", + EntityCamelHuskSit => "minecraft:entity.camel_husk.sit", + EntityCamelHuskStand => "minecraft:entity.camel_husk.stand", + EntityCamelHuskStep => "minecraft:entity.camel_husk.step", + EntityCamelHuskStepSand => "minecraft:entity.camel_husk.step_sand", EntityCamelAmbient => "minecraft:entity.camel.ambient", EntityCamelDash => "minecraft:entity.camel.dash", EntityCamelDashReady => "minecraft:entity.camel.dash_ready", @@ -4980,6 +5021,9 @@ enum SoundEvent { BlockLodestoneHit => "minecraft:block.lodestone.hit", BlockLodestoneFall => "minecraft:block.lodestone.fall", ItemLodestoneCompassLock => "minecraft:item.lodestone_compass.lock", + ItemSpearLunge1 => "minecraft:item.spear.lunge_1", + ItemSpearLunge2 => "minecraft:item.spear.lunge_2", + ItemSpearLunge3 => "minecraft:item.spear.lunge_3", ItemMaceSmashAir => "minecraft:item.mace.smash_air", ItemMaceSmashGround => "minecraft:item.mace.smash_ground", ItemMaceSmashGroundHeavy => "minecraft:item.mace.smash_ground_heavy", @@ -5100,6 +5144,18 @@ enum SoundEvent { MusicOverworldSparseJungle => "minecraft:music.overworld.sparse_jungle", MusicOverworldBambooJungle => "minecraft:music.overworld.bamboo_jungle", MusicUnderWater => "minecraft:music.under_water", + EntityNautilusAmbient => "minecraft:entity.nautilus.ambient", + EntityNautilusAmbientLand => "minecraft:entity.nautilus.ambient_land", + EntityNautilusDash => "minecraft:entity.nautilus.dash", + EntityNautilusDashLand => "minecraft:entity.nautilus.dash_land", + EntityNautilusDashReady => "minecraft:entity.nautilus.dash_ready", + EntityNautilusDashReadyLand => "minecraft:entity.nautilus.dash_ready_land", + EntityNautilusDeath => "minecraft:entity.nautilus.death", + EntityNautilusDeathLand => "minecraft:entity.nautilus.death_land", + EntityNautilusEat => "minecraft:entity.nautilus.eat", + EntityNautilusHurt => "minecraft:entity.nautilus.hurt", + EntityNautilusHurtLand => "minecraft:entity.nautilus.hurt_land", + EntityNautilusSwim => "minecraft:entity.nautilus.swim", BlockNetherBricksBreak => "minecraft:block.nether_bricks.break", BlockNetherBricksStep => "minecraft:block.nether_bricks.step", BlockNetherBricksPlace => "minecraft:block.nether_bricks.place", @@ -5208,6 +5264,10 @@ enum SoundEvent { EntityPandaWorriedAmbient => "minecraft:entity.panda.worried_ambient", EntityPandaHurt => "minecraft:entity.panda.hurt", EntityPandaBite => "minecraft:entity.panda.bite", + EntityParchedAmbient => "minecraft:entity.parched.ambient", + EntityParchedDeath => "minecraft:entity.parched.death", + EntityParchedHurt => "minecraft:entity.parched.hurt", + EntityParchedStep => "minecraft:entity.parched.step", EntityParrotAmbient => "minecraft:entity.parrot.ambient", EntityParrotDeath => "minecraft:entity.parrot.death", EntityParrotEat => "minecraft:entity.parrot.eat", @@ -5216,6 +5276,7 @@ enum SoundEvent { EntityParrotImitateBlaze => "minecraft:entity.parrot.imitate.blaze", EntityParrotImitateBogged => "minecraft:entity.parrot.imitate.bogged", EntityParrotImitateBreeze => "minecraft:entity.parrot.imitate.breeze", + EntityParrotImitateCamelHusk => "minecraft:entity.parrot.imitate.camel_husk", EntityParrotImitateCreaking => "minecraft:entity.parrot.imitate.creaking", EntityParrotImitateCreeper => "minecraft:entity.parrot.imitate.creeper", EntityParrotImitateDrowned => "minecraft:entity.parrot.imitate.drowned", @@ -5230,6 +5291,7 @@ enum SoundEvent { EntityParrotImitateIllusioner => "minecraft:entity.parrot.imitate.illusioner", EntityParrotImitateMagmaCube => "minecraft:entity.parrot.imitate.magma_cube", EntityParrotImitatePhantom => "minecraft:entity.parrot.imitate.phantom", + EntityParrotImitateParched => "minecraft:entity.parrot.imitate.parched", EntityParrotImitatePiglin => "minecraft:entity.parrot.imitate.piglin", EntityParrotImitatePiglinBrute => "minecraft:entity.parrot.imitate.piglin_brute", EntityParrotImitatePillager => "minecraft:entity.parrot.imitate.pillager", @@ -5248,6 +5310,8 @@ enum SoundEvent { EntityParrotImitateWitherSkeleton => "minecraft:entity.parrot.imitate.wither_skeleton", EntityParrotImitateZoglin => "minecraft:entity.parrot.imitate.zoglin", EntityParrotImitateZombie => "minecraft:entity.parrot.imitate.zombie", + EntityParrotImitateZombieHorse => "minecraft:entity.parrot.imitate.zombie_horse", + EntityParrotImitateZombieNautilus => "minecraft:entity.parrot.imitate.zombie_nautilus", EntityParrotImitateZombieVillager => "minecraft:entity.parrot.imitate.zombie_villager", EntityParrotStep => "minecraft:entity.parrot.step", EntityPhantomAmbient => "minecraft:entity.phantom.ambient", @@ -5355,6 +5419,15 @@ enum SoundEvent { BlockNetherOrePlace => "minecraft:block.nether_ore.place", BlockNetherOreStep => "minecraft:block.nether_ore.step", BlockRedstoneTorchBurnout => "minecraft:block.redstone_torch.burnout", + BlockResinBreak => "minecraft:block.resin.break", + BlockResinFall => "minecraft:block.resin.fall", + BlockResinPlace => "minecraft:block.resin.place", + BlockResinStep => "minecraft:block.resin.step", + BlockResinBricksBreak => "minecraft:block.resin_bricks.break", + BlockResinBricksFall => "minecraft:block.resin_bricks.fall", + BlockResinBricksHit => "minecraft:block.resin_bricks.hit", + BlockResinBricksPlace => "minecraft:block.resin_bricks.place", + BlockResinBricksStep => "minecraft:block.resin_bricks.step", BlockRespawnAnchorAmbient => "minecraft:block.respawn_anchor.ambient", BlockRespawnAnchorCharge => "minecraft:block.respawn_anchor.charge", BlockRespawnAnchorDeplete => "minecraft:block.respawn_anchor.deplete", @@ -5498,15 +5571,12 @@ enum SoundEvent { BlockSpawnerHit => "minecraft:block.spawner.hit", BlockSpawnerPlace => "minecraft:block.spawner.place", BlockSpawnerStep => "minecraft:block.spawner.step", - BlockResinBreak => "minecraft:block.resin.break", - BlockResinFall => "minecraft:block.resin.fall", - BlockResinPlace => "minecraft:block.resin.place", - BlockResinStep => "minecraft:block.resin.step", - BlockResinBricksBreak => "minecraft:block.resin_bricks.break", - BlockResinBricksFall => "minecraft:block.resin_bricks.fall", - BlockResinBricksHit => "minecraft:block.resin_bricks.hit", - BlockResinBricksPlace => "minecraft:block.resin_bricks.place", - BlockResinBricksStep => "minecraft:block.resin_bricks.step", + ItemSpearUse => "minecraft:item.spear.use", + ItemSpearHit => "minecraft:item.spear.hit", + ItemSpearAttack => "minecraft:item.spear.attack", + ItemSpearWoodUse => "minecraft:item.spear_wood.use", + ItemSpearWoodHit => "minecraft:item.spear_wood.hit", + ItemSpearWoodAttack => "minecraft:item.spear_wood.attack", BlockSporeBlossomBreak => "minecraft:block.spore_blossom.break", BlockSporeBlossomFall => "minecraft:block.spore_blossom.fall", BlockSporeBlossomHit => "minecraft:block.spore_blossom.hit", @@ -5839,10 +5909,24 @@ enum SoundEvent { EntityZombieDeath => "minecraft:entity.zombie.death", EntityZombieDestroyEgg => "minecraft:entity.zombie.destroy_egg", EntityZombieHorseAmbient => "minecraft:entity.zombie_horse.ambient", + EntityZombieHorseAngry => "minecraft:entity.zombie_horse.angry", EntityZombieHorseDeath => "minecraft:entity.zombie_horse.death", + EntityZombieHorseEat => "minecraft:entity.zombie_horse.eat", EntityZombieHorseHurt => "minecraft:entity.zombie_horse.hurt", EntityZombieHurt => "minecraft:entity.zombie.hurt", EntityZombieInfect => "minecraft:entity.zombie.infect", + EntityZombieNautilusAmbient => "minecraft:entity.zombie_nautilus.ambient", + EntityZombieNautilusAmbientLand => "minecraft:entity.zombie_nautilus.ambient_land", + EntityZombieNautilusDash => "minecraft:entity.zombie_nautilus.dash", + EntityZombieNautilusDashLand => "minecraft:entity.zombie_nautilus.dash_land", + EntityZombieNautilusDashReady => "minecraft:entity.zombie_nautilus.dash_ready", + EntityZombieNautilusDashReadyLand => "minecraft:entity.zombie_nautilus.dash_ready_land", + EntityZombieNautilusDeath => "minecraft:entity.zombie_nautilus.death", + EntityZombieNautilusDeathLand => "minecraft:entity.zombie_nautilus.death_land", + EntityZombieNautilusEat => "minecraft:entity.zombie_nautilus.eat", + EntityZombieNautilusHurt => "minecraft:entity.zombie_nautilus.hurt", + EntityZombieNautilusHurtLand => "minecraft:entity.zombie_nautilus.hurt_land", + EntityZombieNautilusSwim => "minecraft:entity.zombie_nautilus.swim", EntityZombifiedPiglinAmbient => "minecraft:entity.zombified_piglin.ambient", EntityZombifiedPiglinAngry => "minecraft:entity.zombified_piglin.angry", EntityZombifiedPiglinDeath => "minecraft:entity.zombified_piglin.death", @@ -5858,6 +5942,8 @@ enum SoundEvent { EventMobEffectTrialOmen => "minecraft:event.mob_effect.trial_omen", EventMobEffectRaidOmen => "minecraft:event.mob_effect.raid_omen", ItemSaddleUnequip => "minecraft:item.saddle.unequip", + ItemNautilusSaddleUnderwaterEquip => "minecraft:item.nautilus_saddle_underwater_equip", + ItemNautilusSaddleEquip => "minecraft:item.nautilus_saddle_equip", } } @@ -6637,6 +6723,7 @@ enum TriggerKind { FishingRodHooked => "minecraft:fishing_rod_hooked", ChanneledLightning => "minecraft:channeled_lightning", ShotCrossbow => "minecraft:shot_crossbow", + SpearMobs => "minecraft:spear_mobs", KilledByArrow => "minecraft:killed_by_arrow", HeroOfTheVillage => "minecraft:hero_of_the_village", VoluntaryExile => "minecraft:voluntary_exile", @@ -6680,7 +6767,10 @@ enum DataComponentKind { MaxDamage => "minecraft:max_damage", Damage => "minecraft:damage", Unbreakable => "minecraft:unbreakable", + UseEffects => "minecraft:use_effects", CustomName => "minecraft:custom_name", + MinimumAttackCharge => "minecraft:minimum_attack_charge", + DamageType => "minecraft:damage_type", ItemName => "minecraft:item_name", ItemModel => "minecraft:item_model", Lore => "minecraft:lore", @@ -6702,6 +6792,7 @@ enum DataComponentKind { DamageResistant => "minecraft:damage_resistant", Tool => "minecraft:tool", Weapon => "minecraft:weapon", + AttackRange => "minecraft:attack_range", Enchantable => "minecraft:enchantable", Equippable => "minecraft:equippable", Repairable => "minecraft:repairable", @@ -6709,6 +6800,9 @@ enum DataComponentKind { TooltipStyle => "minecraft:tooltip_style", DeathProtection => "minecraft:death_protection", BlocksAttacks => "minecraft:blocks_attacks", + PiercingWeapon => "minecraft:piercing_weapon", + KineticWeapon => "minecraft:kinetic_weapon", + SwingAnimation => "minecraft:swing_animation", StoredEnchantments => "minecraft:stored_enchantments", DyedColor => "minecraft:dyed_color", MapColor => "minecraft:map_color", @@ -6762,6 +6856,7 @@ enum DataComponentKind { PigVariant => "minecraft:pig/variant", CowVariant => "minecraft:cow/variant", ChickenVariant => "minecraft:chicken/variant", + ZombieNautilusVariant => "minecraft:zombie_nautilus/variant", FrogVariant => "minecraft:frog/variant", HorseVariant => "minecraft:horse/variant", PaintingVariant => "minecraft:painting/variant", @@ -6834,6 +6929,7 @@ enum EnchantmentEffectComponentKind { Knockback => "minecraft:knockback", ArmorEffectiveness => "minecraft:armor_effectiveness", PostAttack => "minecraft:post_attack", + PostPiercingAttack => "minecraft:post_piercing_attack", HitBlock => "minecraft:hit_block", ItemDamage => "minecraft:item_damage", Attributes => "minecraft:attributes", @@ -6868,6 +6964,8 @@ enum EnchantmentEntityEffectKind { DamageEntity => "minecraft:damage_entity", Explode => "minecraft:explode", Ignite => "minecraft:ignite", + ApplyImpulse => "minecraft:apply_impulse", + ApplyExhaustion => "minecraft:apply_exhaustion", PlaySound => "minecraft:play_sound", ReplaceBlock => "minecraft:replace_block", ReplaceDisk => "minecraft:replace_disk", @@ -6884,6 +6982,7 @@ enum EnchantmentLevelBasedValueKind { Fraction => "minecraft:fraction", LevelsSquared => "minecraft:levels_squared", Linear => "minecraft:linear", + Exponent => "minecraft:exponent", Lookup => "minecraft:lookup", } } @@ -6897,6 +6996,8 @@ enum EnchantmentLocationBasedEffectKind { DamageEntity => "minecraft:damage_entity", Explode => "minecraft:explode", Ignite => "minecraft:ignite", + ApplyImpulse => "minecraft:apply_impulse", + ApplyExhaustion => "minecraft:apply_exhaustion", PlaySound => "minecraft:play_sound", ReplaceBlock => "minecraft:replace_block", ReplaceDisk => "minecraft:replace_disk", @@ -6921,6 +7022,7 @@ enum EnchantmentValueEffectKind { AllOf => "minecraft:all_of", Multiply => "minecraft:multiply", RemoveBinomial => "minecraft:remove_binomial", + Exponential => "minecraft:exponential", Set => "minecraft:set", } } @@ -7210,6 +7312,7 @@ enum OutgoingRpcMethods { NotificationServerStopping => "minecraft:notification/server/stopping", NotificationServerSaving => "minecraft:notification/server/saving", NotificationServerSaved => "minecraft:notification/server/saved", + NotificationServerActivity => "minecraft:notification/server/activity", NotificationPlayersJoined => "minecraft:notification/players/joined", NotificationPlayersLeft => "minecraft:notification/players/left", NotificationOperatorsAdded => "minecraft:notification/operators/added", @@ -7224,3 +7327,160 @@ enum OutgoingRpcMethods { NotificationServerStatus => "minecraft:notification/server/status", } } + +registry! { +enum AttributeKind { + Boolean => "minecraft:boolean", + TriState => "minecraft:tri_state", + Float => "minecraft:float", + AngleDegrees => "minecraft:angle_degrees", + RgbColor => "minecraft:rgb_color", + ArgbColor => "minecraft:argb_color", + MoonPhase => "minecraft:moon_phase", + Activity => "minecraft:activity", + BedRule => "minecraft:bed_rule", + Particle => "minecraft:particle", + AmbientParticles => "minecraft:ambient_particles", + BackgroundMusic => "minecraft:background_music", + AmbientSounds => "minecraft:ambient_sounds", +} +} + +registry! { +enum EnvironmentAttribute { + VisualFogColor => "minecraft:visual/fog_color", + VisualFogStartDistance => "minecraft:visual/fog_start_distance", + VisualFogEndDistance => "minecraft:visual/fog_end_distance", + VisualSkyFogEndDistance => "minecraft:visual/sky_fog_end_distance", + VisualCloudFogEndDistance => "minecraft:visual/cloud_fog_end_distance", + VisualWaterFogColor => "minecraft:visual/water_fog_color", + VisualWaterFogStartDistance => "minecraft:visual/water_fog_start_distance", + VisualWaterFogEndDistance => "minecraft:visual/water_fog_end_distance", + VisualSkyColor => "minecraft:visual/sky_color", + VisualSunriseSunsetColor => "minecraft:visual/sunrise_sunset_color", + VisualCloudColor => "minecraft:visual/cloud_color", + VisualCloudHeight => "minecraft:visual/cloud_height", + VisualSunAngle => "minecraft:visual/sun_angle", + VisualMoonAngle => "minecraft:visual/moon_angle", + VisualStarAngle => "minecraft:visual/star_angle", + VisualMoonPhase => "minecraft:visual/moon_phase", + VisualStarBrightness => "minecraft:visual/star_brightness", + VisualSkyLightColor => "minecraft:visual/sky_light_color", + VisualSkyLightFactor => "minecraft:visual/sky_light_factor", + VisualDefaultDripstoneParticle => "minecraft:visual/default_dripstone_particle", + VisualAmbientParticles => "minecraft:visual/ambient_particles", + AudioBackgroundMusic => "minecraft:audio/background_music", + AudioMusicVolume => "minecraft:audio/music_volume", + AudioAmbientSounds => "minecraft:audio/ambient_sounds", + AudioFireflyBushSounds => "minecraft:audio/firefly_bush_sounds", + GameplaySkyLightLevel => "minecraft:gameplay/sky_light_level", + GameplayCanStartRaid => "minecraft:gameplay/can_start_raid", + GameplayWaterEvaporates => "minecraft:gameplay/water_evaporates", + GameplayBedRule => "minecraft:gameplay/bed_rule", + GameplayRespawnAnchorWorks => "minecraft:gameplay/respawn_anchor_works", + GameplayNetherPortalSpawnsPiglin => "minecraft:gameplay/nether_portal_spawns_piglin", + GameplayFastLava => "minecraft:gameplay/fast_lava", + GameplayIncreasedFireBurnout => "minecraft:gameplay/increased_fire_burnout", + GameplayEyeblossomOpen => "minecraft:gameplay/eyeblossom_open", + GameplayTurtleEggHatchChance => "minecraft:gameplay/turtle_egg_hatch_chance", + GameplayPiglinsZombify => "minecraft:gameplay/piglins_zombify", + GameplaySnowGolemMelts => "minecraft:gameplay/snow_golem_melts", + GameplayCreakingActive => "minecraft:gameplay/creaking_active", + GameplaySurfaceSlimeSpawnChance => "minecraft:gameplay/surface_slime_spawn_chance", + GameplayCatWakingUpGiftChance => "minecraft:gameplay/cat_waking_up_gift_chance", + GameplayBeesStayInHive => "minecraft:gameplay/bees_stay_in_hive", + GameplayMonstersBurn => "minecraft:gameplay/monsters_burn", + GameplayCanPillagerPatrolSpawn => "minecraft:gameplay/can_pillager_patrol_spawn", + GameplayVillagerActivity => "minecraft:gameplay/villager_activity", + GameplayBabyVillagerActivity => "minecraft:gameplay/baby_villager_activity", +} +} + +registry! { +enum GameRule { + AdvanceTime => "minecraft:advance_time", + AdvanceWeather => "minecraft:advance_weather", + AllowEnteringNetherUsingPortals => "minecraft:allow_entering_nether_using_portals", + BlockDrops => "minecraft:block_drops", + BlockExplosionDropDecay => "minecraft:block_explosion_drop_decay", + CommandBlocksWork => "minecraft:command_blocks_work", + CommandBlockOutput => "minecraft:command_block_output", + DrowningDamage => "minecraft:drowning_damage", + ElytraMovementCheck => "minecraft:elytra_movement_check", + EnderPearlsVanishOnDeath => "minecraft:ender_pearls_vanish_on_death", + EntityDrops => "minecraft:entity_drops", + FallDamage => "minecraft:fall_damage", + FireDamage => "minecraft:fire_damage", + FireSpreadRadiusAroundPlayer => "minecraft:fire_spread_radius_around_player", + ForgiveDeadPlayers => "minecraft:forgive_dead_players", + FreezeDamage => "minecraft:freeze_damage", + GlobalSoundEvents => "minecraft:global_sound_events", + ImmediateRespawn => "minecraft:immediate_respawn", + KeepInventory => "minecraft:keep_inventory", + LavaSourceConversion => "minecraft:lava_source_conversion", + LimitedCrafting => "minecraft:limited_crafting", + LocatorBar => "minecraft:locator_bar", + LogAdminCommands => "minecraft:log_admin_commands", + MaxBlockModifications => "minecraft:max_block_modifications", + MaxCommandForks => "minecraft:max_command_forks", + MaxCommandSequenceLength => "minecraft:max_command_sequence_length", + MaxEntityCramming => "minecraft:max_entity_cramming", + MaxMinecartSpeed => "minecraft:max_minecart_speed", + MaxSnowAccumulationHeight => "minecraft:max_snow_accumulation_height", + MobDrops => "minecraft:mob_drops", + MobExplosionDropDecay => "minecraft:mob_explosion_drop_decay", + MobGriefing => "minecraft:mob_griefing", + NaturalHealthRegeneration => "minecraft:natural_health_regeneration", + PlayerMovementCheck => "minecraft:player_movement_check", + PlayersNetherPortalCreativeDelay => "minecraft:players_nether_portal_creative_delay", + PlayersNetherPortalDefaultDelay => "minecraft:players_nether_portal_default_delay", + PlayersSleepingPercentage => "minecraft:players_sleeping_percentage", + ProjectilesCanBreakBlocks => "minecraft:projectiles_can_break_blocks", + Pvp => "minecraft:pvp", + Raids => "minecraft:raids", + RandomTickSpeed => "minecraft:random_tick_speed", + ReducedDebugInfo => "minecraft:reduced_debug_info", + RespawnRadius => "minecraft:respawn_radius", + SendCommandFeedback => "minecraft:send_command_feedback", + ShowAdvancementMessages => "minecraft:show_advancement_messages", + ShowDeathMessages => "minecraft:show_death_messages", + SpawnerBlocksWork => "minecraft:spawner_blocks_work", + SpawnMobs => "minecraft:spawn_mobs", + SpawnMonsters => "minecraft:spawn_monsters", + SpawnPatrols => "minecraft:spawn_patrols", + SpawnPhantoms => "minecraft:spawn_phantoms", + SpawnWanderingTraders => "minecraft:spawn_wandering_traders", + SpawnWardens => "minecraft:spawn_wardens", + SpectatorsGenerateChunks => "minecraft:spectators_generate_chunks", + SpreadVines => "minecraft:spread_vines", + TntExplodes => "minecraft:tnt_explodes", + TntExplosionDropDecay => "minecraft:tnt_explosion_drop_decay", + UniversalAnger => "minecraft:universal_anger", + WaterSourceConversion => "minecraft:water_source_conversion", +} +} + +registry! { +enum PermissionCheckKind { + AlwaysPass => "minecraft:always_pass", + Require => "minecraft:require", +} +} + +registry! { +enum PermissionKind { + Atom => "minecraft:atom", + CommandLevel => "minecraft:command_level", +} +} + +registry! { +enum SlotSourceKind { + Group => "minecraft:group", + Filtered => "minecraft:filtered", + LimitSlots => "minecraft:limit_slots", + SlotRange => "minecraft:slot_range", + Contents => "minecraft:contents", + Empty => "minecraft:empty", +} +} diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs index e34e06ec..0bd17b93 100644 --- a/azalea-registry/src/tags/blocks.rs +++ b/azalea-registry/src/tags/blocks.rs @@ -464,6 +464,17 @@ pub static CAMELS_SPAWNABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| HashSet::from_iter([Block::Sand, Block::RedSand, Block::SuspiciousSand])); pub static CAMPFIRES: LazyLock<HashSet<Block>> = LazyLock::new(|| HashSet::from_iter([Block::Campfire, Block::SoulCampfire])); +pub static CAN_GLIDE_THROUGH: LazyLock<HashSet<Block>> = LazyLock::new(|| { + HashSet::from_iter([ + Block::Vine, + Block::TwistingVines, + Block::TwistingVinesPlant, + Block::WeepingVines, + Block::WeepingVinesPlant, + Block::CaveVinesPlant, + Block::CaveVines, + ]) +}); pub static CANDLE_CAKES: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter([ Block::CandleCake, diff --git a/azalea-registry/src/tags/entities.rs b/azalea-registry/src/tags/entities.rs index dc40ca7f..14fea7af 100644 --- a/azalea-registry/src/tags/entities.rs +++ b/azalea-registry/src/tags/entities.rs @@ -20,6 +20,8 @@ pub static AQUATIC: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::Squid, EntityKind::GlowSquid, EntityKind::Tadpole, + EntityKind::Nautilus, + EntityKind::ZombieNautilus, ]) }); pub static ARROWS: LazyLock<HashSet<EntityKind>> = @@ -67,6 +69,20 @@ pub static BOAT: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::BambooRaft, ]) }); +pub static BURN_IN_DAYLIGHT: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { + HashSet::from_iter([ + EntityKind::Skeleton, + EntityKind::Stray, + EntityKind::WitherSkeleton, + EntityKind::Bogged, + EntityKind::Zombie, + EntityKind::ZombieHorse, + EntityKind::ZombieVillager, + EntityKind::Drowned, + EntityKind::ZombieNautilus, + EntityKind::Phantom, + ]) +}); pub static CAN_BREATHE_UNDER_WATER: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { HashSet::from_iter([ EntityKind::Axolotl, @@ -83,6 +99,7 @@ pub static CAN_BREATHE_UNDER_WATER: LazyLock<HashSet<EntityKind>> = LazyLock::ne EntityKind::Tadpole, EntityKind::ArmorStand, EntityKind::CopperGolem, + EntityKind::Nautilus, EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -90,13 +107,16 @@ pub static CAN_BREATHE_UNDER_WATER: LazyLock<HashSet<EntityKind>> = LazyLock::ne EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); pub static CAN_EQUIP_HARNESS: LazyLock<HashSet<EntityKind>> = @@ -111,12 +131,27 @@ pub static CAN_EQUIP_SADDLE: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::Pig, EntityKind::Strider, EntityKind::Camel, + EntityKind::CamelHusk, + EntityKind::Nautilus, + EntityKind::ZombieNautilus, + ]) +}); +pub static CAN_FLOAT_WHILE_RIDDEN: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { + HashSet::from_iter([ + EntityKind::Horse, + EntityKind::ZombieHorse, + EntityKind::Mule, + EntityKind::Donkey, + EntityKind::Camel, + EntityKind::CamelHusk, ]) }); pub static CAN_TURN_IN_BOATS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| HashSet::from_iter([EntityKind::Breeze])); pub static CAN_WEAR_HORSE_ARMOR: LazyLock<HashSet<EntityKind>> = - LazyLock::new(|| HashSet::from_iter([EntityKind::Horse])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Horse, EntityKind::ZombieHorse])); +pub static CAN_WEAR_NAUTILUS_ARMOR: LazyLock<HashSet<EntityKind>> = + LazyLock::new(|| HashSet::from_iter([EntityKind::Nautilus, EntityKind::ZombieNautilus])); pub static CANDIDATE_FOR_IRON_GOLEM_GIFT: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| HashSet::from_iter([EntityKind::Villager, EntityKind::CopperGolem])); pub static CANNOT_BE_PUSHED_ONTO_BOATS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -132,6 +167,8 @@ pub static CANNOT_BE_PUSHED_ONTO_BOATS: LazyLock<HashSet<EntityKind>> = LazyLock EntityKind::GlowSquid, EntityKind::Tadpole, EntityKind::Creaking, + EntityKind::Nautilus, + EntityKind::ZombieNautilus, ]) }); pub static DEFLECTS_PROJECTILES: LazyLock<HashSet<EntityKind>> = @@ -230,13 +267,16 @@ pub static IGNORES_POISON_AND_REGEN: LazyLock<HashSet<EntityKind>> = LazyLock::n EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); pub static ILLAGER: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -284,15 +324,20 @@ pub static INVERTED_HEALING_AND_HARM: LazyLock<HashSet<EntityKind>> = LazyLock:: EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); +pub static NAUTILUS_HOSTILES: LazyLock<HashSet<EntityKind>> = + LazyLock::new(|| HashSet::from_iter([EntityKind::Pufferfish])); pub static NO_ANGER_FROM_WIND_CHARGE: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { HashSet::from_iter([ EntityKind::Breeze, @@ -321,6 +366,8 @@ pub static NOT_SCARY_FOR_PUFFERFISH: LazyLock<HashSet<EntityKind>> = LazyLock::n EntityKind::Squid, EntityKind::GlowSquid, EntityKind::Tadpole, + EntityKind::Nautilus, + EntityKind::ZombieNautilus, ]) }); pub static POWDER_SNOW_WALKABLE_MOBS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -371,6 +418,8 @@ pub static SENSITIVE_TO_IMPALING: LazyLock<HashSet<EntityKind>> = LazyLock::new( EntityKind::Squid, EntityKind::GlowSquid, EntityKind::Tadpole, + EntityKind::Nautilus, + EntityKind::ZombieNautilus, ]) }); pub static SENSITIVE_TO_SMITE: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -382,13 +431,16 @@ pub static SENSITIVE_TO_SMITE: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); pub static SKELETONS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -398,6 +450,7 @@ pub static SKELETONS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, ]) }); pub static UNDEAD: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -409,13 +462,16 @@ pub static UNDEAD: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); pub static WITHER_FRIENDS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { @@ -427,23 +483,28 @@ pub static WITHER_FRIENDS: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { EntityKind::WitherSkeleton, EntityKind::SkeletonHorse, EntityKind::Bogged, + EntityKind::Parched, EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); pub static ZOMBIES: LazyLock<HashSet<EntityKind>> = LazyLock::new(|| { HashSet::from_iter([ EntityKind::ZombieHorse, + EntityKind::CamelHusk, EntityKind::Zombie, EntityKind::ZombieVillager, EntityKind::ZombifiedPiglin, EntityKind::Zoglin, EntityKind::Drowned, EntityKind::Husk, + EntityKind::ZombieNautilus, ]) }); diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs index 981a27ba..eedc03d4 100644 --- a/azalea-registry/src/tags/items.rs +++ b/azalea-registry/src/tags/items.rs @@ -255,6 +255,8 @@ pub static BUTTONS: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static CAMEL_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::Cactus])); +pub static CAMEL_HUSK_FOOD: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter([Item::RabbitFoot])); pub static CANDLES: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ Item::Candle, @@ -765,6 +767,13 @@ pub static ENCHANTABLE_DURABILITY: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::WoodenHoe, Item::IronHoe, Item::CopperHoe, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, ]) }); pub static ENCHANTABLE_EQUIPPABLE: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -819,6 +828,13 @@ pub static ENCHANTABLE_FIRE_ASPECT: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::WoodenSword, Item::IronSword, Item::CopperSword, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, ]) }); pub static ENCHANTABLE_FISHING: LazyLock<HashSet<Item>> = @@ -857,8 +873,37 @@ pub static ENCHANTABLE_LEG_ARMOR: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::NetheriteLeggings, ]) }); +pub static ENCHANTABLE_LUNGE: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter([ + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, + ]) +}); pub static ENCHANTABLE_MACE: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::Mace])); +pub static ENCHANTABLE_MELEE_WEAPON: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter([ + Item::DiamondSword, + Item::StoneSword, + Item::GoldenSword, + Item::NetheriteSword, + Item::WoodenSword, + Item::IronSword, + Item::CopperSword, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, + ]) +}); pub static ENCHANTABLE_MINING: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ Item::Shears, @@ -926,13 +971,6 @@ pub static ENCHANTABLE_MINING_LOOT: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static ENCHANTABLE_SHARP_WEAPON: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ - Item::DiamondSword, - Item::StoneSword, - Item::GoldenSword, - Item::NetheriteSword, - Item::WoodenSword, - Item::IronSword, - Item::CopperSword, Item::DiamondAxe, Item::StoneAxe, Item::GoldenAxe, @@ -940,9 +978,23 @@ pub static ENCHANTABLE_SHARP_WEAPON: LazyLock<HashSet<Item>> = LazyLock::new(|| Item::WoodenAxe, Item::IronAxe, Item::CopperAxe, + Item::DiamondSword, + Item::StoneSword, + Item::GoldenSword, + Item::NetheriteSword, + Item::WoodenSword, + Item::IronSword, + Item::CopperSword, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, ]) }); -pub static ENCHANTABLE_SWORD: LazyLock<HashSet<Item>> = LazyLock::new(|| { +pub static ENCHANTABLE_SWEEPING: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ Item::DiamondSword, Item::StoneSword, @@ -1042,18 +1094,18 @@ pub static ENCHANTABLE_VANISHING: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::WoodenHoe, Item::IronHoe, Item::CopperHoe, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, ]) }); pub static ENCHANTABLE_WEAPON: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ Item::Mace, - Item::DiamondSword, - Item::StoneSword, - Item::GoldenSword, - Item::NetheriteSword, - Item::WoodenSword, - Item::IronSword, - Item::CopperSword, Item::DiamondAxe, Item::StoneAxe, Item::GoldenAxe, @@ -1061,6 +1113,20 @@ pub static ENCHANTABLE_WEAPON: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::WoodenAxe, Item::IronAxe, Item::CopperAxe, + Item::DiamondSword, + Item::StoneSword, + Item::GoldenSword, + Item::NetheriteSword, + Item::WoodenSword, + Item::IronSword, + Item::CopperSword, + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, ]) }); pub static FENCE_GATES: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -1464,6 +1530,30 @@ pub static MEAT: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::RottenFlesh, ]) }); +pub static NAUTILUS_BUCKET_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter([ + Item::PufferfishBucket, + Item::CodBucket, + Item::SalmonBucket, + Item::TropicalFishBucket, + ]) +}); +pub static NAUTILUS_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter([ + Item::Cod, + Item::CookedCod, + Item::Salmon, + Item::CookedSalmon, + Item::Pufferfish, + Item::TropicalFish, + Item::PufferfishBucket, + Item::CodBucket, + Item::SalmonBucket, + Item::TropicalFishBucket, + ]) +}); +pub static NAUTILUS_TAMING_ITEMS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter([Item::PufferfishBucket, Item::Pufferfish])); pub static NETHERITE_TOOL_MATERIALS: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::NetheriteIngot])); pub static NON_FLAMMABLE_WOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -1579,7 +1669,9 @@ pub static PIGLIN_LOVED: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::GoldenLeggings, Item::GoldenBoots, Item::GoldenHorseArmor, + Item::GoldenNautilusArmor, Item::GoldenSword, + Item::GoldenSpear, Item::GoldenPickaxe, Item::GoldenShovel, Item::GoldenAxe, @@ -1592,7 +1684,7 @@ pub static PIGLIN_LOVED: LazyLock<HashSet<Item>> = LazyLock::new(|| { ]) }); pub static PIGLIN_PREFERRED_WEAPONS: LazyLock<HashSet<Item>> = - LazyLock::new(|| HashSet::from_iter([Item::Crossbow])); + LazyLock::new(|| HashSet::from_iter([Item::Crossbow, Item::GoldenSpear])); pub static PIGLIN_REPELLENTS: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::SoulTorch, Item::SoulLantern, Item::SoulCampfire])); pub static PIGLIN_SAFE_ARMOR: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -1825,6 +1917,17 @@ pub static SNIFFER_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::TorchflowerSeeds])); pub static SOUL_FIRE_BASE_BLOCKS: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter([Item::SoulSand, Item::SoulSoil])); +pub static SPEARS: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter([ + Item::DiamondSpear, + Item::StoneSpear, + Item::GoldenSpear, + Item::NetheriteSpear, + Item::WoodenSpear, + Item::IronSpear, + Item::CopperSpear, + ]) +}); pub static SPRUCE_LOGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter([ Item::SpruceLog, @@ -2293,3 +2396,5 @@ pub static WOOL_CARPETS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::BlackCarpet, ]) }); +pub static ZOMBIE_HORSE_FOOD: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter([Item::RedMushroom])); |
