diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-12-03 14:42:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-03 14:42:23 -0600 |
| commit | b71a7af53ae2dba2b43c8efc855a4a3b853ebff2 (patch) | |
| tree | 031910714b6b9fb8cc0aaafe376f8629acedf671 /azalea-registry | |
| parent | ea5a1c1ec128cc1a33593c9d91ef758c3fb73e16 (diff) | |
| download | azalea-drasl-b71a7af53ae2dba2b43c8efc855a4a3b853ebff2.tar.xz | |
1.21.4 (#189)
* start updating to 1.21.4
* fix block codegen and stop using block data from burger
* 1.21.4-rc1
* 1.21.4
Diffstat (limited to 'azalea-registry')
| -rw-r--r-- | azalea-registry/Cargo.toml | 2 | ||||
| -rw-r--r-- | azalea-registry/azalea-registry-macros/Cargo.toml | 2 | ||||
| -rwxr-xr-x | azalea-registry/src/lib.rs | 42 | ||||
| -rw-r--r-- | azalea-registry/src/tags/blocks.rs | 239 | ||||
| -rw-r--r-- | azalea-registry/src/tags/items.rs | 147 |
5 files changed, 301 insertions, 131 deletions
diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 1afc14d0..45d16c4a 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-registry" repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-registry" -version = "0.10.3+mc1.21.3" +version = "0.10.3+mc1.21.4" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml index 147a21ad..f9e21c57 100644 --- a/azalea-registry/azalea-registry-macros/Cargo.toml +++ b/azalea-registry/azalea-registry-macros/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-registry-macros" repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-registry/azalea-registry-macros" -version = "0.10.3+mc1.21.3" +version = "0.10.3+mc1.21.4" [lib] proc-macro = true diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index e1fb2be5..ffead5b4 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -600,12 +600,19 @@ enum Block { MelonStem => "minecraft:melon_stem", Vine => "minecraft:vine", GlowLichen => "minecraft:glow_lichen", + ResinClump => "minecraft:resin_clump", OakFenceGate => "minecraft:oak_fence_gate", BrickStairs => "minecraft:brick_stairs", StoneBrickStairs => "minecraft:stone_brick_stairs", MudBrickStairs => "minecraft:mud_brick_stairs", Mycelium => "minecraft:mycelium", LilyPad => "minecraft:lily_pad", + ResinBlock => "minecraft:resin_block", + ResinBricks => "minecraft:resin_bricks", + ResinBrickStairs => "minecraft:resin_brick_stairs", + ResinBrickSlab => "minecraft:resin_brick_slab", + ResinBrickWall => "minecraft:resin_brick_wall", + ChiseledResinBricks => "minecraft:chiseled_resin_bricks", NetherBricks => "minecraft:nether_bricks", NetherBrickFence => "minecraft:nether_brick_fence", NetherBrickStairs => "minecraft:nether_brick_stairs", @@ -1351,6 +1358,10 @@ enum Block { PaleMossBlock => "minecraft:pale_moss_block", PaleMossCarpet => "minecraft:pale_moss_carpet", PaleHangingMoss => "minecraft:pale_hanging_moss", + OpenEyeblossom => "minecraft:open_eyeblossom", + ClosedEyeblossom => "minecraft:closed_eyeblossom", + PottedOpenEyeblossom => "minecraft:potted_open_eyeblossom", + PottedClosedEyeblossom => "minecraft:potted_closed_eyeblossom", } } @@ -1677,7 +1688,6 @@ enum EntityKind { CommandBlockMinecart => "minecraft:command_block_minecart", Cow => "minecraft:cow", Creaking => "minecraft:creaking", - CreakingTransient => "minecraft:creaking_transient", Creeper => "minecraft:creeper", DarkOakBoat => "minecraft:dark_oak_boat", DarkOakChestBoat => "minecraft:dark_oak_chest_boat", @@ -2155,6 +2165,8 @@ enum Item { RedWool => "minecraft:red_wool", BlackWool => "minecraft:black_wool", Dandelion => "minecraft:dandelion", + OpenEyeblossom => "minecraft:open_eyeblossom", + ClosedEyeblossom => "minecraft:closed_eyeblossom", Poppy => "minecraft:poppy", BlueOrchid => "minecraft:blue_orchid", Allium => "minecraft:allium", @@ -2303,6 +2315,13 @@ enum Item { Melon => "minecraft:melon", Vine => "minecraft:vine", GlowLichen => "minecraft:glow_lichen", + ResinClump => "minecraft:resin_clump", + ResinBlock => "minecraft:resin_block", + ResinBricks => "minecraft:resin_bricks", + ResinBrickStairs => "minecraft:resin_brick_stairs", + ResinBrickSlab => "minecraft:resin_brick_slab", + ResinBrickWall => "minecraft:resin_brick_wall", + ChiseledResinBricks => "minecraft:chiseled_resin_bricks", BrickStairs => "minecraft:brick_stairs", StoneBrickStairs => "minecraft:stone_brick_stairs", MudBrickStairs => "minecraft:mud_brick_stairs", @@ -3087,6 +3106,7 @@ enum Item { FireworkStar => "minecraft:firework_star", EnchantedBook => "minecraft:enchanted_book", NetherBrick => "minecraft:nether_brick", + ResinBrick => "minecraft:resin_brick", PrismarineShard => "minecraft:prismarine_shard", PrismarineCrystals => "minecraft:prismarine_crystals", Rabbit => "minecraft:rabbit", @@ -3669,6 +3689,7 @@ enum ParticleKind { Flame => "minecraft:flame", Infested => "minecraft:infested", CherryLeaves => "minecraft:cherry_leaves", + PaleOakLeaves => "minecraft:pale_oak_leaves", SculkSoul => "minecraft:sculk_soul", SculkCharge => "minecraft:sculk_charge", SculkChargePop => "minecraft:sculk_charge_pop", @@ -4316,6 +4337,7 @@ enum SoundEvent { EntityCreakingUnfreeze => "minecraft:entity.creaking.unfreeze", EntityCreakingSpawn => "minecraft:entity.creaking.spawn", EntityCreakingSway => "minecraft:entity.creaking.sway", + EntityCreakingTwitch => "minecraft:entity.creaking.twitch", BlockCreakingHeartBreak => "minecraft:block.creaking_heart.break", BlockCreakingHeartFall => "minecraft:block.creaking_heart.fall", BlockCreakingHeartHit => "minecraft:block.creaking_heart.hit", @@ -4454,6 +4476,11 @@ enum SoundEvent { EntityEvokerPrepareWololo => "minecraft:entity.evoker.prepare_wololo", EntityExperienceBottleThrow => "minecraft:entity.experience_bottle.throw", EntityExperienceOrbPickup => "minecraft:entity.experience_orb.pickup", + BlockEyeblossomOpenLong => "minecraft:block.eyeblossom.open_long", + BlockEyeblossomOpen => "minecraft:block.eyeblossom.open", + BlockEyeblossomCloseLong => "minecraft:block.eyeblossom.close_long", + BlockEyeblossomClose => "minecraft:block.eyeblossom.close", + BlockEyeblossomIdle => "minecraft:block.eyeblossom.idle", BlockFenceGateClose => "minecraft:block.fence_gate.close", BlockFenceGateOpen => "minecraft:block.fence_gate.open", ItemFirechargeUse => "minecraft:item.firecharge.use", @@ -5254,6 +5281,15 @@ 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", BlockSporeBlossomBreak => "minecraft:block.spore_blossom.break", BlockSporeBlossomFall => "minecraft:block.spore_blossom.fall", BlockSporeBlossomHit => "minecraft:block.spore_blossom.hit", @@ -6106,7 +6142,6 @@ enum BlockKind { CaveVinesPlant => "minecraft:cave_vines_plant", CeilingHangingSign => "minecraft:ceiling_hanging_sign", Chain => "minecraft:chain", - CherryLeaves => "minecraft:cherry_leaves", Chest => "minecraft:chest", ChiseledBookShelf => "minecraft:chiseled_book_shelf", ChorusFlower => "minecraft:chorus_flower", @@ -6144,6 +6179,7 @@ enum BlockKind { EndPortal => "minecraft:end_portal", EndPortalFrame => "minecraft:end_portal_frame", EndRod => "minecraft:end_rod", + Eyeblossom => "minecraft:eyeblossom", Farm => "minecraft:farm", BonemealableFeaturePlacer => "minecraft:bonemealable_feature_placer", Fence => "minecraft:fence", @@ -6195,6 +6231,7 @@ enum BlockKind { MossyCarpet => "minecraft:mossy_carpet", MovingPiston => "minecraft:moving_piston", Mud => "minecraft:mud", + Multiface => "minecraft:multiface", Mushroom => "minecraft:mushroom", Mycelium => "minecraft:mycelium", NetherPortal => "minecraft:nether_portal", @@ -6205,6 +6242,7 @@ enum BlockKind { Nylium => "minecraft:nylium", Observer => "minecraft:observer", Piglinwallskull => "minecraft:piglinwallskull", + ParticleLeaves => "minecraft:particle_leaves", PinkPetals => "minecraft:pink_petals", PistonBase => "minecraft:piston_base", PistonHead => "minecraft:piston_head", diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs index 0697adeb..f4b2aaf5 100644 --- a/azalea-registry/src/tags/blocks.rs +++ b/azalea-registry/src/tags/blocks.rs @@ -24,6 +24,7 @@ pub static ALL_HANGING_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryHangingSign, Block::JungleHangingSign, Block::DarkOakHangingSign, + Block::PaleOakHangingSign, Block::CrimsonHangingSign, Block::WarpedHangingSign, Block::MangroveHangingSign, @@ -35,6 +36,7 @@ pub static ALL_HANGING_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryWallHangingSign, Block::JungleWallHangingSign, Block::DarkOakWallHangingSign, + Block::PaleOakWallHangingSign, Block::CrimsonWallHangingSign, Block::WarpedWallHangingSign, Block::MangroveWallHangingSign, @@ -49,6 +51,7 @@ pub static ALL_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaSign, Block::JungleSign, Block::DarkOakSign, + Block::PaleOakSign, Block::CrimsonSign, Block::WarpedSign, Block::MangroveSign, @@ -60,6 +63,7 @@ pub static ALL_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaWallSign, Block::JungleWallSign, Block::DarkOakWallSign, + Block::PaleOakWallSign, Block::CrimsonWallSign, Block::WarpedWallSign, Block::MangroveWallSign, @@ -72,6 +76,7 @@ pub static ALL_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryHangingSign, Block::JungleHangingSign, Block::DarkOakHangingSign, + Block::PaleOakHangingSign, Block::CrimsonHangingSign, Block::WarpedHangingSign, Block::MangroveHangingSign, @@ -83,6 +88,7 @@ pub static ALL_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryWallHangingSign, Block::JungleWallHangingSign, Block::DarkOakWallHangingSign, + Block::PaleOakWallHangingSign, Block::CrimsonWallHangingSign, Block::WarpedWallHangingSign, Block::MangroveWallHangingSign, @@ -137,6 +143,7 @@ pub static AZALEA_GROWS_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::Sand, @@ -183,6 +190,7 @@ pub static AZALEA_ROOT_REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::Terracotta, @@ -234,6 +242,7 @@ pub static BAMBOO_PLANTABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -325,6 +334,37 @@ pub static BEDS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::YellowBed, ]) }); +pub static BEE_ATTRACTIVE: LazyLock<HashSet<Block>> = LazyLock::new(|| { + HashSet::from_iter(vec![ + Block::Dandelion, + Block::OpenEyeblossom, + Block::Poppy, + Block::BlueOrchid, + Block::Allium, + Block::AzureBluet, + Block::RedTulip, + Block::OrangeTulip, + Block::WhiteTulip, + Block::PinkTulip, + Block::OxeyeDaisy, + Block::Cornflower, + Block::LilyOfTheValley, + Block::WitherRose, + Block::Torchflower, + Block::Sunflower, + Block::Lilac, + Block::Peony, + Block::RoseBush, + Block::PitcherPlant, + Block::FloweringAzaleaLeaves, + Block::FloweringAzalea, + Block::MangrovePropagule, + Block::CherryLeaves, + Block::PinkPetals, + Block::ChorusFlower, + Block::SporeBlossom, + ]) +}); pub static BEE_GROWABLES: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::SweetBerryBush, @@ -354,6 +394,7 @@ pub static BIG_DRIPLEAF_PLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -376,6 +417,7 @@ pub static BUTTONS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleButton, Block::AcaciaButton, Block::DarkOakButton, + Block::PaleOakButton, Block::CrimsonButton, Block::WarpedButton, Block::MangroveButton, @@ -472,6 +514,7 @@ pub static CEILING_HANGING_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryHangingSign, Block::JungleHangingSign, Block::DarkOakHangingSign, + Block::PaleOakHangingSign, Block::CrimsonHangingSign, Block::WarpedHangingSign, Block::MangroveHangingSign, @@ -504,10 +547,12 @@ pub static COAL_ORES: LazyLock<HashSet<Block>> = pub static COMBINATION_STEP_SOUND_BLOCKS: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::MossCarpet, + Block::PaleMossCarpet, Block::Snow, Block::NetherSprouts, Block::WarpedRoots, Block::CrimsonRoots, + Block::ResinClump, Block::WhiteCarpet, Block::OrangeCarpet, Block::MagentaCarpet, @@ -531,6 +576,7 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock<HashSet<Block>> = LazyLock::ne Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -552,6 +598,10 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock<HashSet<Block>> = LazyLock::ne Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -734,6 +784,7 @@ pub static DEAD_BUSH_MAY_PLACE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -751,6 +802,7 @@ pub static DIRT: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -774,6 +826,7 @@ pub static DOORS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleDoor, Block::AcaciaDoor, Block::DarkOakDoor, + Block::PaleOakDoor, Block::CrimsonDoor, Block::WarpedDoor, Block::MangroveDoor, @@ -833,6 +886,7 @@ pub static ENCHANTMENT_POWER_TRANSMITTER: LazyLock<HashSet<Block>> = LazyLock::n Block::Snow, Block::Vine, Block::GlowLichen, + Block::ResinClump, Block::Light, Block::TallGrass, Block::LargeFern, @@ -866,6 +920,7 @@ pub static ENDERMAN_HOLDABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::WarpedNylium, Block::WarpedRoots, Block::Dandelion, + Block::OpenEyeblossom, Block::Poppy, Block::BlueOrchid, Block::Allium, @@ -879,6 +934,7 @@ pub static ENDERMAN_HOLDABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::LilyOfTheValley, Block::WitherRose, Block::Torchflower, + Block::ClosedEyeblossom, Block::Dirt, Block::GrassBlock, Block::Podzol, @@ -886,6 +942,7 @@ pub static ENDERMAN_HOLDABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -921,6 +978,7 @@ pub static FENCE_GATES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaFenceGate, Block::BirchFenceGate, Block::DarkOakFenceGate, + Block::PaleOakFenceGate, Block::JungleFenceGate, Block::OakFenceGate, Block::SpruceFenceGate, @@ -937,6 +995,7 @@ pub static FENCES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::OakFence, Block::AcaciaFence, Block::DarkOakFence, + Block::PaleOakFence, Block::SpruceFence, Block::BirchFence, Block::JungleFence, @@ -952,6 +1011,8 @@ pub static FIRE: LazyLock<HashSet<Block>> = pub static FLOWER_POTS: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::FlowerPot, + Block::PottedOpenEyeblossom, + Block::PottedClosedEyeblossom, Block::PottedPoppy, Block::PottedBlueOrchid, Block::PottedAllium, @@ -968,6 +1029,7 @@ pub static FLOWER_POTS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::PottedJungleSapling, Block::PottedAcaciaSapling, Block::PottedDarkOakSapling, + Block::PottedPaleOakSapling, Block::PottedRedMushroom, Block::PottedBrownMushroom, Block::PottedDeadBush, @@ -990,6 +1052,11 @@ pub static FLOWER_POTS: LazyLock<HashSet<Block>> = LazyLock::new(|| { }); pub static FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ + Block::Sunflower, + Block::Lilac, + Block::Peony, + Block::RoseBush, + Block::PitcherPlant, Block::FloweringAzaleaLeaves, Block::FloweringAzalea, Block::MangrovePropagule, @@ -998,6 +1065,7 @@ pub static FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::ChorusFlower, Block::SporeBlossom, Block::Dandelion, + Block::OpenEyeblossom, Block::Poppy, Block::BlueOrchid, Block::Allium, @@ -1011,11 +1079,7 @@ pub static FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::LilyOfTheValley, Block::WitherRose, Block::Torchflower, - Block::Sunflower, - Block::Lilac, - Block::Peony, - Block::RoseBush, - Block::PitcherPlant, + Block::ClosedEyeblossom, ]) }); pub static FOXES_SPAWNABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -1230,14 +1294,6 @@ pub static INCORRECT_FOR_GOLD_TOOL: LazyLock<HashSet<Block>> = LazyLock::new(|| 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: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -1367,14 +1423,6 @@ pub static INCORRECT_FOR_WOODEN_TOOL: LazyLock<HashSet<Block>> = LazyLock::new(| 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: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -1420,6 +1468,7 @@ pub static LAVA_POOL_STONE_CANNOT_REPLACE: LazyLock<HashSet<Block>> = LazyLock:: Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -1439,6 +1488,10 @@ pub static LAVA_POOL_STONE_CANNOT_REPLACE: LazyLock<HashSet<Block>> = LazyLock:: Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -1474,6 +1527,7 @@ pub static LEAVES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -1497,6 +1551,10 @@ pub static LOGS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -1533,6 +1591,10 @@ pub static LOGS_THAT_BURN: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -1583,6 +1645,7 @@ pub static LUSH_GROUND_REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -1706,6 +1769,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::BambooMosaicSlab, Block::BambooMosaicStairs, Block::ChiseledBookshelf, + Block::CreakingHeart, Block::WhiteBanner, Block::OrangeBanner, Block::MagentaBanner, @@ -1741,6 +1805,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaFenceGate, Block::BirchFenceGate, Block::DarkOakFenceGate, + Block::PaleOakFenceGate, Block::JungleFenceGate, Block::OakFenceGate, Block::SpruceFenceGate, @@ -1755,6 +1820,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePlanks, Block::AcaciaPlanks, Block::DarkOakPlanks, + Block::PaleOakPlanks, Block::CrimsonPlanks, Block::WarpedPlanks, Block::MangrovePlanks, @@ -1766,6 +1832,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleSapling, Block::AcaciaSapling, Block::DarkOakSapling, + Block::PaleOakSapling, Block::Azalea, Block::FloweringAzalea, Block::MangrovePropagule, @@ -1776,6 +1843,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleButton, Block::AcaciaButton, Block::DarkOakButton, + Block::PaleOakButton, Block::CrimsonButton, Block::WarpedButton, Block::MangroveButton, @@ -1787,6 +1855,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleDoor, Block::AcaciaDoor, Block::DarkOakDoor, + Block::PaleOakDoor, Block::CrimsonDoor, Block::WarpedDoor, Block::MangroveDoor, @@ -1795,6 +1864,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::OakFence, Block::AcaciaFence, Block::DarkOakFence, + Block::PaleOakFence, Block::SpruceFence, Block::BirchFence, Block::JungleFence, @@ -1809,6 +1879,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePressurePlate, Block::AcaciaPressurePlate, Block::DarkOakPressurePlate, + Block::PaleOakPressurePlate, Block::CrimsonPressurePlate, Block::WarpedPressurePlate, Block::MangrovePressurePlate, @@ -1820,6 +1891,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleSlab, Block::AcaciaSlab, Block::DarkOakSlab, + Block::PaleOakSlab, Block::CrimsonSlab, Block::WarpedSlab, Block::MangroveSlab, @@ -1831,6 +1903,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleStairs, Block::AcaciaStairs, Block::DarkOakStairs, + Block::PaleOakStairs, Block::CrimsonStairs, Block::WarpedStairs, Block::MangroveStairs, @@ -1839,6 +1912,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaTrapdoor, Block::BirchTrapdoor, Block::DarkOakTrapdoor, + Block::PaleOakTrapdoor, Block::JungleTrapdoor, Block::OakTrapdoor, Block::SpruceTrapdoor, @@ -1863,6 +1937,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaSign, Block::JungleSign, Block::DarkOakSign, + Block::PaleOakSign, Block::CrimsonSign, Block::WarpedSign, Block::MangroveSign, @@ -1874,6 +1949,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaWallSign, Block::JungleWallSign, Block::DarkOakWallSign, + Block::PaleOakWallSign, Block::CrimsonWallSign, Block::WarpedWallSign, Block::MangroveWallSign, @@ -1886,6 +1962,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryHangingSign, Block::JungleHangingSign, Block::DarkOakHangingSign, + Block::PaleOakHangingSign, Block::CrimsonHangingSign, Block::WarpedHangingSign, Block::MangroveHangingSign, @@ -1897,6 +1974,7 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryWallHangingSign, Block::JungleWallHangingSign, Block::DarkOakWallHangingSign, + Block::PaleOakWallHangingSign, Block::CrimsonWallHangingSign, Block::WarpedWallHangingSign, Block::MangroveWallHangingSign, @@ -1905,6 +1983,10 @@ pub static MINEABLE_AXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -1948,6 +2030,7 @@ pub static MINEABLE_HOE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -1958,6 +2041,8 @@ pub static MINEABLE_HOE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CalibratedSculkSensor, Block::MossBlock, Block::MossCarpet, + Block::PaleMossBlock, + Block::PaleMossCarpet, Block::Sculk, Block::SculkCatalyst, Block::SculkVein, @@ -2346,6 +2431,11 @@ pub static MINEABLE_PICKAXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::WaxedWeatheredCopperTrapdoor, Block::WaxedOxidizedCopperTrapdoor, Block::HeavyCore, + Block::ResinBricks, + Block::ResinBrickSlab, + Block::ResinBrickWall, + Block::ResinBrickStairs, + Block::ChiseledResinBricks, Block::StoneButton, Block::PolishedBlackstoneButton, Block::CobblestoneWall, @@ -2373,6 +2463,7 @@ pub static MINEABLE_PICKAXE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::TuffWall, Block::PolishedTuffWall, Block::TuffBrickWall, + Block::ResinBrickWall, Block::ShulkerBox, Block::BlackShulkerBox, Block::BlueShulkerBox, @@ -2459,6 +2550,7 @@ pub static MOB_INTERACTABLE_DOORS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleDoor, Block::AcaciaDoor, Block::DarkOakDoor, + Block::PaleOakDoor, Block::CrimsonDoor, Block::WarpedDoor, Block::MangroveDoor, @@ -2485,6 +2577,7 @@ pub static MOSS_REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -2600,14 +2693,6 @@ pub static NEEDS_STONE_TOOL: LazyLock<HashSet<Block>> = LazyLock::new(|| { 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: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -2630,6 +2715,7 @@ pub static NETHER_CARVER_REPLACEABLES: LazyLock<HashSet<Block>> = LazyLock::new( Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::CrimsonNylium, @@ -2676,7 +2762,6 @@ pub static OVERWORLD_CARVER_REPLACEABLES: LazyLock<HashSet<Block>> = LazyLock::n Block::Sandstone, Block::RedSandstone, Block::Calcite, - Block::Snow, Block::PackedIce, Block::RawIronBlock, Block::RawCopperBlock, @@ -2693,6 +2778,7 @@ pub static OVERWORLD_CARVER_REPLACEABLES: LazyLock<HashSet<Block>> = LazyLock::n Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::Sand, @@ -2720,6 +2806,9 @@ pub static OVERWORLD_CARVER_REPLACEABLES: LazyLock<HashSet<Block>> = LazyLock::n Block::DeepslateIronOre, Block::CopperOre, Block::DeepslateCopperOre, + Block::Snow, + Block::SnowBlock, + Block::PowderSnow, ]) }); pub static OVERWORLD_NATURAL_LOGS: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -2730,10 +2819,19 @@ pub static OVERWORLD_NATURAL_LOGS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLog, Block::SpruceLog, Block::DarkOakLog, + Block::PaleOakLog, Block::MangroveLog, Block::CherryLog, ]) }); +pub static PALE_OAK_LOGS: LazyLock<HashSet<Block>> = LazyLock::new(|| { + HashSet::from_iter(vec![ + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, + ]) +}); pub static PARROTS_SPAWNABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::GrassBlock, @@ -2741,6 +2839,7 @@ pub static PARROTS_SPAWNABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -2760,6 +2859,10 @@ pub static PARROTS_SPAWNABLE_ON: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::DarkOakWood, Block::StrippedDarkOakLog, Block::StrippedDarkOakWood, + Block::PaleOakLog, + Block::PaleOakWood, + Block::StrippedPaleOakLog, + Block::StrippedPaleOakWood, Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -2807,6 +2910,7 @@ pub static PLANKS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePlanks, Block::AcaciaPlanks, Block::DarkOakPlanks, + Block::PaleOakPlanks, Block::CrimsonPlanks, Block::WarpedPlanks, Block::MangrovePlanks, @@ -2833,6 +2937,7 @@ pub static PRESSURE_PLATES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePressurePlate, Block::AcaciaPressurePlate, Block::DarkOakPressurePlate, + Block::PaleOakPressurePlate, Block::CrimsonPressurePlate, Block::WarpedPressurePlate, Block::MangrovePressurePlate, @@ -2883,6 +2988,7 @@ pub static REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Snow, Block::Vine, Block::GlowLichen, + Block::ResinClump, Block::Light, Block::TallGrass, Block::LargeFern, @@ -2898,6 +3004,7 @@ pub static REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { }); pub static REPLACEABLE_BY_TREES: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ + Block::PaleMossCarpet, Block::ShortGrass, Block::Fern, Block::DeadBush, @@ -2920,6 +3027,7 @@ pub static REPLACEABLE_BY_TREES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -2927,6 +3035,22 @@ pub static REPLACEABLE_BY_TREES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::FloweringAzaleaLeaves, Block::MangroveLeaves, Block::CherryLeaves, + Block::Dandelion, + Block::OpenEyeblossom, + Block::Poppy, + Block::BlueOrchid, + Block::Allium, + Block::AzureBluet, + Block::RedTulip, + Block::OrangeTulip, + Block::WhiteTulip, + Block::PinkTulip, + Block::OxeyeDaisy, + Block::Cornflower, + Block::LilyOfTheValley, + Block::WitherRose, + Block::Torchflower, + Block::ClosedEyeblossom, ]) }); pub static SAND: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -2945,6 +3069,7 @@ pub static SAPLINGS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleSapling, Block::AcaciaSapling, Block::DarkOakSapling, + Block::PaleOakSapling, Block::Azalea, Block::FloweringAzalea, Block::MangrovePropagule, @@ -2978,6 +3103,7 @@ pub static SCULK_REPLACEABLE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::Terracotta, @@ -3037,6 +3163,7 @@ pub static SCULK_REPLACEABLE_WORLD_GEN: LazyLock<HashSet<Block>> = LazyLock::new Block::Mycelium, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, Block::Terracotta, @@ -3092,6 +3219,7 @@ pub static SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaSign, Block::JungleSign, Block::DarkOakSign, + Block::PaleOakSign, Block::CrimsonSign, Block::WarpedSign, Block::MangroveSign, @@ -3103,6 +3231,7 @@ pub static SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaWallSign, Block::JungleWallSign, Block::DarkOakWallSign, + Block::PaleOakWallSign, Block::CrimsonWallSign, Block::WarpedWallSign, Block::MangroveWallSign, @@ -3161,12 +3290,14 @@ pub static SLABS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::TuffSlab, Block::PolishedTuffSlab, Block::TuffBrickSlab, + Block::ResinBrickSlab, Block::OakSlab, Block::SpruceSlab, Block::BirchSlab, Block::JungleSlab, Block::AcaciaSlab, Block::DarkOakSlab, + Block::PaleOakSlab, Block::CrimsonSlab, Block::WarpedSlab, Block::MangroveSlab, @@ -3179,6 +3310,7 @@ pub static SMALL_DRIPLEAF_PLACEABLE: LazyLock<HashSet<Block>> = pub static SMALL_FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::Dandelion, + Block::OpenEyeblossom, Block::Poppy, Block::BlueOrchid, Block::Allium, @@ -3192,6 +3324,7 @@ pub static SMALL_FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::LilyOfTheValley, Block::WitherRose, Block::Torchflower, + Block::ClosedEyeblossom, ]) }); pub static SMELTS_TO_GLASS: LazyLock<HashSet<Block>> = @@ -3210,6 +3343,7 @@ pub static SNAPS_GOAT_HORN: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLog, Block::SpruceLog, Block::DarkOakLog, + Block::PaleOakLog, Block::MangroveLog, Block::CherryLog, ]) @@ -3222,6 +3356,7 @@ pub static SNIFFER_DIGGABLE_BLOCK: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CoarseDirt, Block::RootedDirt, Block::MossBlock, + Block::PaleMossBlock, Block::Mud, Block::MuddyMangroveRoots, ]) @@ -3293,12 +3428,14 @@ pub static STAIRS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::TuffStairs, Block::PolishedTuffStairs, Block::TuffBrickStairs, + Block::ResinBrickStairs, Block::OakStairs, Block::SpruceStairs, Block::BirchStairs, Block::JungleStairs, Block::AcaciaStairs, Block::DarkOakStairs, + Block::PaleOakStairs, Block::CrimsonStairs, Block::WarpedStairs, Block::MangroveStairs, @@ -3314,6 +3451,7 @@ pub static STANDING_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaSign, Block::JungleSign, Block::DarkOakSign, + Block::PaleOakSign, Block::CrimsonSign, Block::WarpedSign, Block::MangroveSign, @@ -3378,7 +3516,6 @@ pub static SWORD_EFFICIENT: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CaveVines, Block::CaveVinesPlant, Block::SporeBlossom, - Block::MossCarpet, Block::PinkPetals, Block::BigDripleaf, Block::BigDripleafStem, @@ -3398,6 +3535,7 @@ pub static SWORD_EFFICIENT: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, + Block::PaleOakLeaves, Block::DarkOakLeaves, Block::AcaciaLeaves, Block::BirchLeaves, @@ -3411,24 +3549,11 @@ pub static SWORD_EFFICIENT: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleSapling, Block::AcaciaSapling, Block::DarkOakSapling, + Block::PaleOakSapling, Block::Azalea, Block::FloweringAzalea, Block::MangrovePropagule, Block::CherrySapling, - Block::Dandelion, - Block::Poppy, - Block::BlueOrchid, - Block::Allium, - Block::AzureBluet, - Block::RedTulip, - Block::OrangeTulip, - Block::WhiteTulip, - Block::PinkTulip, - Block::OxeyeDaisy, - Block::Cornflower, - Block::LilyOfTheValley, - Block::WitherRose, - Block::Torchflower, Block::Beetroots, Block::Carrots, Block::Potatoes, @@ -3439,15 +3564,6 @@ pub static SWORD_EFFICIENT: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::PitcherCrop, ]) }); -pub static TALL_FLOWERS: LazyLock<HashSet<Block>> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Block::Sunflower, - Block::Lilac, - Block::Peony, - Block::RoseBush, - Block::PitcherPlant, - ]) -}); pub static TERRACOTTA: LazyLock<HashSet<Block>> = LazyLock::new(|| { HashSet::from_iter(vec![ Block::Terracotta, @@ -3485,6 +3601,7 @@ pub static TRAPDOORS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaTrapdoor, Block::BirchTrapdoor, Block::DarkOakTrapdoor, + Block::PaleOakTrapdoor, Block::JungleTrapdoor, Block::OakTrapdoor, Block::SpruceTrapdoor, @@ -3520,6 +3637,7 @@ pub static UNSTABLE_BOTTOM_CENTER: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaFenceGate, Block::BirchFenceGate, Block::DarkOakFenceGate, + Block::PaleOakFenceGate, Block::JungleFenceGate, Block::OakFenceGate, Block::SpruceFenceGate, @@ -3552,6 +3670,7 @@ pub static WALL_HANGING_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::CherryWallHangingSign, Block::JungleWallHangingSign, Block::DarkOakWallHangingSign, + Block::PaleOakWallHangingSign, Block::CrimsonWallHangingSign, Block::WarpedWallHangingSign, Block::MangroveWallHangingSign, @@ -3604,6 +3723,7 @@ pub static WALL_POST_OVERRIDE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaSign, Block::JungleSign, Block::DarkOakSign, + Block::PaleOakSign, Block::CrimsonSign, Block::WarpedSign, Block::MangroveSign, @@ -3615,6 +3735,7 @@ pub static WALL_POST_OVERRIDE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaWallSign, Block::JungleWallSign, Block::DarkOakWallSign, + Block::PaleOakWallSign, Block::CrimsonWallSign, Block::WarpedWallSign, Block::MangroveWallSign, @@ -3626,6 +3747,7 @@ pub static WALL_POST_OVERRIDE: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePressurePlate, Block::AcaciaPressurePlate, Block::DarkOakPressurePlate, + Block::PaleOakPressurePlate, Block::CrimsonPressurePlate, Block::WarpedPressurePlate, Block::MangrovePressurePlate, @@ -3643,6 +3765,7 @@ pub static WALL_SIGNS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaWallSign, Block::JungleWallSign, Block::DarkOakWallSign, + Block::PaleOakWallSign, Block::CrimsonWallSign, Block::WarpedWallSign, Block::MangroveWallSign, @@ -3677,6 +3800,7 @@ pub static WALLS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::TuffWall, Block::PolishedTuffWall, Block::TuffBrickWall, + Block::ResinBrickWall, ]) }); pub static WARPED_STEMS: LazyLock<HashSet<Block>> = LazyLock::new(|| { @@ -3725,6 +3849,7 @@ pub static WOODEN_BUTTONS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleButton, Block::AcaciaButton, Block::DarkOakButton, + Block::PaleOakButton, Block::CrimsonButton, Block::WarpedButton, Block::MangroveButton, @@ -3740,6 +3865,7 @@ pub static WOODEN_DOORS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleDoor, Block::AcaciaDoor, Block::DarkOakDoor, + Block::PaleOakDoor, Block::CrimsonDoor, Block::WarpedDoor, Block::MangroveDoor, @@ -3752,6 +3878,7 @@ pub static WOODEN_FENCES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::OakFence, Block::AcaciaFence, Block::DarkOakFence, + Block::PaleOakFence, Block::SpruceFence, Block::BirchFence, Block::JungleFence, @@ -3770,6 +3897,7 @@ pub static WOODEN_PRESSURE_PLATES: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JunglePressurePlate, Block::AcaciaPressurePlate, Block::DarkOakPressurePlate, + Block::PaleOakPressurePlate, Block::CrimsonPressurePlate, Block::WarpedPressurePlate, Block::MangrovePressurePlate, @@ -3785,6 +3913,7 @@ pub static WOODEN_SLABS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleSlab, Block::AcaciaSlab, Block::DarkOakSlab, + Block::PaleOakSlab, Block::CrimsonSlab, Block::WarpedSlab, Block::MangroveSlab, @@ -3800,6 +3929,7 @@ pub static WOODEN_STAIRS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::JungleStairs, Block::AcaciaStairs, Block::DarkOakStairs, + Block::PaleOakStairs, Block::CrimsonStairs, Block::WarpedStairs, Block::MangroveStairs, @@ -3812,6 +3942,7 @@ pub static WOODEN_TRAPDOORS: LazyLock<HashSet<Block>> = LazyLock::new(|| { Block::AcaciaTrapdoor, Block::BirchTrapdoor, Block::DarkOakTrapdoor, + Block::PaleOakTrapdoor, Block::JungleTrapdoor, Block::OakTrapdoor, Block::SpruceTrapdoor, diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs index 421b43af..f20b5f66 100644 --- a/azalea-registry/src/tags/items.rs +++ b/azalea-registry/src/tags/items.rs @@ -84,14 +84,8 @@ pub static BEDS: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static BEE_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ - Item::FloweringAzaleaLeaves, - Item::FloweringAzalea, - Item::MangrovePropagule, - Item::CherryLeaves, - Item::PinkPetals, - Item::ChorusFlower, - Item::SporeBlossom, Item::Dandelion, + Item::OpenEyeblossom, Item::Poppy, Item::BlueOrchid, Item::Allium, @@ -110,6 +104,13 @@ pub static BEE_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::Peony, Item::RoseBush, Item::PitcherPlant, + Item::FloweringAzaleaLeaves, + Item::FloweringAzalea, + Item::MangrovePropagule, + Item::CherryLeaves, + Item::PinkPetals, + Item::ChorusFlower, + Item::SporeBlossom, ]) }); pub static BIRCH_LOGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -128,6 +129,7 @@ pub static BOATS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleBoat, Item::AcaciaBoat, Item::DarkOakBoat, + Item::PaleOakBoat, Item::MangroveBoat, Item::BambooRaft, Item::CherryBoat, @@ -137,6 +139,7 @@ pub static BOATS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleChestBoat, Item::AcaciaChestBoat, Item::DarkOakChestBoat, + Item::PaleOakChestBoat, Item::MangroveChestBoat, Item::BambooChestRaft, Item::CherryChestBoat, @@ -218,6 +221,7 @@ pub static BUTTONS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleButton, Item::AcaciaButton, Item::DarkOakButton, + Item::PaleOakButton, Item::CrimsonButton, Item::WarpedButton, Item::MangroveButton, @@ -278,6 +282,7 @@ pub static CHEST_BOATS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleChestBoat, Item::AcaciaChestBoat, Item::DarkOakChestBoat, + Item::PaleOakChestBoat, Item::MangroveChestBoat, Item::BambooChestRaft, Item::CherryChestBoat, @@ -314,6 +319,7 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock<HashSet<Item>> = LazyLock::new Item::JungleLeaves, Item::OakLeaves, Item::SpruceLeaves, + Item::PaleOakLeaves, Item::DarkOakLeaves, Item::AcaciaLeaves, Item::BirchLeaves, @@ -335,6 +341,10 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock<HashSet<Item>> = LazyLock::new Item::DarkOakWood, Item::StrippedDarkOakLog, Item::StrippedDarkOakWood, + Item::PaleOakLog, + Item::PaleOakWood, + Item::StrippedPaleOakLog, + Item::StrippedPaleOakWood, Item::OakLog, Item::OakWood, Item::StrippedOakLog, @@ -507,6 +517,7 @@ pub static DIRT: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::Mycelium, Item::RootedDirt, Item::MossBlock, + Item::PaleMossBlock, Item::Mud, Item::MuddyMangroveRoots, ]) @@ -528,6 +539,7 @@ pub static DOORS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleDoor, Item::AcaciaDoor, Item::DarkOakDoor, + Item::PaleOakDoor, Item::CrimsonDoor, Item::WarpedDoor, Item::MangroveDoor, @@ -535,6 +547,8 @@ pub static DOORS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::CherryDoor, ]) }); +pub static DROWNED_PREFERRED_WEAPONS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter(vec![Item::Trident])); pub static DUPLICATES_ALLAYS: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter(vec![Item::AmethystShard])); pub static DYEABLE: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -934,6 +948,7 @@ pub static FENCE_GATES: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::AcaciaFenceGate, Item::BirchFenceGate, Item::DarkOakFenceGate, + Item::PaleOakFenceGate, Item::JungleFenceGate, Item::OakFenceGate, Item::SpruceFenceGate, @@ -950,6 +965,7 @@ pub static FENCES: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::OakFence, Item::AcaciaFence, Item::DarkOakFence, + Item::PaleOakFence, Item::SpruceFence, Item::BirchFence, Item::JungleFence, @@ -970,36 +986,6 @@ pub static FISHES: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::TropicalFish, ]) }); -pub static FLOWERS: LazyLock<HashSet<Item>> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::FloweringAzaleaLeaves, - Item::FloweringAzalea, - Item::MangrovePropagule, - Item::CherryLeaves, - Item::PinkPetals, - Item::ChorusFlower, - Item::SporeBlossom, - Item::Dandelion, - Item::Poppy, - Item::BlueOrchid, - Item::Allium, - Item::AzureBluet, - Item::RedTulip, - Item::OrangeTulip, - Item::WhiteTulip, - Item::PinkTulip, - Item::OxeyeDaisy, - Item::Cornflower, - Item::LilyOfTheValley, - Item::WitherRose, - Item::Torchflower, - Item::Sunflower, - Item::Lilac, - Item::Peony, - Item::RoseBush, - Item::PitcherPlant, - ]) -}); pub static FOOT_ARMOR: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ Item::LeatherBoots, @@ -1047,6 +1033,7 @@ pub static HANGING_SIGNS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::CherryHangingSign, Item::JungleHangingSign, Item::DarkOakHangingSign, + Item::PaleOakHangingSign, Item::CrimsonHangingSign, Item::WarpedHangingSign, Item::MangroveHangingSign, @@ -1115,6 +1102,7 @@ pub static LEAVES: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleLeaves, Item::OakLeaves, Item::SpruceLeaves, + Item::PaleOakLeaves, Item::DarkOakLeaves, Item::AcaciaLeaves, Item::BirchLeaves, @@ -1154,6 +1142,10 @@ pub static LOGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::DarkOakWood, Item::StrippedDarkOakLog, Item::StrippedDarkOakWood, + Item::PaleOakLog, + Item::PaleOakWood, + Item::StrippedPaleOakLog, + Item::StrippedPaleOakWood, Item::OakLog, Item::OakWood, Item::StrippedOakLog, @@ -1190,6 +1182,10 @@ pub static LOGS_THAT_BURN: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::DarkOakWood, Item::StrippedDarkOakLog, Item::StrippedDarkOakWood, + Item::PaleOakLog, + Item::PaleOakWood, + Item::StrippedPaleOakLog, + Item::StrippedPaleOakWood, Item::OakLog, Item::OakWood, Item::StrippedOakLog, @@ -1302,6 +1298,14 @@ pub static OAK_LOGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static OCELOT_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter(vec![Item::Cod, Item::Salmon])); +pub static PALE_OAK_LOGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { + HashSet::from_iter(vec![ + Item::PaleOakLog, + Item::PaleOakWood, + Item::StrippedPaleOakLog, + Item::StrippedPaleOakWood, + ]) +}); pub static PANDA_EATS_FROM_GROUND: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter(vec![Item::Cake, Item::Bamboo])); pub static PANDA_FOOD: LazyLock<HashSet<Item>> = @@ -1361,6 +1365,8 @@ pub static PIGLIN_LOVED: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::DeepslateGoldOre, ]) }); +pub static PIGLIN_PREFERRED_WEAPONS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter(vec![Item::Crossbow])); pub static PIGLIN_REPELLENTS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![Item::SoulTorch, Item::SoulLantern, Item::SoulCampfire]) }); @@ -1372,6 +1378,8 @@ pub static PIGLIN_SAFE_ARMOR: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::GoldenBoots, ]) }); +pub static PILLAGER_PREFERRED_WEAPONS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter(vec![Item::Crossbow])); pub static PLANKS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ Item::OakPlanks, @@ -1380,6 +1388,7 @@ pub static PLANKS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JunglePlanks, Item::AcaciaPlanks, Item::DarkOakPlanks, + Item::PaleOakPlanks, Item::CrimsonPlanks, Item::WarpedPlanks, Item::MangrovePlanks, @@ -1431,6 +1440,7 @@ pub static SAPLINGS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::JungleSapling, Item::AcaciaSapling, Item::DarkOakSapling, + Item::PaleOakSapling, Item::Azalea, Item::FloweringAzalea, Item::MangrovePropagule, @@ -1478,6 +1488,7 @@ pub static SIGNS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::AcaciaSign, Item::JungleSign, Item::DarkOakSign, + Item::PaleOakSign, Item::CrimsonSign, Item::WarpedSign, Item::MangroveSign, @@ -1485,6 +1496,8 @@ pub static SIGNS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::CherrySign, ]) }); +pub static SKELETON_PREFERRED_WEAPONS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter(vec![Item::Bow])); pub static SKULLS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ Item::PlayerHead, @@ -1547,12 +1560,14 @@ pub static SLABS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::TuffSlab, Item::PolishedTuffSlab, Item::TuffBrickSlab, + Item::ResinBrickSlab, Item::OakSlab, Item::SpruceSlab, Item::BirchSlab, Item::JungleSlab, Item::AcaciaSlab, Item::DarkOakSlab, + Item::PaleOakSlab, Item::CrimsonSlab, Item::WarpedSlab, Item::MangroveSlab, @@ -1563,6 +1578,7 @@ pub static SLABS: LazyLock<HashSet<Item>> = LazyLock::new(|| { pub static SMALL_FLOWERS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ Item::Dandelion, + Item::OpenEyeblossom, Item::Poppy, Item::BlueOrchid, Item::Allium, @@ -1576,6 +1592,7 @@ pub static SMALL_FLOWERS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::LilyOfTheValley, Item::WitherRose, Item::Torchflower, + Item::ClosedEyeblossom, ]) }); pub static SMELTS_TO_GLASS: LazyLock<HashSet<Item>> = @@ -1639,12 +1656,14 @@ pub static STAIRS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::TuffStairs, Item::PolishedTuffStairs, Item::TuffBrickStairs, + Item::ResinBrickStairs, Item::OakStairs, Item::SpruceStairs, Item::BirchStairs, Item::JungleStairs, Item::AcaciaStairs, Item::DarkOakStairs, + Item::PaleOakStairs, Item::CrimsonStairs, Item::WarpedStairs, Item::MangroveStairs, @@ -1690,15 +1709,6 @@ pub static SWORDS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::IronSword, ]) }); -pub static TALL_FLOWERS: LazyLock<HashSet<Item>> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::Sunflower, - Item::Lilac, - Item::Peony, - Item::RoseBush, - Item::PitcherPlant, - ]) -}); pub static TERRACOTTA: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ Item::Terracotta, @@ -1734,6 +1744,7 @@ pub static TRAPDOORS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::AcaciaTrapdoor, Item::BirchTrapdoor, Item::DarkOakTrapdoor, + Item::PaleOakTrapdoor, Item::JungleTrapdoor, Item::OakTrapdoor, Item::SpruceTrapdoor, @@ -1746,38 +1757,17 @@ pub static TRAPDOORS: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static TRIM_MATERIALS: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec![ - Item::IronIngot, + Item::AmethystShard, Item::CopperIngot, + Item::Diamond, + Item::Emerald, Item::GoldIngot, + Item::IronIngot, Item::LapisLazuli, - Item::Emerald, - Item::Diamond, Item::NetheriteIngot, - Item::Redstone, Item::Quartz, - Item::AmethystShard, - ]) -}); -pub static TRIM_TEMPLATES: LazyLock<HashSet<Item>> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::WardArmorTrimSmithingTemplate, - Item::SpireArmorTrimSmithingTemplate, - Item::CoastArmorTrimSmithingTemplate, - Item::EyeArmorTrimSmithingTemplate, - Item::DuneArmorTrimSmithingTemplate, - Item::WildArmorTrimSmithingTemplate, - Item::RibArmorTrimSmithingTemplate, - Item::TideArmorTrimSmithingTemplate, - Item::SentryArmorTrimSmithingTemplate, - Item::VexArmorTrimSmithingTemplate, - Item::SnoutArmorTrimSmithingTemplate, - Item::WayfinderArmorTrimSmithingTemplate, - Item::ShaperArmorTrimSmithingTemplate, - Item::SilenceArmorTrimSmithingTemplate, - Item::RaiserArmorTrimSmithingTemplate, - Item::HostArmorTrimSmithingTemplate, - Item::FlowArmorTrimSmithingTemplate, - Item::BoltArmorTrimSmithingTemplate, + Item::Redstone, + Item::ResinBrick, ]) }); pub static TRIMMABLE_ARMOR: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -1861,6 +1851,7 @@ pub static WALLS: LazyLock<HashSet<Item>> = LazyLock::new(|| { Item::TuffWall, Item::PolishedTuffWall, Item::TuffBrickWall, + Item::ResinBrickWall, ]) }); pub static WARPED_STEMS: LazyLock<HashSet<Item>> = LazyLock::new(|| { @@ -1873,6 +1864,8 @@ pub static WARPED_STEMS: LazyLock<HashSet<Item>> = LazyLock::new(|| { }); pub static WART_BLOCKS: LazyLock<HashSet<Item>> = LazyLock::new(|| HashSet::from_iter(vec![Item::NetherWartBlock, Item::WarpedWartBlock])); +pub static WITHER_SKELETON_DISLIKED_WEAPONS: LazyLock<HashSet<Item>> = + LazyLock::new(|| HashSet::from_iter(vec![Item::Bow, Item::Crossbow])); pub static WOLF_FOOD: LazyLock<HashSet<Item>> = LazyLock::new(|| { HashSet::from_iter(vec