diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-06-13 19:52:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 19:52:05 -0500 |
| commit | f66d2d476759085601fc398afcac7d8b1940ebf7 (patch) | |
| tree | 6faf7bb89996eb7c37b2a4dc72c1f08b02a4ef0d /azalea-registry/src | |
| parent | 38eab50b4fc53f10c3f607935e47b65a8c4f3ef9 (diff) | |
| download | azalea-drasl-f66d2d476759085601fc398afcac7d8b1940ebf7.tar.xz | |
1.21 (#145)
* 24w18a (data driven enchantments not implemented yet)
* 1.21
Diffstat (limited to 'azalea-registry/src')
| -rw-r--r-- | azalea-registry/src/extra.rs | 24 | ||||
| -rwxr-xr-x | azalea-registry/src/lib.rs | 162 | ||||
| -rw-r--r-- | azalea-registry/src/tags/blocks.rs | 237 | ||||
| -rw-r--r-- | azalea-registry/src/tags/items.rs | 60 |
4 files changed, 458 insertions, 25 deletions
diff --git a/azalea-registry/src/extra.rs b/azalea-registry/src/extra.rs index 6be981c1..79533652 100644 --- a/azalea-registry/src/extra.rs +++ b/azalea-registry/src/extra.rs @@ -72,3 +72,27 @@ enum TrimPattern { Bolt => "bolt", } } + +registry! { +enum JukeboxSong { + Thirteen => "13", + Cat => "cat", + Blocks => "blocks", + Chirp => "chirp", + Far => "far", + Mall => "mall", + Mellohi => "mellohi", + Stal => "stal", + Strad => "strad", + Ward => "ward", + Eleven => "11", + Wait => "wait", + Pigstep => "pigstep", + Otherside => "otherside", + Five => "5", + Relic => "relic", + Precipice => "precipice", + Creator => "creator", + CreatorMusicBox => "creator_music_box", +} +} diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index 63ebdc61..ce61429d 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -173,6 +173,8 @@ enum Attribute { GenericAttackSpeed => "minecraft:generic.attack_speed", PlayerBlockBreakSpeed => "minecraft:player.block_break_speed", PlayerBlockInteractionRange => "minecraft:player.block_interaction_range", + GenericBurningTime => "minecraft:generic.burning_time", + GenericExplosionKnockbackResistance => "minecraft:generic.explosion_knockback_resistance", PlayerEntityInteractionRange => "minecraft:player.entity_interaction_range", GenericFallDamageMultiplier => "minecraft:generic.fall_damage_multiplier", GenericFlyingSpeed => "minecraft:generic.flying_speed", @@ -183,11 +185,18 @@ enum Attribute { GenericLuck => "minecraft:generic.luck", GenericMaxAbsorption => "minecraft:generic.max_absorption", GenericMaxHealth => "minecraft:generic.max_health", + PlayerMiningEfficiency => "minecraft:player.mining_efficiency", + GenericMovementEfficiency => "minecraft:generic.movement_efficiency", GenericMovementSpeed => "minecraft:generic.movement_speed", + GenericOxygenBonus => "minecraft:generic.oxygen_bonus", GenericSafeFallDistance => "minecraft:generic.safe_fall_distance", GenericScale => "minecraft:generic.scale", + PlayerSneakingSpeed => "minecraft:player.sneaking_speed", ZombieSpawnReinforcements => "minecraft:zombie.spawn_reinforcements", GenericStepHeight => "minecraft:generic.step_height", + PlayerSubmergedMiningSpeed => "minecraft:player.submerged_mining_speed", + PlayerSweepingDamageRatio => "minecraft:player.sweeping_damage_ratio", + GenericWaterMovementEfficiency => "minecraft:generic.water_movement_efficiency", } } @@ -1373,6 +1382,7 @@ enum BlockPredicateKind { AllOf => "minecraft:all_of", Not => "minecraft:not", True => "minecraft:true", + Unobstructed => "minecraft:unobstructed", } } @@ -2659,6 +2669,7 @@ enum Item { ArmadilloScute => "minecraft:armadillo_scute", WolfArmor => "minecraft:wolf_armor", FlintAndSteel => "minecraft:flint_and_steel", + Bowl => "minecraft:bowl", Apple => "minecraft:apple", Bow => "minecraft:bow", Arrow => "minecraft:arrow", @@ -2708,7 +2719,6 @@ enum Item { NetheriteAxe => "minecraft:netherite_axe", NetheriteHoe => "minecraft:netherite_hoe", Stick => "minecraft:stick", - Bowl => "minecraft:bowl", MushroomStew => "minecraft:mushroom_stew", String => "minecraft:string", Feather => "minecraft:feather", @@ -3032,6 +3042,8 @@ enum Item { MusicDiscCat => "minecraft:music_disc_cat", MusicDiscBlocks => "minecraft:music_disc_blocks", MusicDiscChirp => "minecraft:music_disc_chirp", + MusicDiscCreator => "minecraft:music_disc_creator", + MusicDiscCreatorMusicBox => "minecraft:music_disc_creator_music_box", MusicDiscFar => "minecraft:music_disc_far", MusicDiscMall => "minecraft:music_disc_mall", MusicDiscMellohi => "minecraft:music_disc_mellohi", @@ -3044,6 +3056,7 @@ enum Item { MusicDiscRelic => "minecraft:music_disc_relic", MusicDisc5 => "minecraft:music_disc_5", MusicDiscPigstep => "minecraft:music_disc_pigstep", + MusicDiscPrecipice => "minecraft:music_disc_precipice", DiscFragment5 => "minecraft:disc_fragment_5", Trident => "minecraft:trident", PhantomMembrane => "minecraft:phantom_membrane", @@ -3199,7 +3212,7 @@ enum LootConditionKind { AnyOf => "minecraft:any_of", AllOf => "minecraft:all_of", RandomChance => "minecraft:random_chance", - RandomChanceWithLooting => "minecraft:random_chance_with_looting", + RandomChanceWithEnchantedBonus => "minecraft:random_chance_with_enchanted_bonus", EntityProperties => "minecraft:entity_properties", KilledByPlayer => "minecraft:killed_by_player", EntityScores => "minecraft:entity_scores", @@ -3213,6 +3226,7 @@ enum LootConditionKind { Reference => "minecraft:reference", TimeCheck => "minecraft:time_check", ValueCheck => "minecraft:value_check", + EnchantmentActiveCheck => "minecraft:enchantment_active_check", } } @@ -3226,7 +3240,7 @@ enum LootFunctionKind { SetCustomData => "minecraft:set_custom_data", SetComponents => "minecraft:set_components", FurnaceSmelt => "minecraft:furnace_smelt", - LootingEnchant => "minecraft:looting_enchant", + EnchantedCountIncrease => "minecraft:enchanted_count_increase", SetDamage => "minecraft:set_damage", SetAttributes => "minecraft:set_attributes", SetName => "minecraft:set_name", @@ -3275,6 +3289,7 @@ enum LootNumberProviderKind { Binomial => "minecraft:binomial", Score => "minecraft:score", Storage => "minecraft:storage", + EnchantmentLevel => "minecraft:enchantment_level", } } @@ -4498,9 +4513,9 @@ enum SoundEvent { BlockTrialSpawnerSpawnItem => "minecraft:block.trial_spawner.spawn_item", BlockTrialSpawnerSpawnItemBegin => "minecraft:block.trial_spawner.spawn_item_begin", BlockTrialSpawnerDetectPlayer => "minecraft:block.trial_spawner.detect_player", - BlockTrialSpawnerChargeActivate => "minecraft:block.trial_spawner.charge_activate", + BlockTrialSpawnerOminousActivate => "minecraft:block.trial_spawner.ominous_activate", BlockTrialSpawnerAmbient => "minecraft:block.trial_spawner.ambient", - BlockTrialSpawnerAmbientCharged => "minecraft:block.trial_spawner.ambient_charged", + BlockTrialSpawnerAmbientOminous => "minecraft:block.trial_spawner.ambient_ominous", BlockTrialSpawnerOpenShutter => "minecraft:block.trial_spawner.open_shutter", BlockTrialSpawnerCloseShutter => "minecraft:block.trial_spawner.close_shutter", BlockTrialSpawnerEjectItem => "minecraft:block.trial_spawner.eject_item", @@ -4701,6 +4716,9 @@ enum SoundEvent { MusicDiscWard => "minecraft:music_disc.ward", MusicDiscOtherside => "minecraft:music_disc.otherside", MusicDiscRelic => "minecraft:music_disc.relic", + MusicDiscCreator => "minecraft:music_disc.creator", + MusicDiscCreatorMusicBox => "minecraft:music_disc.creator_music_box", + MusicDiscPrecipice => "minecraft:music_disc.precipice", MusicDragon => "minecraft:music.dragon", MusicEnd => "minecraft:music.end", MusicGame => "minecraft:music.game", @@ -5254,6 +5272,7 @@ enum SoundEvent { BlockVaultCloseShutter => "minecraft:block.vault.close_shutter", BlockVaultDeactivate => "minecraft:block.vault.deactivate", BlockVaultEjectItem => "minecraft:block.vault.eject_item", + BlockVaultRejectRewardedPlayer => "minecraft:block.vault.reject_rewarded_player", BlockVaultFall => "minecraft:block.vault.fall", BlockVaultHit => "minecraft:block.vault.hit", BlockVaultInsertItem => "minecraft:block.vault.insert_item", @@ -5578,6 +5597,7 @@ enum WorldgenFeature { Disk => "minecraft:disk", Lake => "minecraft:lake", Ore => "minecraft:ore", + EndPlatform => "minecraft:end_platform", EndSpike => "minecraft:end_spike", EndIsland => "minecraft:end_island", EndGateway => "minecraft:end_gateway", @@ -5676,6 +5696,7 @@ enum WorldgenPlacementModifierKind { InSquare => "minecraft:in_square", RandomOffset => "minecraft:random_offset", CarvingMask => "minecraft:carving_mask", + FixedPlacement => "minecraft:fixed_placement", } } @@ -6293,6 +6314,7 @@ enum DataComponentKind { BlockEntityData => "minecraft:block_entity_data", Instrument => "minecraft:instrument", OminousBottleAmplifier => "minecraft:ominous_bottle_amplifier", + JukeboxPlayable => "minecraft:jukebox_playable", Recipes => "minecraft:recipes", LodestoneTracker => "minecraft:lodestone_tracker", FireworkExplosion => "minecraft:firework_explosion", @@ -6349,6 +6371,7 @@ enum ItemSubPredicateKind { WrittenBookContent => "minecraft:written_book_content", AttributeModifiers => "minecraft:attribute_modifiers", Trim => "minecraft:trim", + JukeboxPlayable => "minecraft:jukebox_playable", } } @@ -6391,3 +6414,132 @@ enum MapDecorationKind { TrialChambers => "minecraft:trial_chambers", } } + +registry! { +enum EnchantmentEffectComponentKind { + DamageProtection => "minecraft:damage_protection", + DamageImmunity => "minecraft:damage_immunity", + Damage => "minecraft:damage", + SmashDamagePerFallenBlock => "minecraft:smash_damage_per_fallen_block", + Knockback => "minecraft:knockback", + ArmorEffectiveness => "minecraft:armor_effectiveness", + PostAttack => "minecraft:post_attack", + HitBlock => "minecraft:hit_block", + ItemDamage => "minecraft:item_damage", + Attributes => "minecraft:attributes", + EquipmentDrops => "minecraft:equipment_drops", + LocationChanged => "minecraft:location_changed", + Tick => "minecraft:tick", + AmmoUse => "minecraft:ammo_use", + ProjectilePiercing => "minecraft:projectile_piercing", + ProjectileSpawned => "minecraft:projectile_spawned", + ProjectileSpread => "minecraft:projectile_spread", + ProjectileCount => "minecraft:projectile_count", + TridentReturnAcceleration => "minecraft:trident_return_acceleration", + FishingTimeReduction => "minecraft:fishing_time_reduction", + FishingLuckBonus => "minecraft:fishing_luck_bonus", + BlockExperience => "minecraft:block_experience", + MobExperience => "minecraft:mob_experience", + RepairWithXp => "minecraft:repair_with_xp", + CrossbowChargeTime => "minecraft:crossbow_charge_time", + CrossbowChargingSounds => "minecraft:crossbow_charging_sounds", + TridentSound => "minecraft:trident_sound", + PreventEquipmentDrop => "minecraft:prevent_equipment_drop", + PreventArmorChange => "minecraft:prevent_armor_change", + TridentSpinAttackStrength => "minecraft:trident_spin_attack_strength", +} +} + +registry! { +enum EnchantmentEntityEffectKind { + AllOf => "minecraft:all_of", + ApplyMobEffect => "minecraft:apply_mob_effect", + DamageEntity => "minecraft:damage_entity", + DamageItem => "minecraft:damage_item", + Explode => "minecraft:explode", + Ignite => "minecraft:ignite", + PlaySound => "minecraft:play_sound", + ReplaceBlock => "minecraft:replace_block", + ReplaceDisk => "minecraft:replace_disk", + RunFunction => "minecraft:run_function", + SetBlockProperties => "minecraft:set_block_properties", + SpawnParticles => "minecraft:spawn_particles", + SummonEntity => "minecraft:summon_entity", +} +} + +registry! { +enum EnchantmentLevelBasedValueKind { + Clamped => "minecraft:clamped", + Fraction => "minecraft:fraction", + LevelsSquared => "minecraft:levels_squared", + Linear => "minecraft:linear", + Lookup => "minecraft:lookup", +} +} + +registry! { +enum EnchantmentLocationBasedEffectKind { + AllOf => "minecraft:all_of", + ApplyMobEffect => "minecraft:apply_mob_effect", + Attribute => "minecraft:attribute", + DamageEntity => "minecraft:damage_entity", + DamageItem => "minecraft:damage_item", + Explode => "minecraft:explode", + Ignite => "minecraft:ignite", + PlaySound => "minecraft:play_sound", + ReplaceBlock => "minecraft:replace_block", + ReplaceDisk => "minecraft:replace_disk", + RunFunction => "minecraft:run_function", + SetBlockProperties => "minecraft:set_block_properties", + SpawnParticles => "minecraft:spawn_particles", + SummonEntity => "minecraft:summon_entity", +} +} + +registry! { +enum EnchantmentProviderKind { + ByCost => "minecraft:by_cost", + ByCostWithDifficulty => "minecraft:by_cost_with_difficulty", + Single => "minecraft:single", +} +} + +registry! { +enum EnchantmentValueEffectKind { + Add => "minecraft:add", + AllOf => "minecraft:all_of", + Multiply => "minecraft:multiply", + RemoveBinomial => "minecraft:remove_binomial", + Set => "minecraft:set", +} +} + +registry! { +enum DecoratedPotPattern { + Angler => "minecraft:angler", + Archer => "minecraft:archer", + ArmsUp => "minecraft:arms_up", + Blade => "minecraft:blade", + Brewer => "minecraft:brewer", + Burn => "minecraft:burn", + Danger => "minecraft:danger", + Explorer => "minecraft:explorer", + Flow => "minecraft:flow", + Friend => "minecraft:friend", + Guster => "minecraft:guster", + Heart => "minecraft:heart", + Heartbreak => "minecraft:heartbreak", + Howl => "minecraft:howl", + Miner => "minecraft:miner", + Mourner => "minecraft:mourner", + Plenty => "minecraft:plenty", + Prize => "minecraft:prize", + Scrape => "minecraft:scrape", + Sheaf => "minecraft:sheaf", + Shelter => "minecraft:shelter", + Skull => "minecraft:skull", + Snort => "minecraft:snort", + Blank => "minecraft:blank", +} +} diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs index 0d79b297..039ee0f8 100644 --- a/azalea-registry/src/tags/blocks.rs +++ b/azalea-registry/src/tags/blocks.rs @@ -14,6 +14,8 @@ pub static ACACIA_LOGS: Lazy<HashSet<Block>> = Lazy::new(|| { Block::StrippedAcaciaWood, ]) }); +pub static AIR: Lazy<HashSet<Block>> = + Lazy::new(|| HashSet::from_iter(vec![Block::Air, Block::VoidAir, Block::CaveAir])); pub static ALL_HANGING_SIGNS: Lazy<HashSet<Block>> = Lazy::new(|| { HashSet::from_iter(vec![ Block::OakHangingSign, @@ -354,6 +356,8 @@ pub static BIRCH_LOGS: Lazy<HashSet<Block>> = Lazy::new(|| { Block::StrippedBirchWood, ]) }); +pub static BLOCKS_WIND_CHARGE_EXPLOSIONS: Lazy<HashSet<Block>> = + Lazy::new(|| HashSet::from_iter(vec![Block::Barrier, Block::Bedrock])); pub static BUTTONS: Lazy<HashSet<Block>> = Lazy::new(|| { HashSet::from_iter(vec![ Block::OakButton, @@ -745,6 +749,14 @@ pub static DOES_NOT_BLOCK_HOPPERS: Lazy<HashSet<Block>> = Lazy::new(|| HashSet::from_iter(vec![Block::BeeNest, Block::Beehive])); pub static DOORS: Lazy<HashSet<Block>> = Lazy::new(|| { HashSet::from_iter(vec![ + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, Block::IronDoor, Block::OakDoor, Block::SpruceDoor, @@ -890,6 +902,8 @@ pub static FEATURES_CANNOT_REPLACE: Lazy<HashSet<Block>> = Lazy::new(|| { Block::Chest, Block::EndPortalFrame, Block::ReinforcedDeepslate, + Block::TrialSpawner, + Block::Vault, ]) }); pub static FENCE_GATES: Lazy<HashSet<Block>> = Lazy::new(|| { @@ -1173,6 +1187,47 @@ pub static INCORRECT_FOR_GOLD_TOOL: Lazy<HashSet<Block>> = Lazy::new(|| { Block::WaxedOxidizedCutCopperStairs, Block::WaxedOxidizedCutCopper, Block::LightningRod, + Block::Crafter, + Block::ChiseledCopper, + Block::ExposedChiseledCopper, + Block::WeatheredChiseledCopper, + Block::OxidizedChiseledCopper, + Block::WaxedChiseledCopper, + Block::WaxedExposedChiseledCopper, + Block::WaxedWeatheredChiseledCopper, + Block::WaxedOxidizedChiseledCopper, + Block::CopperGrate, + Block::ExposedCopperGrate, + Block::WeatheredCopperGrate, + Block::OxidizedCopperGrate, + Block::WaxedCopperGrate, + Block::WaxedExposedCopperGrate, + Block::WaxedWeatheredCopperGrate, + Block::WaxedOxidizedCopperGrate, + Block::CopperBulb, + Block::ExposedCopperBulb, + Block::WeatheredCopperBulb, + Block::OxidizedCopperBulb, + Block::WaxedCopperBulb, + Block::WaxedExposedCopperBulb, + Block::WaxedWeatheredCopperBulb, + Block::WaxedOxidizedCopperBulb, + Block::CopperTrapdoor, + Block::ExposedCopperTrapdoor, + Block::WeatheredCopperTrapdoor, + Block::OxidizedCopperTrapdoor, + Block::WaxedCopperTrapdoor, + Block::WaxedExposedCopperTrapdoor, + Block::WaxedWeatheredCopperTrapdoor, + Block::WaxedOxidizedCopperTrapdoor, + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, ]) }); pub static INCORRECT_FOR_IRON_TOOL: Lazy<HashSet<Block>> = Lazy::new(|| { @@ -1269,6 +1324,47 @@ pub static INCORRECT_FOR_WOODEN_TOOL: Lazy<HashSet<Block>> = Lazy::new(|| { Block::WaxedOxidizedCutCopperStairs, Block::WaxedOxidizedCutCopper, Block::LightningRod, + Block::Crafter, + Block::ChiseledCopper, + Block::ExposedChiseledCopper, + Block::WeatheredChiseledCopper, + Block::OxidizedChiseledCopper, + Block::WaxedChiseledCopper, + Block::WaxedExposedChiseledCopper, + Block::WaxedWeatheredChiseledCopper, + Block::WaxedOxidizedChiseledCopper, + Block::CopperGrate, + Block::ExposedCopperGrate, + Block::WeatheredCopperGrate, + Block::OxidizedCopperGrate, + Block::WaxedCopperGrate, + Block::WaxedExposedCopperGrate, + Block::WaxedWeatheredCopperGrate, + Block::WaxedOxidizedCopperGrate, + Block::CopperBulb, + Block::ExposedCopperBulb, + Block::WeatheredCopperBulb, + Block::OxidizedCopperBulb, + Block::WaxedCopperBulb, + Block::WaxedExposedCopperBulb, + Block::WaxedWeatheredCopperBulb, + Block::WaxedOxidizedCopperBulb, + Block::CopperTrapdoor, + Block::ExposedCopperTrapdoor, + Block::WeatheredCopperTrapdoor, + Block::OxidizedCopperTrapdoor, + Block::WaxedCopperTrapdoor, + Block::WaxedExposedCopperTrapdoor, + Block::WaxedWeatheredCopperTrapdoor, + Block::WaxedOxidizedCopperTrapdoor, + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, ]) }); pub static INFINIBURN_END: Lazy<HashSet<Block>> = @@ -1308,6 +1404,8 @@ pub static LAVA_POOL_STONE_CANNOT_REPLACE: Lazy<HashSet<Block>> = Lazy::new(|| { Block::Chest, Block::EndPortalFrame, Block::ReinforcedDeepslate, + Block::TrialSpawner, + Block::Vault, Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, @@ -2182,6 +2280,61 @@ pub static MINEABLE_PICKAXE: Lazy<HashSet<Block>> = Lazy::new(|| { Block::MudBrickStairs, Block::MudBrickSlab, Block::PackedMud, + Block::Crafter, + Block::TuffSlab, + Block::TuffStairs, + Block::TuffWall, + Block::ChiseledTuff, + Block::PolishedTuff, + Block::PolishedTuffSlab, + Block::PolishedTuffStairs, + Block::PolishedTuffWall, + Block::TuffBricks, + Block::TuffBrickSlab, + Block::TuffBrickStairs, + Block::TuffBrickWall, + Block::ChiseledTuffBricks, + Block::ChiseledCopper, + Block::ExposedChiseledCopper, + Block::WeatheredChiseledCopper, + Block::OxidizedChiseledCopper, + Block::WaxedChiseledCopper, + Block::WaxedExposedChiseledCopper, + Block::WaxedWeatheredChiseledCopper, + Block::WaxedOxidizedChiseledCopper, + Block::CopperGrate, + Block::ExposedCopperGrate, + Block::WeatheredCopperGrate, + Block::OxidizedCopperGrate, + Block::WaxedCopperGrate, + Block::WaxedExposedCopperGrate, + Block::WaxedWeatheredCopperGrate, + Block::WaxedOxidizedCopperGrate, + Block::CopperBulb, + Block::ExposedCopperBulb, + Block::WeatheredCopperBulb, + Block::OxidizedCopperBulb, + Block::WaxedCopperBulb, + Block::WaxedExposedCopperBulb, + Block::WaxedWeatheredCopperBulb, + Block::WaxedOxidizedCopperBulb, + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, + Block::CopperTrapdoor, + Block::ExposedCopperTrapdoor, + Block::WeatheredCopperTrapdoor, + Block::OxidizedCopperTrapdoor, + Block::WaxedCopperTrapdoor, + Block::WaxedExposedCopperTrapdoor, + Block::WaxedWeatheredCopperTrapdoor, + Block::WaxedOxidizedCopperTrapdoor, + Block::HeavyCore, Block::StoneButton, Block::PolishedBlackstoneButton, Block::CobblestoneWall, @@ -2206,6 +2359,9 @@ pub static MINEABLE_PICKAXE: Lazy<HashSet<Block>> = Lazy::new(|| { Block::DeepslateTileWall, Block::DeepslateBrickWall, Block::MudBrickWall, + Block::TuffWall, + Block::PolishedTuffWall, + Block::TuffBrickWall, Block::ShulkerBox, Block::BlackShulkerBox, Block::BlueShulkerBox, @@ -2276,6 +2432,29 @@ pub static MINEABLE_SHOVEL: Lazy<HashSet<Block>> = Lazy::new(|| { Block::BlackConcretePowder, ]) }); +pub static MOB_INTERACTABLE_DOORS: Lazy<HashSet<Block>> = Lazy::new(|| { + HashSet::from_iter(vec![ + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, + Block::OakDoor, + Block::SpruceDoor, + Block::BirchDoor, + Block::JungleDoor, + Block::AcaciaDoor, + Block::DarkOakDoor, + Block::CrimsonDoor, + Block::WarpedDoor, + Block::MangroveDoor, + Block::BambooDoor, + Block::CherryDoor, + ]) +}); pub static MOOSHROOMS_SPAWNABLE_ON: Lazy<HashSet<Block>> = Lazy::new(|| HashSet::from_iter(vec![Block::Mycelium])); pub static MOSS_REPLACEABLE: Lazy<HashSet<Block>> = Lazy::new(|| { @@ -2377,6 +2556,47 @@ pub static NEEDS_STONE_TOOL: Lazy<HashSet<Block>> = Lazy::new(|| { Block::WaxedOxidizedCutCopperStairs, Block::WaxedOxidizedCutCopper, Block::LightningRod, + Block::Crafter, + Block::ChiseledCopper, + Block::ExposedChiseledCopper, + Block::WeatheredChiseledCopper, + Block::OxidizedChiseledCopper, + Block::WaxedChiseledCopper, + Block::WaxedExposedChiseledCopper, + Block::WaxedWeatheredChiseledCopper, + Block::WaxedOxidizedChiseledCopper, + Block::CopperGrate, + Block::ExposedCopperGrate, + Block::WeatheredCopperGrate, + Block::OxidizedCopperGrate, + Block::WaxedCopperGrate, + Block::WaxedExposedCopperGrate, + Block::WaxedWeatheredCopperGrate, + Block::WaxedOxidizedCopperGrate, + Block::CopperBulb, + Block::ExposedCopperBulb, + Block::WeatheredCopperBulb, + Block::OxidizedCopperBulb, + Block::WaxedCopperBulb, + Block::WaxedExposedCopperBulb, + Block::WaxedWeatheredCopperBulb, + Block::WaxedOxidizedCopperBulb, + Block::CopperTrapdoor, + Block::ExposedCopperTrapdoor, + Block::WeatheredCopperTrapdoor, + Block::OxidizedCopperTrapdoor, + Block::WaxedCopperTrapdoor, + Block::WaxedExposedCopperTrapdoor, + Block::WaxedWeatheredCopperTrapdoor, + Block::WaxedOxidizedCopperTrapdoor, + Block::CopperDoor, + Block::ExposedCopperDoor, + Block::WeatheredCopperDoor, + Block::OxidizedCopperDoor, + Block::WaxedCopperDoor, + Block::WaxedExposedCopperDoor, + Block::WaxedWeatheredCopperDoor, + Block::WaxedOxidizedCopperDoor, ]) }); pub static NETHER_CARVER_REPLACEABLES: Lazy<HashSet<Block>> = Lazy::new(|| { @@ -2927,6 +3147,9 @@ pub static SLABS: Lazy<HashSet<Block>> = Lazy::new(|| { Block::CutCopperSlab, Block::WaxedOxidizedCutCopperSlab, Block::MudBrickSlab, + Block::TuffSlab, + Block::PolishedTuffSlab, + Block::TuffBrickSlab, Block::OakSlab, Block::SpruceSlab, Block::BirchSlab, @@ -3056,6 +3279,9 @@ pub static STAIRS: Lazy<HashSet<Block>> = Lazy::new(|| { Block::WaxedCutCopperStairs, Block::WaxedOxidizedCutCopperStairs, Block::MudBrickStairs, + Block::TuffStairs, + Block::PolishedTuffStairs, + Block::TuffBrickStairs, Block::OakStairs, Block::SpruceStairs, Block::BirchStairs, @@ -3237,6 +3463,14 @@ pub static TRAIL_RUINS_REPLACEABLE: Lazy<HashSet<Block>> = pub static TRAPDOORS: Lazy<HashSet<Block>> = Lazy::new(|| { HashSet::from_iter(vec![ Block::IronTrapdoor, + Block::CopperTrapdoor, + Block::ExposedCopperTrapdoor, + Block::WeatheredCopperTrapdoor, + Block::OxidizedCopperTrapdoor, + Block::WaxedCopperTrapdoor, + Block::WaxedExposedCopperTrapdoor, + Block::WaxedWeatheredCopperTrapdoor, + Block::WaxedOxidizedCopperTrapdoor, Block::AcaciaTrapdoor, Block::BirchTrapdoor, Block::DarkOakTrapdoor, @@ -3429,6 +3663,9 @@ pub static WALLS: Lazy<HashSet<Block>> = Lazy::new(|| { Block::DeepslateTileWall, Block::DeepslateBrickWall, Block::MudBrickWall, + Block::TuffWall, + Block::PolishedTuffWall, + Block::TuffBrickWall, ]) }); pub static WARPED_STEMS: Lazy<HashSet<Block>> = Lazy::new(|| { diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs index ecc80147..dcb85967 100644 --- a/azalea-registry/src/tags/items.rs +++ b/azalea-registry/src/tags/items.rs @@ -155,6 +155,7 @@ pub static BOOKSHELF_BOOKS: Lazy<HashSet<Item>> = Lazy::new(|| { pub static BREAKS_DECORATED_POTS: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ Item::Trident, + Item::Mace, Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -437,6 +438,9 @@ pub static DECORATED_POT_INGREDIENTS: Lazy<HashSet<Item>> = Lazy::new(|| { Item::ShelterPotterySherd, Item::SkullPotterySherd, Item::SnortPotterySherd, + Item::FlowPotterySherd, + Item::GusterPotterySherd, + Item::ScrapePotterySherd, ]) }); pub static DECORATED_POT_SHERDS: Lazy<HashSet<Item>> = Lazy::new(|| { @@ -461,6 +465,9 @@ pub static DECORATED_POT_SHERDS: Lazy<HashSet<Item>> = Lazy::new(|| { Item::ShelterPotterySherd, Item::SkullPotterySherd, Item::SnortPotterySherd, + Item::FlowPotterySherd, + Item::GusterPotterySherd, + Item::ScrapePotterySherd, ]) }); pub static DIAMOND_ORES: Lazy<HashSet<Item>> = @@ -480,6 +487,14 @@ pub static DIRT: Lazy<HashSet<Item>> = Lazy::new(|| { }); pub static DOORS: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ + Item::CopperDoor, + Item::ExposedCopperDoor, + Item::WeatheredCopperDoor, + Item::OxidizedCopperDoor, + Item::WaxedCopperDoor, + Item::WaxedExposedCopperDoor, + Item::WaxedWeatheredCopperDoor, + Item::WaxedOxidizedCopperDoor, Item::IronDoor, Item::OakDoor, Item::SpruceDoor, @@ -561,6 +576,7 @@ pub static ENCHANTABLE_DURABILITY: Lazy<HashSet<Item>> = Lazy::new(|| { Item::FishingRod, Item::CarrotOnAStick, Item::WarpedFungusOnAStick, + Item::Mace, Item::LeatherBoots, Item::ChainmailBoots, Item::GoldenBoots, @@ -658,6 +674,7 @@ pub static ENCHANTABLE_EQUIPPABLE: Lazy<HashSet<Item>> = Lazy::new(|| { }); pub static ENCHANTABLE_FIRE_ASPECT: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ + Item::Mace, Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -699,6 +716,8 @@ pub static ENCHANTABLE_LEG_ARMOR: Lazy<HashSet<Item>> = Lazy::new(|| { Item::NetheriteLeggings, ]) }); +pub static ENCHANTABLE_MACE: Lazy<HashSet<Item>> = + Lazy::new(|| HashSet::from_iter(vec![Item::Mace])); pub static ENCHANTABLE_MINING: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ Item::Shears, @@ -799,6 +818,7 @@ pub static ENCHANTABLE_VANISHING: Lazy<HashSet<Item>> = Lazy::new(|| { Item::FishingRod, Item::CarrotOnAStick, Item::WarpedFungusOnAStick, + Item::Mace, Item::PlayerHead, Item::CreeperHead, Item::ZombieHead, @@ -865,6 +885,7 @@ pub static ENCHANTABLE_VANISHING: Lazy<HashSet<Item>> = Lazy::new(|| { }); pub static ENCHANTABLE_WEAPON: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ + Item::Mace, Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -1183,26 +1204,6 @@ pub static MEAT: Lazy<HashSet<Item>> = Lazy::new(|| { Item::RottenFlesh, ]) }); -pub static MUSIC_DISCS: Lazy<HashSet<Item>> = Lazy::new(|| { - HashSet::from_iter(vec![ - Item::MusicDiscPigstep, - Item::MusicDiscOtherside, - Item::MusicDisc5, - Item::MusicDiscRelic, - Item::MusicDisc13, - Item::MusicDiscCat, - Item::MusicDiscBlocks, - Item::MusicDiscChirp, - Item::MusicDiscFar, - Item::MusicDiscMall, - Item::MusicDiscMellohi, - Item::MusicDiscStal, - Item::MusicDiscStrad, - Item::MusicDiscWard, - Item::MusicDisc11, - Item::MusicDiscWait, - ]) -}); pub static NON_FLAMMABLE_WOOD: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ Item::WarpedStem, @@ -1450,6 +1451,9 @@ pub static SLABS: Lazy<HashSet<Item>> = Lazy::new(|| { Item::CutCopperSlab, Item::WaxedOxidizedCutCopperSlab, Item::MudBrickSlab, + Item::TuffSlab, + Item::PolishedTuffSlab, + Item::TuffBrickSlab, Item::OakSlab, Item::SpruceSlab, Item::BirchSlab, @@ -1539,6 +1543,9 @@ pub static STAIRS: Lazy<HashSet<Item>> = Lazy::new(|| { Item::WaxedCutCopperStairs, Item::WaxedOxidizedCutCopperStairs, Item::MudBrickStairs, + Item::TuffStairs, + Item::PolishedTuffStairs, + Item::TuffBrickStairs, Item::OakStairs, Item::SpruceStairs, Item::BirchStairs, @@ -1623,6 +1630,14 @@ pub static TERRACOTTA: Lazy<HashSet<Item>> = Lazy::new(|| { pub static TRAPDOORS: Lazy<HashSet<Item>> = Lazy::new(|| { HashSet::from_iter(vec![ Item::IronTrapdoor, + Item::CopperTrapdoor, + Item::ExposedCopperTrapdoor, + Item::WeatheredCopperTrapdoor, + Item::OxidizedCopperTrapdoor, + Item::WaxedCopperTrapdoor, + Item::WaxedExposedCopperTrapdoor, + Item::WaxedWeatheredCopperTrapdoor, + Item::WaxedOxidizedCopperTrapdoor, Item::AcaciaTrapdoor, Item::BirchTrapdoor, Item::DarkOakTrapdoor, @@ -1668,6 +1683,8 @@ pub static TRIM_TEMPLATES: Lazy<HashSet<Item>> = Lazy::new(|| { Item::SilenceArmorTrimSmithingTemplate, Item::RaiserArmorTrimSmithingTemplate, Item::HostArmorTrimSmithingTemplate, + Item::FlowArmorTrimSmithingTemplate, + Item::BoltArmorTrimSmithingTemplate, ]) }); pub static TRIMMABLE_ARMOR: Lazy<HashSet<Item>> = Lazy::new(|| { @@ -1735,6 +1752,9 @@ pub static WALLS: Lazy<HashSet<Item>> = Lazy::new(|| { Item::DeepslateTileWall, Item::DeepslateBrickWall, Item::MudBrickWall, + Item::TuffWall, + Item::PolishedTuffWall, + Item::TuffBrickWall, ]) }); pub static WARPED_STEMS: Lazy<HashSet<Item>> = Lazy::new(|| { |
