From 7d0c7553fd5a0210285a51a65c10f898f641a0cc Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 30 Oct 2025 19:50:37 +0100 Subject: Remove unnecessary MoveEntityError and MovePlayerError types and other cleanup --- azalea-chat/src/component.rs | 4 +- azalea-chat/src/text_component.rs | 2 +- azalea-client/src/plugins/movement.rs | 23 +- azalea-physics/src/collision/mod.rs | 16 +- azalea-physics/src/lib.rs | 2 +- azalea-physics/src/travel.rs | 4 +- azalea-registry/src/tags/blocks.rs | 416 +++++++++++++++++----------------- azalea-registry/src/tags/entities.rs | 84 +++---- azalea-registry/src/tags/fluids.rs | 4 +- azalea-registry/src/tags/items.rs | 397 ++++++++++++++++---------------- azalea-world/src/lib.rs | 9 - codegen/lib/code/tags.py | 2 +- 12 files changed, 455 insertions(+), 508 deletions(-) diff --git a/azalea-chat/src/component.rs b/azalea-chat/src/component.rs index 30b0ed9d..be95638d 100644 --- a/azalea-chat/src/component.rs +++ b/azalea-chat/src/component.rs @@ -385,7 +385,7 @@ impl<'de> Deserialize<'de> for FormattedText { } let style = Style::deserialize(&json); - component.get_base_mut().style = Box::new(style); + *component.get_base_mut().style = style; return Ok(component); } @@ -601,7 +601,7 @@ impl FormattedText { let base_style = Style::from_compound(compound).ok()?; let new_style = &mut component.get_base_mut().style; - *new_style = Box::new(new_style.merged_with(&base_style)); + **new_style = new_style.merged_with(&base_style); Some(component) } diff --git a/azalea-chat/src/text_component.rs b/azalea-chat/src/text_component.rs index 0fa0cd6f..c21e2d46 100644 --- a/azalea-chat/src/text_component.rs +++ b/azalea-chat/src/text_component.rs @@ -146,7 +146,7 @@ impl TextComponent { FormattedText::Text(self) } pub fn with_style(mut self, style: Style) -> Self { - self.base.style = Box::new(style); + *self.base.style = style; self } } diff --git a/azalea-client/src/plugins/movement.rs b/azalea-client/src/plugins/movement.rs index adbaa01d..587bc05b 100644 --- a/azalea-client/src/plugins/movement.rs +++ b/azalea-client/src/plugins/movement.rs @@ -1,5 +1,3 @@ -use std::{backtrace::Backtrace, io}; - use azalea_core::{ game_type::GameMode, position::{Vec2, Vec3}, @@ -32,10 +30,9 @@ use azalea_protocol::{ }, }; use azalea_registry::EntityKind; -use azalea_world::{Instance, MinecraftEntityId, MoveEntityError}; +use azalea_world::{Instance, MinecraftEntityId}; use bevy_app::{App, Plugin, Update}; use bevy_ecs::prelude::*; -use thiserror::Error; use crate::{ client::Client, @@ -43,24 +40,6 @@ use crate::{ packet::game::SendGamePacketEvent, }; -#[derive(Error, Debug)] -pub enum MovePlayerError { - #[error("Player is not in world")] - PlayerNotInWorld(Backtrace), - #[error("{0}")] - Io(#[from] io::Error), -} - -impl From for MovePlayerError { - fn from(err: MoveEntityError) -> Self { - match err { - MoveEntityError::EntityDoesNotExist(backtrace) => { - MovePlayerError::PlayerNotInWorld(backtrace) - } - } - } -} - pub struct MovementPlugin; impl Plugin for MovementPlugin { diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs index 3702c8c1..10b607f2 100644 --- a/azalea-physics/src/collision/mod.rs +++ b/azalea-physics/src/collision/mod.rs @@ -18,7 +18,7 @@ use azalea_entity::{ Attributes, Jumping, LookDirection, OnClimbable, Physics, PlayerAbilities, Pose, Position, metadata::Sprinting, }; -use azalea_world::{ChunkStorage, Instance, MoveEntityError}; +use azalea_world::{ChunkStorage, Instance}; use bevy_ecs::{entity::Entity, world::Mut}; pub use blocks::BlockWithShape; pub use discrete_voxel_shape::*; @@ -130,7 +130,7 @@ pub struct MoveCtx<'world, 'state, 'a, 'b> { /// /// In Mojmap, this is `Entity.move`. #[allow(clippy::too_many_arguments)] -pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveEntityError> { +pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) { // TODO: do all these // if self.no_physics { @@ -225,8 +225,8 @@ pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveE // this.tryCheckInsideBlocks(); // float var25 = this.getBlockSpeedFactor(); - // this.setDeltaMovement(this.getDeltaMovement().multiply((double)var25, 1.0D, - // (double)var25)); if (this.level.getBlockStatesIfLoaded(this. + // this.setDeltaMovement(this.getDeltaMovement().multiply((double)var25, + // 1.0D, (double)var25)); if (this.level.getBlockStatesIfLoaded(this. // getBoundingBox().deflate(1.0E-6D)).noneMatch((var0) -> { // return var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA); // })) { @@ -239,11 +239,9 @@ pub fn move_colliding(ctx: &mut MoveCtx, mut movement: Vec3) -> Result<(), MoveE // playEntityOnFireExtinguishedSound(); } // } - // if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) - // { this.setRemainingFireTicks(-this.getFireImmuneTicks()); - // } - - Ok(()) + // if (this.isOnFire() && (this.isInPowderSnow || + // this.isInWaterRainOrBubble())) { this.setRemainingFireTicks(-this. + // getFireImmuneTicks()); } } fn check_fall_damage( diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs index ad4626fb..b993a7b5 100644 --- a/azalea-physics/src/lib.rs +++ b/azalea-physics/src/lib.rs @@ -408,7 +408,7 @@ fn handle_relative_friction_and_calculate_movement(ctx: &mut MoveCtx, block_fric ctx.pose, ); - move_colliding(ctx, ctx.physics.velocity).expect("Entity should exist"); + move_colliding(ctx, ctx.physics.velocity); // let delta_movement = entity.delta; // ladders // if ((entity.horizontalCollision || entity.jumping) && (entity.onClimbable() diff --git a/azalea-physics/src/travel.rs b/azalea-physics/src/travel.rs index e5391bba..0b980d5a 100644 --- a/azalea-physics/src/travel.rs +++ b/azalea-physics/src/travel.rs @@ -173,7 +173,7 @@ fn travel_in_fluid(ctx: &mut MoveCtx) { // } move_relative(ctx.physics, ctx.direction, speed, acceleration); - move_colliding(ctx, ctx.physics.velocity).expect("Entity should exist"); + move_colliding(ctx, ctx.physics.velocity); let mut new_velocity = ctx.physics.velocity; if ctx.physics.horizontal_collision && *ctx.on_climbable { @@ -187,7 +187,7 @@ fn travel_in_fluid(ctx: &mut MoveCtx) { get_fluid_falling_adjusted_movement(gravity, moving_down, new_velocity, ctx.sprinting); } else { move_relative(ctx.physics, ctx.direction, 0.02, acceleration); - move_colliding(ctx, ctx.physics.velocity).expect("Entity should exist"); + move_colliding(ctx, ctx.physics.velocity); if ctx.physics.lava_fluid_height <= fluid_jump_threshold() { ctx.physics.velocity.x *= 0.5; diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs index d54ae50f..e34e06ec 100644 --- a/azalea-registry/src/tags/blocks.rs +++ b/azalea-registry/src/tags/blocks.rs @@ -5,7 +5,7 @@ use std::{collections::HashSet, sync::LazyLock}; use crate::Block; pub static ACACIA_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaLog, Block::AcaciaWood, Block::StrippedAcaciaLog, @@ -13,9 +13,9 @@ pub static ACACIA_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static AIR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Air, Block::VoidAir, Block::CaveAir])); + LazyLock::new(|| HashSet::from_iter([Block::Air, Block::VoidAir, Block::CaveAir])); pub static ALL_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakHangingSign, Block::SpruceHangingSign, Block::BirchHangingSign, @@ -43,7 +43,7 @@ pub static ALL_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static ALL_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakSign, Block::SpruceSign, Block::BirchSign, @@ -95,7 +95,7 @@ pub static ALL_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static ANCIENT_CITY_REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Deepslate, Block::DeepslateBricks, Block::DeepslateTiles, @@ -111,12 +111,11 @@ pub static ANCIENT_CITY_REPLACEABLE: LazyLock> = LazyLock::new(|| ]) }); pub static ANIMALS_SPAWNABLE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::GrassBlock])); -pub static ANVIL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![Block::Anvil, Block::ChippedAnvil, Block::DamagedAnvil]) -}); + LazyLock::new(|| HashSet::from_iter([Block::GrassBlock])); +pub static ANVIL: LazyLock> = + LazyLock::new(|| HashSet::from_iter([Block::Anvil, Block::ChippedAnvil, Block::DamagedAnvil])); pub static ARMADILLO_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::RedSand, Block::CoarseDirt, Block::GrassBlock, @@ -130,9 +129,9 @@ pub static ARMADILLO_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static AXOLOTLS_SPAWNABLE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Clay])); + LazyLock::new(|| HashSet::from_iter([Block::Clay])); pub static AZALEA_GROWS_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SnowBlock, Block::PowderSnow, Block::Dirt, @@ -168,7 +167,7 @@ pub static AZALEA_GROWS_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static AZALEA_ROOT_REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::RedSand, Block::Clay, Block::Gravel, @@ -211,7 +210,7 @@ pub static AZALEA_ROOT_REPLACEABLE: LazyLock> = LazyLock::new(|| ]) }); pub static BADLANDS_TERRACOTTA: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Terracotta, Block::WhiteTerracotta, Block::YellowTerracotta, @@ -222,9 +221,9 @@ pub static BADLANDS_TERRACOTTA: LazyLock> = LazyLock::new(|| { ]) }); pub static BAMBOO_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::BambooBlock, Block::StrippedBambooBlock])); + LazyLock::new(|| HashSet::from_iter([Block::BambooBlock, Block::StrippedBambooBlock])); pub static BAMBOO_PLANTABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Bamboo, Block::BambooSapling, Block::Gravel, @@ -245,7 +244,7 @@ pub static BAMBOO_PLANTABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static BANNERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteBanner, Block::OrangeBanner, Block::MagentaBanner, @@ -281,7 +280,7 @@ pub static BANNERS: LazyLock> = LazyLock::new(|| { ]) }); pub static BARS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::IronBars, Block::CopperBars, Block::WaxedCopperBars, @@ -294,9 +293,9 @@ pub static BARS: LazyLock> = LazyLock::new(|| { ]) }); pub static BASE_STONE_NETHER: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Netherrack, Block::Basalt, Block::Blackstone])); + LazyLock::new(|| HashSet::from_iter([Block::Netherrack, Block::Basalt, Block::Blackstone])); pub static BASE_STONE_OVERWORLD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::Diorite, @@ -306,7 +305,7 @@ pub static BASE_STONE_OVERWORLD: LazyLock> = LazyLock::new(|| { ]) }); pub static BATS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::Diorite, @@ -316,7 +315,7 @@ pub static BATS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static BEACON_BASE_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::NetheriteBlock, Block::EmeraldBlock, Block::DiamondBlock, @@ -325,7 +324,7 @@ pub static BEACON_BASE_BLOCKS: LazyLock> = LazyLock::new(|| { ]) }); pub static BEDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::RedBed, Block::BlackBed, Block::BlueBed, @@ -345,7 +344,7 @@ pub static BEDS: LazyLock> = LazyLock::new(|| { ]) }); pub static BEE_ATTRACTIVE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Dandelion, Block::OpenEyeblossom, Block::Poppy, @@ -378,7 +377,7 @@ pub static BEE_ATTRACTIVE: LazyLock> = LazyLock::new(|| { ]) }); pub static BEE_GROWABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SweetBerryBush, Block::CaveVines, Block::CaveVinesPlant, @@ -393,9 +392,9 @@ pub static BEE_GROWABLES: LazyLock> = LazyLock::new(|| { ]) }); pub static BEEHIVES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::BeeNest, Block::Beehive])); + LazyLock::new(|| HashSet::from_iter([Block::BeeNest, Block::Beehive])); pub static BIG_DRIPLEAF_PLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Dirt, Block::GrassBlock, Block::Podzol, @@ -411,7 +410,7 @@ pub static BIG_DRIPLEAF_PLACEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static BIRCH_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::BirchLog, Block::BirchWood, Block::StrippedBirchLog, @@ -419,9 +418,9 @@ pub static BIRCH_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static BLOCKS_WIND_CHARGE_EXPLOSIONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Barrier, Block::Bedrock])); + LazyLock::new(|| HashSet::from_iter([Block::Barrier, Block::Bedrock])); pub static BUTTONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakButton, Block::SpruceButton, Block::BirchButton, @@ -439,7 +438,7 @@ pub static BUTTONS: LazyLock> = LazyLock::new(|| { ]) }); pub static CAMEL_SAND_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Sand, Block::RedSand, Block::SuspiciousSand, @@ -462,11 +461,11 @@ pub static CAMEL_SAND_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::ne ]) }); pub static CAMELS_SPAWNABLE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Sand, Block::RedSand, Block::SuspiciousSand])); + LazyLock::new(|| HashSet::from_iter([Block::Sand, Block::RedSand, Block::SuspiciousSand])); pub static CAMPFIRES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Campfire, Block::SoulCampfire])); + LazyLock::new(|| HashSet::from_iter([Block::Campfire, Block::SoulCampfire])); pub static CANDLE_CAKES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CandleCake, Block::WhiteCandleCake, Block::OrangeCandleCake, @@ -487,7 +486,7 @@ pub static CANDLE_CAKES: LazyLock> = LazyLock::new(|| { ]) }); pub static CANDLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Candle, Block::WhiteCandle, Block::OrangeCandle, @@ -508,7 +507,7 @@ pub static CANDLES: LazyLock> = LazyLock::new(|| { ]) }); pub static CAULDRONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Cauldron, Block::WaterCauldron, Block::LavaCauldron, @@ -516,9 +515,9 @@ pub static CAULDRONS: LazyLock> = LazyLock::new(|| { ]) }); pub static CAVE_VINES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::CaveVinesPlant, Block::CaveVines])); + LazyLock::new(|| HashSet::from_iter([Block::CaveVinesPlant, Block::CaveVines])); pub static CEILING_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakHangingSign, Block::SpruceHangingSign, Block::BirchHangingSign, @@ -534,7 +533,7 @@ pub static CEILING_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static CHAINS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::IronChain, Block::CopperChain, Block::WaxedCopperChain, @@ -547,7 +546,7 @@ pub static CHAINS: LazyLock> = LazyLock::new(|| { ]) }); pub static CHERRY_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CherryLog, Block::CherryWood, Block::StrippedCherryLog, @@ -555,7 +554,7 @@ pub static CHERRY_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static CLIMBABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Ladder, Block::Vine, Block::Scaffolding, @@ -568,9 +567,9 @@ pub static CLIMBABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static COAL_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::CoalOre, Block::DeepslateCoalOre])); + LazyLock::new(|| HashSet::from_iter([Block::CoalOre, Block::DeepslateCoalOre])); pub static COMBINATION_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::MossCarpet, Block::PaleMossCarpet, Block::Snow, @@ -597,7 +596,7 @@ pub static COMBINATION_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::n ]) }); pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, @@ -658,7 +657,7 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock> = LazyLock::ne ]) }); pub static CONCRETE_POWDER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteConcretePowder, Block::OrangeConcretePowder, Block::MagentaConcretePowder, @@ -678,9 +677,9 @@ pub static CONCRETE_POWDER: LazyLock> = LazyLock::new(|| { ]) }); pub static CONVERTABLE_TO_MUD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Dirt, Block::CoarseDirt, Block::RootedDirt])); + LazyLock::new(|| HashSet::from_iter([Block::Dirt, Block::CoarseDirt, Block::RootedDirt])); pub static COPPER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CopperBlock, Block::ExposedCopper, Block::WeatheredCopper, @@ -692,7 +691,7 @@ pub static COPPER: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_CHESTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CopperChest, Block::ExposedCopperChest, Block::WeatheredCopperChest, @@ -704,7 +703,7 @@ pub static COPPER_CHESTS: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_GOLEM_STATUES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CopperGolemStatue, Block::ExposedCopperGolemStatue, Block::WeatheredCopperGolemStatue, @@ -716,9 +715,9 @@ pub static COPPER_GOLEM_STATUES: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::CopperOre, Block::DeepslateCopperOre])); + LazyLock::new(|| HashSet::from_iter([Block::CopperOre, Block::DeepslateCopperOre])); pub static CORAL_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::TubeCoralBlock, Block::BrainCoralBlock, Block::BubbleCoralBlock, @@ -727,7 +726,7 @@ pub static CORAL_BLOCKS: LazyLock> = LazyLock::new(|| { ]) }); pub static CORAL_PLANTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::TubeCoral, Block::BrainCoral, Block::BubbleCoral, @@ -736,7 +735,7 @@ pub static CORAL_PLANTS: LazyLock> = LazyLock::new(|| { ]) }); pub static CORALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::TubeCoralFan, Block::BrainCoralFan, Block::BubbleCoralFan, @@ -750,7 +749,7 @@ pub static CORALS: LazyLock> = LazyLock::new(|| { ]) }); pub static CRIMSON_STEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CrimsonStem, Block::StrippedCrimsonStem, Block::CrimsonHyphae, @@ -758,7 +757,7 @@ pub static CRIMSON_STEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static CROPS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Beetroots, Block::Carrots, Block::Potatoes, @@ -770,9 +769,9 @@ pub static CROPS: LazyLock> = LazyLock::new(|| { ]) }); pub static CRYSTAL_SOUND_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::AmethystBlock, Block::BuddingAmethyst])); + LazyLock::new(|| HashSet::from_iter([Block::AmethystBlock, Block::BuddingAmethyst])); pub static DAMPENS_VIBRATIONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteWool, Block::OrangeWool, Block::MagentaWool, @@ -808,7 +807,7 @@ pub static DAMPENS_VIBRATIONS: LazyLock> = LazyLock::new(|| { ]) }); pub static DARK_OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::DarkOakLog, Block::DarkOakWood, Block::StrippedDarkOakLog, @@ -816,11 +815,11 @@ pub static DARK_OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static DEEPSLATE_ORE_REPLACEABLES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Deepslate, Block::Tuff])); + LazyLock::new(|| HashSet::from_iter([Block::Deepslate, Block::Tuff])); pub static DIAMOND_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::DiamondOre, Block::DeepslateDiamondOre])); + LazyLock::new(|| HashSet::from_iter([Block::DiamondOre, Block::DeepslateDiamondOre])); pub static DIRT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Dirt, Block::GrassBlock, Block::Podzol, @@ -834,9 +833,9 @@ pub static DIRT: LazyLock> = LazyLock::new(|| { ]) }); pub static DOES_NOT_BLOCK_HOPPERS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::BeeNest, Block::Beehive])); + LazyLock::new(|| HashSet::from_iter([Block::BeeNest, Block::Beehive])); pub static DOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CopperDoor, Block::ExposedCopperDoor, Block::WeatheredCopperDoor, @@ -861,7 +860,7 @@ pub static DOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static DRAGON_IMMUNE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Barrier, Block::Bedrock, Block::EndPortal, @@ -884,9 +883,9 @@ pub static DRAGON_IMMUNE: LazyLock> = LazyLock::new(|| { ]) }); pub static DRAGON_TRANSPARENT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Light, Block::Fire, Block::SoulFire])); + LazyLock::new(|| HashSet::from_iter([Block::Light, Block::Fire, Block::SoulFire])); pub static DRIPSTONE_REPLACEABLE_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::Diorite, @@ -896,7 +895,7 @@ pub static DRIPSTONE_REPLACEABLE_BLOCKS: LazyLock> = LazyLock::ne ]) }); pub static DRY_VEGETATION_MAY_PLACE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Farmland, Block::Sand, Block::RedSand, @@ -931,7 +930,7 @@ pub static DRY_VEGETATION_MAY_PLACE_ON: LazyLock> = LazyLock::new ]) }); pub static EDIBLE_FOR_SHEEP: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::ShortGrass, Block::ShortDryGrass, Block::TallDryGrass, @@ -939,11 +938,11 @@ pub static EDIBLE_FOR_SHEEP: LazyLock> = LazyLock::new(|| { ]) }); pub static EMERALD_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::EmeraldOre, Block::DeepslateEmeraldOre])); + LazyLock::new(|| HashSet::from_iter([Block::EmeraldOre, Block::DeepslateEmeraldOre])); pub static ENCHANTMENT_POWER_PROVIDER: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Bookshelf])); + LazyLock::new(|| HashSet::from_iter([Block::Bookshelf])); pub static ENCHANTMENT_POWER_TRANSMITTER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Air, Block::Water, Block::Lava, @@ -976,7 +975,7 @@ pub static ENCHANTMENT_POWER_TRANSMITTER: LazyLock> = LazyLock::n ]) }); pub static ENDERMAN_HOLDABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Sand, Block::RedSand, Block::Gravel, @@ -1024,7 +1023,7 @@ pub static ENDERMAN_HOLDABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static FALL_DAMAGE_RESETTING: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SweetBerryBush, Block::Cobweb, Block::Ladder, @@ -1039,7 +1038,7 @@ pub static FALL_DAMAGE_RESETTING: LazyLock> = LazyLock::new(|| { ]) }); pub static FEATURES_CANNOT_REPLACE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Bedrock, Block::Spawner, Block::Chest, @@ -1050,7 +1049,7 @@ pub static FEATURES_CANNOT_REPLACE: LazyLock> = LazyLock::new(|| ]) }); pub static FENCE_GATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaFenceGate, Block::BirchFenceGate, Block::DarkOakFenceGate, @@ -1066,7 +1065,7 @@ pub static FENCE_GATES: LazyLock> = LazyLock::new(|| { ]) }); pub static FENCES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::NetherBrickFence, Block::OakFence, Block::AcaciaFence, @@ -1083,9 +1082,9 @@ pub static FENCES: LazyLock> = LazyLock::new(|| { ]) }); pub static FIRE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Fire, Block::SoulFire])); + LazyLock::new(|| HashSet::from_iter([Block::Fire, Block::SoulFire])); pub static FLOWER_POTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::FlowerPot, Block::PottedOpenEyeblossom, Block::PottedClosedEyeblossom, @@ -1127,7 +1126,7 @@ pub static FLOWER_POTS: LazyLock> = LazyLock::new(|| { ]) }); pub static FLOWERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Sunflower, Block::Lilac, Block::Peony, @@ -1161,7 +1160,7 @@ pub static FLOWERS: LazyLock> = LazyLock::new(|| { ]) }); pub static FOXES_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GrassBlock, Block::Snow, Block::SnowBlock, @@ -1170,9 +1169,9 @@ pub static FOXES_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static FROG_PREFER_JUMP_TO: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::LilyPad, Block::BigDripleaf])); + LazyLock::new(|| HashSet::from_iter([Block::LilyPad, Block::BigDripleaf])); pub static FROGS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GrassBlock, Block::Mud, Block::MangroveRoots, @@ -1180,7 +1179,7 @@ pub static FROGS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static GEODE_INVALID_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Bedrock, Block::Water, Block::Lava, @@ -1190,7 +1189,7 @@ pub static GEODE_INVALID_BLOCKS: LazyLock> = LazyLock::new(|| { ]) }); pub static GOATS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Snow, Block::SnowBlock, @@ -1200,14 +1199,14 @@ pub static GOATS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static GOLD_ORES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GoldOre, Block::NetherGoldOre, Block::DeepslateGoldOre, ]) }); pub static GUARDED_BY_PIGLINS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GoldBlock, Block::Barrel, Block::Chest, @@ -1246,7 +1245,7 @@ pub static GUARDED_BY_PIGLINS: LazyLock> = LazyLock::new(|| { ]) }); pub static HAPPY_GHAST_AVOIDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SweetBerryBush, Block::Cactus, Block::WitherRose, @@ -1256,7 +1255,7 @@ pub static HAPPY_GHAST_AVOIDS: LazyLock> = LazyLock::new(|| { ]) }); pub static HOGLIN_REPELLENTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WarpedFungus, Block::PottedWarpedFungus, Block::NetherPortal, @@ -1264,7 +1263,7 @@ pub static HOGLIN_REPELLENTS: LazyLock> = LazyLock::new(|| { ]) }); pub static ICE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Ice, Block::PackedIce, Block::BlueIce, @@ -1272,7 +1271,7 @@ pub static ICE: LazyLock> = LazyLock::new(|| { ]) }); pub static IMPERMEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Glass, Block::WhiteStainedGlass, Block::OrangeStainedGlass, @@ -1295,7 +1294,7 @@ pub static IMPERMEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static INCORRECT_FOR_COPPER_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -1316,9 +1315,9 @@ pub static INCORRECT_FOR_COPPER_TOOL: LazyLock> = LazyLock::new(| ]) }); pub static INCORRECT_FOR_DIAMOND_TOOL: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![])); + LazyLock::new(|| HashSet::from_iter([])); pub static INCORRECT_FOR_GOLD_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -1430,7 +1429,7 @@ pub static INCORRECT_FOR_GOLD_TOOL: LazyLock> = LazyLock::new(|| ]) }); pub static INCORRECT_FOR_IRON_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -1439,9 +1438,9 @@ pub static INCORRECT_FOR_IRON_TOOL: LazyLock> = LazyLock::new(|| ]) }); pub static INCORRECT_FOR_NETHERITE_TOOL: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![])); + LazyLock::new(|| HashSet::from_iter([])); pub static INCORRECT_FOR_STONE_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -1462,7 +1461,7 @@ pub static INCORRECT_FOR_STONE_TOOL: LazyLock> = LazyLock::new(|| ]) }); pub static INCORRECT_FOR_WOODEN_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -1573,15 +1572,14 @@ pub static INCORRECT_FOR_WOODEN_TOOL: LazyLock> = LazyLock::new(| Block::WaxedOxidizedLightningRod, ]) }); -pub static INFINIBURN_END: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![Block::Bedrock, Block::Netherrack, Block::MagmaBlock]) -}); +pub static INFINIBURN_END: LazyLock> = + LazyLock::new(|| HashSet::from_iter([Block::Bedrock, Block::Netherrack, Block::MagmaBlock])); pub static INFINIBURN_NETHER: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Netherrack, Block::MagmaBlock])); + LazyLock::new(|| HashSet::from_iter([Block::Netherrack, Block::MagmaBlock])); pub static INFINIBURN_OVERWORLD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Netherrack, Block::MagmaBlock])); + LazyLock::new(|| HashSet::from_iter([Block::Netherrack, Block::MagmaBlock])); pub static INSIDE_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::PowderSnow, Block::SculkVein, Block::GlowLichen, @@ -1593,11 +1591,11 @@ pub static INSIDE_STEP_SOUND_BLOCKS: LazyLock> = LazyLock::new(|| ]) }); pub static INVALID_SPAWN_INSIDE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::EndPortal, Block::EndGateway])); + LazyLock::new(|| HashSet::from_iter([Block::EndPortal, Block::EndGateway])); pub static IRON_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::IronOre, Block::DeepslateIronOre])); + LazyLock::new(|| HashSet::from_iter([Block::IronOre, Block::DeepslateIronOre])); pub static JUNGLE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::JungleLog, Block::JungleWood, Block::StrippedJungleLog, @@ -1605,7 +1603,7 @@ pub static JUNGLE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static LANTERNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Lantern, Block::SoulLantern, Block::CopperLantern, @@ -1619,9 +1617,9 @@ pub static LANTERNS: LazyLock> = LazyLock::new(|| { ]) }); pub static LAPIS_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::LapisOre, Block::DeepslateLapisOre])); + LazyLock::new(|| HashSet::from_iter([Block::LapisOre, Block::DeepslateLapisOre])); pub static LAVA_POOL_STONE_CANNOT_REPLACE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Bedrock, Block::Spawner, Block::Chest, @@ -1687,7 +1685,7 @@ pub static LAVA_POOL_STONE_CANNOT_REPLACE: LazyLock> = LazyLock:: ]) }); pub static LEAVES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::JungleLeaves, Block::OakLeaves, Block::SpruceLeaves, @@ -1702,7 +1700,7 @@ pub static LEAVES: LazyLock> = LazyLock::new(|| { ]) }); pub static LIGHTNING_RODS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::LightningRod, Block::ExposedLightningRod, Block::WeatheredLightningRod, @@ -1714,7 +1712,7 @@ pub static LIGHTNING_RODS: LazyLock> = LazyLock::new(|| { ]) }); pub static LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CrimsonStem, Block::StrippedCrimsonStem, Block::CrimsonHyphae, @@ -1762,7 +1760,7 @@ pub static LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static LOGS_THAT_BURN: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::DarkOakLog, Block::DarkOakWood, Block::StrippedDarkOakLog, @@ -1802,7 +1800,7 @@ pub static LOGS_THAT_BURN: LazyLock> = LazyLock::new(|| { ]) }); pub static LUSH_GROUND_REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Clay, Block::Gravel, Block::Sand, @@ -1827,7 +1825,7 @@ pub static LUSH_GROUND_REPLACEABLE: LazyLock> = LazyLock::new(|| ]) }); pub static MAINTAINS_FARMLAND: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::PumpkinStem, Block::AttachedPumpkinStem, Block::MelonStem, @@ -1842,7 +1840,7 @@ pub static MAINTAINS_FARMLAND: LazyLock> = LazyLock::new(|| { ]) }); pub static MANGROVE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::MangroveLog, Block::MangroveWood, Block::StrippedMangroveLog, @@ -1850,7 +1848,7 @@ pub static MANGROVE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static MANGROVE_LOGS_CAN_GROW_THROUGH: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Mud, Block::MuddyMangroveRoots, Block::MangroveRoots, @@ -1862,7 +1860,7 @@ pub static MANGROVE_LOGS_CAN_GROW_THROUGH: LazyLock> = LazyLock:: ]) }); pub static MANGROVE_ROOTS_CAN_GROW_THROUGH: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Mud, Block::MuddyMangroveRoots, Block::MangroveRoots, @@ -1873,7 +1871,7 @@ pub static MANGROVE_ROOTS_CAN_GROW_THROUGH: LazyLock> = LazyLock: ]) }); pub static MINEABLE_AXE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::NoteBlock, Block::Bamboo, Block::Barrel, @@ -2163,7 +2161,7 @@ pub static MINEABLE_AXE: LazyLock> = LazyLock::new(|| { ]) }); pub static MINEABLE_HOE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::NetherWartBlock, Block::WarpedWartBlock, Block::HayBlock, @@ -2196,7 +2194,7 @@ pub static MINEABLE_HOE: LazyLock> = LazyLock::new(|| { ]) }); pub static MINEABLE_PICKAXE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::PolishedGranite, @@ -2686,7 +2684,7 @@ pub static MINEABLE_PICKAXE: LazyLock> = LazyLock::new(|| { ]) }); pub static MINEABLE_SHOVEL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Clay, Block::Dirt, Block::CoarseDirt, @@ -2726,7 +2724,7 @@ pub static MINEABLE_SHOVEL: LazyLock> = LazyLock::new(|| { ]) }); pub static MOB_INTERACTABLE_DOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CopperDoor, Block::ExposedCopperDoor, Block::WeatheredCopperDoor, @@ -2750,9 +2748,9 @@ pub static MOB_INTERACTABLE_DOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static MOOSHROOMS_SPAWNABLE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Mycelium])); + LazyLock::new(|| HashSet::from_iter([Block::Mycelium])); pub static MOSS_REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::Diorite, @@ -2774,7 +2772,7 @@ pub static MOSS_REPLACEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static MUSHROOM_GROW_BLOCK: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Mycelium, Block::Podzol, Block::CrimsonNylium, @@ -2782,7 +2780,7 @@ pub static MUSHROOM_GROW_BLOCK: LazyLock> = LazyLock::new(|| { ]) }); pub static NEEDS_DIAMOND_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Obsidian, Block::CryingObsidian, Block::NetheriteBlock, @@ -2791,7 +2789,7 @@ pub static NEEDS_DIAMOND_TOOL: LazyLock> = LazyLock::new(|| { ]) }); pub static NEEDS_IRON_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::DiamondBlock, Block::DiamondOre, Block::DeepslateDiamondOre, @@ -2807,7 +2805,7 @@ pub static NEEDS_IRON_TOOL: LazyLock> = LazyLock::new(|| { ]) }); pub static NEEDS_STONE_TOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::IronBlock, Block::RawIronBlock, Block::IronOre, @@ -2902,7 +2900,7 @@ pub static NEEDS_STONE_TOOL: LazyLock> = LazyLock::new(|| { ]) }); pub static NETHER_CARVER_REPLACEABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SoulSand, Block::SoulSoil, Block::Stone, @@ -2931,9 +2929,9 @@ pub static NETHER_CARVER_REPLACEABLES: LazyLock> = LazyLock::new( ]) }); pub static NYLIUM: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::CrimsonNylium, Block::WarpedNylium])); + LazyLock::new(|| HashSet::from_iter([Block::CrimsonNylium, Block::WarpedNylium])); pub static OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakLog, Block::OakWood, Block::StrippedOakLog, @@ -2941,7 +2939,7 @@ pub static OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static OCCLUDES_VIBRATION_SIGNALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteWool, Block::OrangeWool, Block::MagentaWool, @@ -2961,7 +2959,7 @@ pub static OCCLUDES_VIBRATION_SIGNALS: LazyLock> = LazyLock::new( ]) }); pub static OVERWORLD_CARVER_REPLACEABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Water, Block::Gravel, Block::SuspiciousGravel, @@ -3017,7 +3015,7 @@ pub static OVERWORLD_CARVER_REPLACEABLES: LazyLock> = LazyLock::n ]) }); pub static OVERWORLD_NATURAL_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaLog, Block::BirchLog, Block::OakLog, @@ -3030,7 +3028,7 @@ pub static OVERWORLD_NATURAL_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static PALE_OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::PaleOakLog, Block::PaleOakWood, Block::StrippedPaleOakLog, @@ -3038,7 +3036,7 @@ pub static PALE_OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static PARROTS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GrassBlock, Block::Air, Block::JungleLeaves, @@ -3099,7 +3097,7 @@ pub static PARROTS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static PIGLIN_REPELLENTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SoulFire, Block::SoulTorch, Block::SoulLantern, @@ -3108,7 +3106,7 @@ pub static PIGLIN_REPELLENTS: LazyLock> = LazyLock::new(|| { ]) }); pub static PLANKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakPlanks, Block::SprucePlanks, Block::BirchPlanks, @@ -3124,16 +3122,12 @@ pub static PLANKS: LazyLock> = LazyLock::new(|| { ]) }); pub static POLAR_BEARS_SPAWNABLE_ON_ALTERNATE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Ice])); + LazyLock::new(|| HashSet::from_iter([Block::Ice])); pub static PORTALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Block::NetherPortal, - Block::EndPortal, - Block::EndGateway, - ]) + HashSet::from_iter([Block::NetherPortal, Block::EndPortal, Block::EndGateway]) }); pub static PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::LightWeightedPressurePlate, Block::HeavyWeightedPressurePlate, Block::OakPressurePlate, @@ -3153,7 +3147,7 @@ pub static PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { ]) }); pub static PREVENT_MOB_SPAWNING_INSIDE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Rail, Block::PoweredRail, Block::DetectorRail, @@ -3161,7 +3155,7 @@ pub static PREVENT_MOB_SPAWNING_INSIDE: LazyLock> = LazyLock::new ]) }); pub static RABBITS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GrassBlock, Block::Snow, Block::SnowBlock, @@ -3169,7 +3163,7 @@ pub static RABBITS_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static RAILS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Rail, Block::PoweredRail, Block::DetectorRail, @@ -3177,9 +3171,9 @@ pub static RAILS: LazyLock> = LazyLock::new(|| { ]) }); pub static REDSTONE_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::RedstoneOre, Block::DeepslateRedstoneOre])); + LazyLock::new(|| HashSet::from_iter([Block::RedstoneOre, Block::DeepslateRedstoneOre])); pub static REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Air, Block::Water, Block::Lava, @@ -3212,7 +3206,7 @@ pub static REPLACEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static REPLACEABLE_BY_MUSHROOMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::PaleMossCarpet, Block::ShortGrass, Block::Fern, @@ -3272,7 +3266,7 @@ pub static REPLACEABLE_BY_MUSHROOMS: LazyLock> = LazyLock::new(|| ]) }); pub static REPLACEABLE_BY_TREES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::PaleMossCarpet, Block::ShortGrass, Block::Fern, @@ -3328,9 +3322,9 @@ pub static REPLACEABLE_BY_TREES: LazyLock> = LazyLock::new(|| { ]) }); pub static SAND: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Sand, Block::RedSand, Block::SuspiciousSand])); + LazyLock::new(|| HashSet::from_iter([Block::Sand, Block::RedSand, Block::SuspiciousSand])); pub static SAPLINGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakSapling, Block::SpruceSapling, Block::BirchSapling, @@ -3345,7 +3339,7 @@ pub static SAPLINGS: LazyLock> = LazyLock::new(|| { ]) }); pub static SCULK_REPLACEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Sand, Block::RedSand, Block::Gravel, @@ -3399,7 +3393,7 @@ pub static SCULK_REPLACEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static SCULK_REPLACEABLE_WORLD_GEN: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::DeepslateBricks, Block::DeepslateTiles, Block::CobbledDeepslate, @@ -3459,7 +3453,7 @@ pub static SCULK_REPLACEABLE_WORLD_GEN: LazyLock> = LazyLock::new ]) }); pub static SHULKER_BOXES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::ShulkerBox, Block::BlackShulkerBox, Block::BlueShulkerBox, @@ -3480,7 +3474,7 @@ pub static SHULKER_BOXES: LazyLock> = LazyLock::new(|| { ]) }); pub static SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakSign, Block::SpruceSign, Block::BirchSign, @@ -3508,7 +3502,7 @@ pub static SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static SLABS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::BambooMosaicSlab, Block::StoneSlab, Block::SmoothStoneSlab, @@ -3574,9 +3568,9 @@ pub static SLABS: LazyLock> = LazyLock::new(|| { ]) }); pub static SMALL_DRIPLEAF_PLACEABLE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Clay, Block::MossBlock])); + LazyLock::new(|| HashSet::from_iter([Block::Clay, Block::MossBlock])); pub static SMALL_FLOWERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Dandelion, Block::OpenEyeblossom, Block::Poppy, @@ -3596,9 +3590,9 @@ pub static SMALL_FLOWERS: LazyLock> = LazyLock::new(|| { ]) }); pub static SMELTS_TO_GLASS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Sand, Block::RedSand])); + LazyLock::new(|| HashSet::from_iter([Block::Sand, Block::RedSand])); pub static SNAPS_GOAT_HORN: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::PackedIce, Block::IronOre, @@ -3617,7 +3611,7 @@ pub static SNAPS_GOAT_HORN: LazyLock> = LazyLock::new(|| { ]) }); pub static SNIFFER_DIGGABLE_BLOCK: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Dirt, Block::GrassBlock, Block::Podzol, @@ -3630,19 +3624,19 @@ pub static SNIFFER_DIGGABLE_BLOCK: LazyLock> = LazyLock::new(|| { ]) }); pub static SNIFFER_EGG_HATCH_BOOST: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::MossBlock])); + LazyLock::new(|| HashSet::from_iter([Block::MossBlock])); pub static SNOW: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Snow, Block::SnowBlock, Block::PowderSnow])); + LazyLock::new(|| HashSet::from_iter([Block::Snow, Block::SnowBlock, Block::PowderSnow])); pub static SNOW_LAYER_CAN_SURVIVE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::HoneyBlock, Block::SoulSand, Block::Mud])); + LazyLock::new(|| HashSet::from_iter([Block::HoneyBlock, Block::SoulSand, Block::Mud])); pub static SNOW_LAYER_CANNOT_SURVIVE_ON: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Ice, Block::PackedIce, Block::Barrier])); + LazyLock::new(|| HashSet::from_iter([Block::Ice, Block::PackedIce, Block::Barrier])); pub static SOUL_FIRE_BASE_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::SoulSand, Block::SoulSoil])); + LazyLock::new(|| HashSet::from_iter([Block::SoulSand, Block::SoulSoil])); pub static SOUL_SPEED_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::SoulSand, Block::SoulSoil])); + LazyLock::new(|| HashSet::from_iter([Block::SoulSand, Block::SoulSoil])); pub static SPRUCE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::SpruceLog, Block::SpruceWood, Block::StrippedSpruceLog, @@ -3650,7 +3644,7 @@ pub static SPRUCE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static STAIRS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::BambooMosaicStairs, Block::CobblestoneStairs, Block::SandstoneStairs, @@ -3712,7 +3706,7 @@ pub static STAIRS: LazyLock> = LazyLock::new(|| { ]) }); pub static STANDING_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakSign, Block::SpruceSign, Block::BirchSign, @@ -3728,7 +3722,7 @@ pub static STANDING_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static STONE_BRICKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::StoneBricks, Block::MossyStoneBricks, Block::CrackedStoneBricks, @@ -3736,9 +3730,9 @@ pub static STONE_BRICKS: LazyLock> = LazyLock::new(|| { ]) }); pub static STONE_BUTTONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::StoneButton, Block::PolishedBlackstoneButton])); + LazyLock::new(|| HashSet::from_iter([Block::StoneButton, Block::PolishedBlackstoneButton])); pub static STONE_ORE_REPLACEABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Stone, Block::Granite, Block::Diorite, @@ -3746,15 +3740,15 @@ pub static STONE_ORE_REPLACEABLES: LazyLock> = LazyLock::new(|| { ]) }); pub static STONE_PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::StonePressurePlate, Block::PolishedBlackstonePressurePlate, ]) }); pub static STRIDER_WARM_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Lava])); + LazyLock::new(|| HashSet::from_iter([Block::Lava])); pub static SWORD_EFFICIENT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Vine, Block::GlowLichen, Block::Pumpkin, @@ -3780,9 +3774,9 @@ pub static SWORD_EFFICIENT: LazyLock> = LazyLock::new(|| { ]) }); pub static SWORD_INSTANTLY_MINES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Bamboo, Block::BambooSapling])); + LazyLock::new(|| HashSet::from_iter([Block::Bamboo, Block::BambooSapling])); pub static TERRACOTTA: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Terracotta, Block::WhiteTerracotta, Block::OrangeTerracotta, @@ -3803,9 +3797,9 @@ pub static TERRACOTTA: LazyLock> = LazyLock::new(|| { ]) }); pub static TRAIL_RUINS_REPLACEABLE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Gravel])); + LazyLock::new(|| HashSet::from_iter([Block::Gravel])); pub static TRAPDOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::IronTrapdoor, Block::CopperTrapdoor, Block::ExposedCopperTrapdoor, @@ -3831,7 +3825,7 @@ pub static TRAPDOORS: LazyLock> = LazyLock::new(|| { }); pub static TRIGGERS_AMBIENT_DESERT_DRY_VEGETATION_BLOCK_SOUNDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Sand, Block::RedSand, Block::Terracotta, @@ -3854,11 +3848,11 @@ pub static TRIGGERS_AMBIENT_DESERT_DRY_VEGETATION_BLOCK_SOUNDS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::Sand, Block::RedSand])); + LazyLock::new(|| HashSet::from_iter([Block::Sand, Block::RedSand])); pub static TRIGGERS_AMBIENT_DRIED_GHAST_BLOCK_SOUNDS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::SoulSand, Block::SoulSoil])); + LazyLock::new(|| HashSet::from_iter([Block::SoulSand, Block::SoulSoil])); pub static UNDERWATER_BONEMEALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Seagrass, Block::TubeCoralFan, Block::BrainCoralFan, @@ -3878,7 +3872,7 @@ pub static UNDERWATER_BONEMEALS: LazyLock> = LazyLock::new(|| { ]) }); pub static UNSTABLE_BOTTOM_CENTER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaFenceGate, Block::BirchFenceGate, Block::DarkOakFenceGate, @@ -3894,11 +3888,11 @@ pub static UNSTABLE_BOTTOM_CENTER: LazyLock> = LazyLock::new(|| { ]) }); pub static VALID_SPAWN: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::GrassBlock, Block::Podzol])); + LazyLock::new(|| HashSet::from_iter([Block::GrassBlock, Block::Podzol])); pub static VIBRATION_RESONATORS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::AmethystBlock])); + LazyLock::new(|| HashSet::from_iter([Block::AmethystBlock])); pub static WALL_CORALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::TubeCoralWallFan, Block::BrainCoralWallFan, Block::BubbleCoralWallFan, @@ -3907,7 +3901,7 @@ pub static WALL_CORALS: LazyLock> = LazyLock::new(|| { ]) }); pub static WALL_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakWallHangingSign, Block::SpruceWallHangingSign, Block::BirchWallHangingSign, @@ -3923,7 +3917,7 @@ pub static WALL_HANGING_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static WALL_POST_OVERRIDE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Torch, Block::SoulTorch, Block::RedstoneTorch, @@ -4005,7 +3999,7 @@ pub static WALL_POST_OVERRIDE: LazyLock> = LazyLock::new(|| { ]) }); pub static WALL_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakWallSign, Block::SpruceWallSign, Block::BirchWallSign, @@ -4021,7 +4015,7 @@ pub static WALL_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static WALLS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::CobblestoneWall, Block::MossyCobblestoneWall, Block::BrickWall, @@ -4051,7 +4045,7 @@ pub static WALLS: LazyLock> = LazyLock::new(|| { ]) }); pub static WARPED_STEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WarpedStem, Block::StrippedWarpedStem, Block::WarpedHyphae, @@ -4059,9 +4053,9 @@ pub static WARPED_STEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static WART_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::NetherWartBlock, Block::WarpedWartBlock])); + LazyLock::new(|| HashSet::from_iter([Block::NetherWartBlock, Block::WarpedWartBlock])); pub static WITHER_IMMUNE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::Barrier, Block::Bedrock, Block::EndPortal, @@ -4080,9 +4074,9 @@ pub static WITHER_IMMUNE: LazyLock> = LazyLock::new(|| { ]) }); pub static WITHER_SUMMON_BASE_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Block::SoulSand, Block::SoulSoil])); + LazyLock::new(|| HashSet::from_iter([Block::SoulSand, Block::SoulSoil])); pub static WOLVES_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::GrassBlock, Block::Snow, Block::SnowBlock, @@ -4091,7 +4085,7 @@ pub static WOLVES_SPAWNABLE_ON: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_BUTTONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakButton, Block::SpruceButton, Block::BirchButton, @@ -4107,7 +4101,7 @@ pub static WOODEN_BUTTONS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_DOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakDoor, Block::SpruceDoor, Block::BirchDoor, @@ -4123,7 +4117,7 @@ pub static WOODEN_DOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_FENCES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakFence, Block::AcaciaFence, Block::DarkOakFence, @@ -4139,7 +4133,7 @@ pub static WOODEN_FENCES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakPressurePlate, Block::SprucePressurePlate, Block::BirchPressurePlate, @@ -4155,7 +4149,7 @@ pub static WOODEN_PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_SHELVES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaShelf, Block::BambooShelf, Block::BirchShelf, @@ -4171,7 +4165,7 @@ pub static WOODEN_SHELVES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_SLABS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakSlab, Block::SpruceSlab, Block::BirchSlab, @@ -4187,7 +4181,7 @@ pub static WOODEN_SLABS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_STAIRS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::OakStairs, Block::SpruceStairs, Block::BirchStairs, @@ -4203,7 +4197,7 @@ pub static WOODEN_STAIRS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_TRAPDOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::AcaciaTrapdoor, Block::BirchTrapdoor, Block::DarkOakTrapdoor, @@ -4219,7 +4213,7 @@ pub static WOODEN_TRAPDOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteWool, Block::OrangeWool, Block::MagentaWool, @@ -4239,7 +4233,7 @@ pub static WOOL: LazyLock> = LazyLock::new(|| { ]) }); pub static WOOL_CARPETS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Block::WhiteCarpet, Block::OrangeCarpet, Block::MagentaCarpet, diff --git a/azalea-registry/src/tags/entities.rs b/azalea-registry/src/tags/entities.rs index 4410471c..dc40ca7f 100644 --- a/azalea-registry/src/tags/entities.rs +++ b/azalea-registry/src/tags/entities.rs @@ -5,9 +5,9 @@ use std::{collections::HashSet, sync::LazyLock}; use crate::EntityKind; pub static ACCEPTS_IRON_GOLEM_GIFT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::CopperGolem])); + LazyLock::new(|| HashSet::from_iter([EntityKind::CopperGolem])); pub static AQUATIC: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Turtle, EntityKind::Axolotl, EntityKind::Guardian, @@ -23,9 +23,9 @@ pub static AQUATIC: LazyLock> = LazyLock::new(|| { ]) }); pub static ARROWS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Arrow, EntityKind::SpectralArrow])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Arrow, EntityKind::SpectralArrow])); pub static ARTHROPOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Bee, EntityKind::Endermite, EntityKind::Silverfish, @@ -34,14 +34,14 @@ pub static ARTHROPOD: LazyLock> = LazyLock::new(|| { ]) }); pub static AXOLOTL_ALWAYS_HOSTILES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Drowned, EntityKind::Guardian, EntityKind::ElderGuardian, ]) }); pub static AXOLOTL_HUNT_TARGETS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::TropicalFish, EntityKind::Pufferfish, EntityKind::Salmon, @@ -52,9 +52,9 @@ pub static AXOLOTL_HUNT_TARGETS: LazyLock> = LazyLock::new(| ]) }); pub static BEEHIVE_INHABITORS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Bee])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Bee])); pub static BOAT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::OakBoat, EntityKind::SpruceBoat, EntityKind::BirchBoat, @@ -68,7 +68,7 @@ pub static BOAT: LazyLock> = LazyLock::new(|| { ]) }); pub static CAN_BREATHE_UNDER_WATER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Axolotl, EntityKind::Frog, EntityKind::Guardian, @@ -100,9 +100,9 @@ pub static CAN_BREATHE_UNDER_WATER: LazyLock> = LazyLock::ne ]) }); pub static CAN_EQUIP_HARNESS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::HappyGhast])); + LazyLock::new(|| HashSet::from_iter([EntityKind::HappyGhast])); pub static CAN_EQUIP_SADDLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Horse, EntityKind::SkeletonHorse, EntityKind::ZombieHorse, @@ -114,13 +114,13 @@ pub static CAN_EQUIP_SADDLE: LazyLock> = LazyLock::new(|| { ]) }); pub static CAN_TURN_IN_BOATS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Breeze])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Breeze])); pub static CAN_WEAR_HORSE_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Horse])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Horse])); pub static CANDIDATE_FOR_IRON_GOLEM_GIFT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Villager, EntityKind::CopperGolem])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Villager, EntityKind::CopperGolem])); pub static CANNOT_BE_PUSHED_ONTO_BOATS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Player, EntityKind::ElderGuardian, EntityKind::Cod, @@ -135,9 +135,9 @@ pub static CANNOT_BE_PUSHED_ONTO_BOATS: LazyLock> = LazyLock ]) }); pub static DEFLECTS_PROJECTILES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Breeze])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Breeze])); pub static DISMOUNTS_UNDERWATER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Camel, EntityKind::Chicken, EntityKind::Donkey, @@ -154,7 +154,7 @@ pub static DISMOUNTS_UNDERWATER: LazyLock> = LazyLock::new(| ]) }); pub static FALL_DAMAGE_IMMUNE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::CopperGolem, EntityKind::IronGolem, EntityKind::SnowGolem, @@ -176,7 +176,7 @@ pub static FALL_DAMAGE_IMMUNE: LazyLock> = LazyLock::new(|| ]) }); pub static FOLLOWABLE_FRIENDLY_MOBS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Armadillo, EntityKind::Bee, EntityKind::Camel, @@ -205,14 +205,14 @@ pub static FOLLOWABLE_FRIENDLY_MOBS: LazyLock> = LazyLock::n ]) }); pub static FREEZE_HURTS_EXTRA_TYPES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Strider, EntityKind::Blaze, EntityKind::MagmaCube, ]) }); pub static FREEZE_IMMUNE_ENTITY_TYPES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Stray, EntityKind::PolarBear, EntityKind::SnowGolem, @@ -220,9 +220,9 @@ pub static FREEZE_IMMUNE_ENTITY_TYPES: LazyLock> = LazyLock: ]) }); pub static FROG_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Slime, EntityKind::MagmaCube])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Slime, EntityKind::MagmaCube])); pub static IGNORES_POISON_AND_REGEN: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -240,7 +240,7 @@ pub static IGNORES_POISON_AND_REGEN: LazyLock> = LazyLock::n ]) }); pub static ILLAGER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Evoker, EntityKind::Illusioner, EntityKind::Pillager, @@ -248,7 +248,7 @@ pub static ILLAGER: LazyLock> = LazyLock::new(|| { ]) }); pub static ILLAGER_FRIENDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Evoker, EntityKind::Illusioner, EntityKind::Pillager, @@ -256,11 +256,11 @@ pub static ILLAGER_FRIENDS: LazyLock> = LazyLock::new(|| { ]) }); pub static IMMUNE_TO_INFESTED: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Silverfish])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Silverfish])); pub static IMMUNE_TO_OOZING: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Slime])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Slime])); pub static IMPACT_PROJECTILES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::FireworkRocket, EntityKind::Snowball, EntityKind::Fireball, @@ -276,7 +276,7 @@ pub static IMPACT_PROJECTILES: LazyLock> = LazyLock::new(|| ]) }); pub static INVERTED_HEALING_AND_HARM: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -294,7 +294,7 @@ pub static INVERTED_HEALING_AND_HARM: LazyLock> = LazyLock:: ]) }); pub static NO_ANGER_FROM_WIND_CHARGE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Breeze, EntityKind::Skeleton, EntityKind::Bogged, @@ -307,9 +307,9 @@ pub static NO_ANGER_FROM_WIND_CHARGE: LazyLock> = LazyLock:: ]) }); pub static NON_CONTROLLING_RIDER: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![EntityKind::Slime, EntityKind::MagmaCube])); + LazyLock::new(|| HashSet::from_iter([EntityKind::Slime, EntityKind::MagmaCube])); pub static NOT_SCARY_FOR_PUFFERFISH: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Turtle, EntityKind::Guardian, EntityKind::ElderGuardian, @@ -324,7 +324,7 @@ pub static NOT_SCARY_FOR_PUFFERFISH: LazyLock> = LazyLock::n ]) }); pub static POWDER_SNOW_WALKABLE_MOBS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Rabbit, EntityKind::Endermite, EntityKind::Silverfish, @@ -332,7 +332,7 @@ pub static POWDER_SNOW_WALKABLE_MOBS: LazyLock> = LazyLock:: ]) }); pub static RAIDERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Evoker, EntityKind::Pillager, EntityKind::Ravager, @@ -342,14 +342,14 @@ pub static RAIDERS: LazyLock> = LazyLock::new(|| { ]) }); pub static REDIRECTABLE_PROJECTILE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Fireball, EntityKind::WindCharge, EntityKind::BreezeWindCharge, ]) }); pub static SENSITIVE_TO_BANE_OF_ARTHROPODS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Bee, EntityKind::Endermite, EntityKind::Silverfish, @@ -358,7 +358,7 @@ pub static SENSITIVE_TO_BANE_OF_ARTHROPODS: LazyLock> = Lazy ]) }); pub static SENSITIVE_TO_IMPALING: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Turtle, EntityKind::Axolotl, EntityKind::Guardian, @@ -374,7 +374,7 @@ pub static SENSITIVE_TO_IMPALING: LazyLock> = LazyLock::new( ]) }); pub static SENSITIVE_TO_SMITE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -392,7 +392,7 @@ pub static SENSITIVE_TO_SMITE: LazyLock> = LazyLock::new(|| ]) }); pub static SKELETONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Skeleton, EntityKind::Stray, EntityKind::WitherSkeleton, @@ -401,7 +401,7 @@ pub static SKELETONS: LazyLock> = LazyLock::new(|| { ]) }); pub static UNDEAD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -419,7 +419,7 @@ pub static UNDEAD: LazyLock> = LazyLock::new(|| { ]) }); pub static WITHER_FRIENDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::Wither, EntityKind::Phantom, EntityKind::Skeleton, @@ -437,7 +437,7 @@ pub static WITHER_FRIENDS: LazyLock> = LazyLock::new(|| { ]) }); pub static ZOMBIES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ EntityKind::ZombieHorse, EntityKind::Zombie, EntityKind::ZombieVillager, diff --git a/azalea-registry/src/tags/fluids.rs b/azalea-registry/src/tags/fluids.rs index ec96fa8f..89c22fe0 100644 --- a/azalea-registry/src/tags/fluids.rs +++ b/azalea-registry/src/tags/fluids.rs @@ -5,6 +5,6 @@ use std::{collections::HashSet, sync::LazyLock}; use crate::Fluid; pub static LAVA: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Fluid::Lava, Fluid::FlowingLava])); + LazyLock::new(|| HashSet::from_iter([Fluid::Lava, Fluid::FlowingLava])); pub static WATER: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Fluid::Water, Fluid::FlowingWater])); + LazyLock::new(|| HashSet::from_iter([Fluid::Water, Fluid::FlowingWater])); diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs index 2b317c7b..981a27ba 100644 --- a/azalea-registry/src/tags/items.rs +++ b/azalea-registry/src/tags/items.rs @@ -5,7 +5,7 @@ use std::{collections::HashSet, sync::LazyLock}; use crate::Item; pub static ACACIA_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AcaciaLog, Item::AcaciaWood, Item::StrippedAcaciaLog, @@ -13,13 +13,13 @@ pub static ACACIA_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static ANVIL: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Anvil, Item::ChippedAnvil, Item::DamagedAnvil])); + LazyLock::new(|| HashSet::from_iter([Item::Anvil, Item::ChippedAnvil, Item::DamagedAnvil])); pub static ARMADILLO_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::SpiderEye])); + LazyLock::new(|| HashSet::from_iter([Item::SpiderEye])); pub static ARROWS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Arrow, Item::TippedArrow, Item::SpectralArrow])); + LazyLock::new(|| HashSet::from_iter([Item::Arrow, Item::TippedArrow, Item::SpectralArrow])); pub static AXES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondAxe, Item::StoneAxe, Item::GoldenAxe, @@ -30,11 +30,11 @@ pub static AXES: LazyLock> = LazyLock::new(|| { ]) }); pub static AXOLOTL_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::TropicalFishBucket])); + LazyLock::new(|| HashSet::from_iter([Item::TropicalFishBucket])); pub static BAMBOO_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::BambooBlock, Item::StrippedBambooBlock])); + LazyLock::new(|| HashSet::from_iter([Item::BambooBlock, Item::StrippedBambooBlock])); pub static BANNERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WhiteBanner, Item::OrangeBanner, Item::MagentaBanner, @@ -54,7 +54,7 @@ pub static BANNERS: LazyLock> = LazyLock::new(|| { ]) }); pub static BARS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::IronBars, Item::CopperBars, Item::WaxedCopperBars, @@ -67,7 +67,7 @@ pub static BARS: LazyLock> = LazyLock::new(|| { ]) }); pub static BEACON_PAYMENT_ITEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::NetheriteIngot, Item::Emerald, Item::Diamond, @@ -76,7 +76,7 @@ pub static BEACON_PAYMENT_ITEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static BEDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::RedBed, Item::BlackBed, Item::BlueBed, @@ -96,7 +96,7 @@ pub static BEDS: LazyLock> = LazyLock::new(|| { ]) }); pub static BEE_FOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Dandelion, Item::OpenEyeblossom, Item::Poppy, @@ -129,7 +129,7 @@ pub static BEE_FOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static BIRCH_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::BirchLog, Item::BirchWood, Item::StrippedBirchLog, @@ -137,7 +137,7 @@ pub static BIRCH_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static BOATS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakBoat, Item::SpruceBoat, Item::BirchBoat, @@ -161,9 +161,9 @@ pub static BOATS: LazyLock> = LazyLock::new(|| { ]) }); pub static BOOK_CLONING_TARGET: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::WritableBook])); + LazyLock::new(|| HashSet::from_iter([Item::WritableBook])); pub static BOOKSHELF_BOOKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Book, Item::WrittenBook, Item::EnchantedBook, @@ -172,7 +172,7 @@ pub static BOOKSHELF_BOOKS: LazyLock> = LazyLock::new(|| { ]) }); pub static BREAKS_DECORATED_POTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Trident, Item::Mace, Item::DiamondSword, @@ -213,9 +213,9 @@ pub static BREAKS_DECORATED_POTS: LazyLock> = LazyLock::new(|| { ]) }); pub static BREWING_FUEL: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::BlazePowder])); + LazyLock::new(|| HashSet::from_iter([Item::BlazePowder])); pub static BUNDLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Bundle, Item::BlackBundle, Item::BlueBundle, @@ -236,7 +236,7 @@ pub static BUNDLES: LazyLock> = LazyLock::new(|| { ]) }); pub static BUTTONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakButton, Item::SpruceButton, Item::BirchButton, @@ -254,9 +254,9 @@ pub static BUTTONS: LazyLock> = LazyLock::new(|| { ]) }); pub static CAMEL_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Cactus])); + LazyLock::new(|| HashSet::from_iter([Item::Cactus])); pub static CANDLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Candle, Item::WhiteCandle, Item::OrangeCandle, @@ -277,9 +277,9 @@ pub static CANDLES: LazyLock> = LazyLock::new(|| { ]) }); pub static CAT_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Cod, Item::Salmon])); + LazyLock::new(|| HashSet::from_iter([Item::Cod, Item::Salmon])); pub static CHAINS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::IronChain, Item::CopperChain, Item::WaxedCopperChain, @@ -292,7 +292,7 @@ pub static CHAINS: LazyLock> = LazyLock::new(|| { ]) }); pub static CHERRY_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CherryLog, Item::CherryWood, Item::StrippedCherryLog, @@ -300,7 +300,7 @@ pub static CHERRY_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static CHEST_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherChestplate, Item::CopperChestplate, Item::ChainmailChestplate, @@ -311,7 +311,7 @@ pub static CHEST_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static CHEST_BOATS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakChestBoat, Item::SpruceChestBoat, Item::BirchChestBoat, @@ -325,7 +325,7 @@ pub static CHEST_BOATS: LazyLock> = LazyLock::new(|| { ]) }); pub static CHICKEN_FOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WheatSeeds, Item::MelonSeeds, Item::PumpkinSeeds, @@ -335,7 +335,7 @@ pub static CHICKEN_FOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static CLUSTER_MAX_HARVESTABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondPickaxe, Item::GoldenPickaxe, Item::IronPickaxe, @@ -346,13 +346,13 @@ pub static CLUSTER_MAX_HARVESTABLES: LazyLock> = LazyLock::new(|| ]) }); pub static COAL_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CoalOre, Item::DeepslateCoalOre])); + LazyLock::new(|| HashSet::from_iter([Item::CoalOre, Item::DeepslateCoalOre])); pub static COALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Coal, Item::Charcoal])); + LazyLock::new(|| HashSet::from_iter([Item::Coal, Item::Charcoal])); pub static COMPASSES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Compass, Item::RecoveryCompass])); + LazyLock::new(|| HashSet::from_iter([Item::Compass, Item::RecoveryCompass])); pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::JungleLeaves, Item::OakLeaves, Item::SpruceLeaves, @@ -413,7 +413,7 @@ pub static COMPLETES_FIND_TREE_TUTORIAL: LazyLock> = LazyLock::new ]) }); pub static COPPER: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CopperBlock, Item::ExposedCopper, Item::WeatheredCopper, @@ -425,7 +425,7 @@ pub static COPPER: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_CHESTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CopperChest, Item::ExposedCopperChest, Item::WeatheredCopperChest, @@ -437,7 +437,7 @@ pub static COPPER_CHESTS: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_GOLEM_STATUES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CopperGolemStatue, Item::ExposedCopperGolemStatue, Item::WeatheredCopperGolemStatue, @@ -449,13 +449,12 @@ pub static COPPER_GOLEM_STATUES: LazyLock> = LazyLock::new(|| { ]) }); pub static COPPER_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CopperOre, Item::DeepslateCopperOre])); + LazyLock::new(|| HashSet::from_iter([Item::CopperOre, Item::DeepslateCopperOre])); pub static COPPER_TOOL_MATERIALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CopperIngot])); -pub static COW_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Wheat])); + LazyLock::new(|| HashSet::from_iter([Item::CopperIngot])); +pub static COW_FOOD: LazyLock> = LazyLock::new(|| HashSet::from_iter([Item::Wheat])); pub static CREEPER_DROP_MUSIC_DISCS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::MusicDisc13, Item::MusicDiscCat, Item::MusicDiscBlocks, @@ -471,9 +470,9 @@ pub static CREEPER_DROP_MUSIC_DISCS: LazyLock> = LazyLock::new(|| ]) }); pub static CREEPER_IGNITERS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::FlintAndSteel, Item::FireCharge])); + LazyLock::new(|| HashSet::from_iter([Item::FlintAndSteel, Item::FireCharge])); pub static CRIMSON_STEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CrimsonStem, Item::StrippedCrimsonStem, Item::CrimsonHyphae, @@ -481,7 +480,7 @@ pub static CRIMSON_STEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static DAMPENS_VIBRATIONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WhiteWool, Item::OrangeWool, Item::MagentaWool, @@ -517,7 +516,7 @@ pub static DAMPENS_VIBRATIONS: LazyLock> = LazyLock::new(|| { ]) }); pub static DARK_OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DarkOakLog, Item::DarkOakWood, Item::StrippedDarkOakLog, @@ -525,7 +524,7 @@ pub static DARK_OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static DECORATED_POT_INGREDIENTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Brick, Item::AnglerPotterySherd, Item::ArcherPotterySherd, @@ -553,7 +552,7 @@ pub static DECORATED_POT_INGREDIENTS: LazyLock> = LazyLock::new(|| ]) }); pub static DECORATED_POT_SHERDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AnglerPotterySherd, Item::ArcherPotterySherd, Item::ArmsUpPotterySherd, @@ -580,11 +579,11 @@ pub static DECORATED_POT_SHERDS: LazyLock> = LazyLock::new(|| { ]) }); pub static DIAMOND_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::DiamondOre, Item::DeepslateDiamondOre])); + LazyLock::new(|| HashSet::from_iter([Item::DiamondOre, Item::DeepslateDiamondOre])); pub static DIAMOND_TOOL_MATERIALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Diamond])); + LazyLock::new(|| HashSet::from_iter([Item::Diamond])); pub static DIRT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Dirt, Item::GrassBlock, Item::Podzol, @@ -598,7 +597,7 @@ pub static DIRT: LazyLock> = LazyLock::new(|| { ]) }); pub static DOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CopperDoor, Item::ExposedCopperDoor, Item::WeatheredCopperDoor, @@ -623,11 +622,11 @@ pub static DOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static DROWNED_PREFERRED_WEAPONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Trident])); + LazyLock::new(|| HashSet::from_iter([Item::Trident])); pub static DUPLICATES_ALLAYS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::AmethystShard])); + LazyLock::new(|| HashSet::from_iter([Item::AmethystShard])); pub static DYEABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherHelmet, Item::LeatherChestplate, Item::LeatherLeggings, @@ -637,11 +636,11 @@ pub static DYEABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static EGGS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Egg, Item::BlueEgg, Item::BrownEgg])); + LazyLock::new(|| HashSet::from_iter([Item::Egg, Item::BlueEgg, Item::BrownEgg])); pub static EMERALD_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::EmeraldOre, Item::DeepslateEmeraldOre])); + LazyLock::new(|| HashSet::from_iter([Item::EmeraldOre, Item::DeepslateEmeraldOre])); pub static ENCHANTABLE_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherBoots, Item::CopperBoots, Item::ChainmailBoots, @@ -674,9 +673,9 @@ pub static ENCHANTABLE_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_BOW: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Bow])); + LazyLock::new(|| HashSet::from_iter([Item::Bow])); pub static ENCHANTABLE_CHEST_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherChestplate, Item::CopperChestplate, Item::ChainmailChestplate, @@ -687,9 +686,9 @@ pub static ENCHANTABLE_CHEST_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_CROSSBOW: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Crossbow])); + LazyLock::new(|| HashSet::from_iter([Item::Crossbow])); pub static ENCHANTABLE_DURABILITY: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Elytra, Item::Shield, Item::Bow, @@ -769,7 +768,7 @@ pub static ENCHANTABLE_DURABILITY: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_EQUIPPABLE: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Elytra, Item::CarvedPumpkin, Item::LeatherBoots, @@ -811,7 +810,7 @@ pub static ENCHANTABLE_EQUIPPABLE: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_FIRE_ASPECT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Mace, Item::DiamondSword, Item::StoneSword, @@ -823,9 +822,9 @@ pub static ENCHANTABLE_FIRE_ASPECT: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_FISHING: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::FishingRod])); + LazyLock::new(|| HashSet::from_iter([Item::FishingRod])); pub static ENCHANTABLE_FOOT_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherBoots, Item::CopperBoots, Item::ChainmailBoots, @@ -836,7 +835,7 @@ pub static ENCHANTABLE_FOOT_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_HEAD_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherHelmet, Item::CopperHelmet, Item::ChainmailHelmet, @@ -848,7 +847,7 @@ pub static ENCHANTABLE_HEAD_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_LEG_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherLeggings, Item::CopperLeggings, Item::ChainmailLeggings, @@ -859,9 +858,9 @@ pub static ENCHANTABLE_LEG_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_MACE: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Mace])); + LazyLock::new(|| HashSet::from_iter([Item::Mace])); pub static ENCHANTABLE_MINING: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Shears, Item::DiamondAxe, Item::StoneAxe, @@ -894,7 +893,7 @@ pub static ENCHANTABLE_MINING: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_MINING_LOOT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondAxe, Item::StoneAxe, Item::GoldenAxe, @@ -926,7 +925,7 @@ pub static ENCHANTABLE_MINING_LOOT: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_SHARP_WEAPON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -944,7 +943,7 @@ pub static ENCHANTABLE_SHARP_WEAPON: LazyLock> = LazyLock::new(|| ]) }); pub static ENCHANTABLE_SWORD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -955,9 +954,9 @@ pub static ENCHANTABLE_SWORD: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_TRIDENT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Trident])); + LazyLock::new(|| HashSet::from_iter([Item::Trident])); pub static ENCHANTABLE_VANISHING: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Compass, Item::CarvedPumpkin, Item::Elytra, @@ -1046,7 +1045,7 @@ pub static ENCHANTABLE_VANISHING: LazyLock> = LazyLock::new(|| { ]) }); pub static ENCHANTABLE_WEAPON: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Mace, Item::DiamondSword, Item::StoneSword, @@ -1065,7 +1064,7 @@ pub static ENCHANTABLE_WEAPON: LazyLock> = LazyLock::new(|| { ]) }); pub static FENCE_GATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AcaciaFenceGate, Item::BirchFenceGate, Item::DarkOakFenceGate, @@ -1081,7 +1080,7 @@ pub static FENCE_GATES: LazyLock> = LazyLock::new(|| { ]) }); pub static FENCES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::NetherBrickFence, Item::OakFence, Item::AcaciaFence, @@ -1098,7 +1097,7 @@ pub static FENCES: LazyLock> = LazyLock::new(|| { ]) }); pub static FISHES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Cod, Item::CookedCod, Item::Salmon, @@ -1108,7 +1107,7 @@ pub static FISHES: LazyLock> = LazyLock::new(|| { ]) }); pub static FLOWERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Sunflower, Item::Lilac, Item::Peony, @@ -1142,7 +1141,7 @@ pub static FLOWERS: LazyLock> = LazyLock::new(|| { ]) }); pub static FOOT_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherBoots, Item::CopperBoots, Item::ChainmailBoots, @@ -1153,9 +1152,9 @@ pub static FOOT_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static FOX_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::SweetBerries, Item::GlowBerries])); + LazyLock::new(|| HashSet::from_iter([Item::SweetBerries, Item::GlowBerries])); pub static FREEZE_IMMUNE_WEARABLES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherBoots, Item::LeatherLeggings, Item::LeatherChestplate, @@ -1164,24 +1163,19 @@ pub static FREEZE_IMMUNE_WEARABLES: LazyLock> = LazyLock::new(|| { ]) }); pub static FROG_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::SlimeBall])); + LazyLock::new(|| HashSet::from_iter([Item::SlimeBall])); pub static FURNACE_MINECART_FUEL: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Coal, Item::Charcoal])); + LazyLock::new(|| HashSet::from_iter([Item::Coal, Item::Charcoal])); pub static GAZE_DISGUISE_EQUIPMENT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CarvedPumpkin])); -pub static GOAT_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Wheat])); + LazyLock::new(|| HashSet::from_iter([Item::CarvedPumpkin])); +pub static GOAT_FOOD: LazyLock> = LazyLock::new(|| HashSet::from_iter([Item::Wheat])); pub static GOLD_ORES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::GoldOre, - Item::NetherGoldOre, - Item::DeepslateGoldOre, - ]) + HashSet::from_iter([Item::GoldOre, Item::NetherGoldOre, Item::DeepslateGoldOre]) }); pub static GOLD_TOOL_MATERIALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::GoldIngot])); + LazyLock::new(|| HashSet::from_iter([Item::GoldIngot])); pub static HANGING_SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakHangingSign, Item::SpruceHangingSign, Item::BirchHangingSign, @@ -1197,9 +1191,9 @@ pub static HANGING_SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static HAPPY_GHAST_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Snowball])); + LazyLock::new(|| HashSet::from_iter([Item::Snowball])); pub static HAPPY_GHAST_TEMPT_ITEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Snowball, Item::WhiteHarness, Item::OrangeHarness, @@ -1220,7 +1214,7 @@ pub static HAPPY_GHAST_TEMPT_ITEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static HARNESSES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WhiteHarness, Item::OrangeHarness, Item::MagentaHarness, @@ -1240,7 +1234,7 @@ pub static HARNESSES: LazyLock> = LazyLock::new(|| { ]) }); pub static HEAD_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherHelmet, Item::CopperHelmet, Item::ChainmailHelmet, @@ -1252,7 +1246,7 @@ pub static HEAD_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static HOES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondHoe, Item::StoneHoe, Item::GoldenHoe, @@ -1263,9 +1257,9 @@ pub static HOES: LazyLock> = LazyLock::new(|| { ]) }); pub static HOGLIN_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CrimsonFungus])); + LazyLock::new(|| HashSet::from_iter([Item::CrimsonFungus])); pub static HORSE_FOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Wheat, Item::Sugar, Item::HayBlock, @@ -1277,20 +1271,20 @@ pub static HORSE_FOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static HORSE_TEMPT_ITEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::GoldenCarrot, Item::GoldenApple, Item::EnchantedGoldenApple, ]) }); pub static IGNORED_BY_PIGLIN_BABIES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Leather])); + LazyLock::new(|| HashSet::from_iter([Item::Leather])); pub static IRON_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::IronOre, Item::DeepslateIronOre])); + LazyLock::new(|| HashSet::from_iter([Item::IronOre, Item::DeepslateIronOre])); pub static IRON_TOOL_MATERIALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::IronIngot])); + LazyLock::new(|| HashSet::from_iter([Item::IronIngot])); pub static JUNGLE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::JungleLog, Item::JungleWood, Item::StrippedJungleLog, @@ -1298,7 +1292,7 @@ pub static JUNGLE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static LANTERNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Lantern, Item::SoulLantern, Item::CopperLantern, @@ -1312,9 +1306,9 @@ pub static LANTERNS: LazyLock> = LazyLock::new(|| { ]) }); pub static LAPIS_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::LapisOre, Item::DeepslateLapisOre])); + LazyLock::new(|| HashSet::from_iter([Item::LapisOre, Item::DeepslateLapisOre])); pub static LEAVES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::JungleLeaves, Item::OakLeaves, Item::SpruceLeaves, @@ -1329,9 +1323,9 @@ pub static LEAVES: LazyLock> = LazyLock::new(|| { ]) }); pub static LECTERN_BOOKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::WrittenBook, Item::WritableBook])); + LazyLock::new(|| HashSet::from_iter([Item::WrittenBook, Item::WritableBook])); pub static LEG_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherLeggings, Item::CopperLeggings, Item::ChainmailLeggings, @@ -1342,7 +1336,7 @@ pub static LEG_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static LIGHTNING_RODS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LightningRod, Item::ExposedLightningRod, Item::WeatheredLightningRod, @@ -1354,11 +1348,11 @@ pub static LIGHTNING_RODS: LazyLock> = LazyLock::new(|| { ]) }); pub static LLAMA_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Wheat, Item::HayBlock])); + LazyLock::new(|| HashSet::from_iter([Item::Wheat, Item::HayBlock])); pub static LLAMA_TEMPT_ITEMS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::HayBlock])); + LazyLock::new(|| HashSet::from_iter([Item::HayBlock])); pub static LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CrimsonStem, Item::StrippedCrimsonStem, Item::CrimsonHyphae, @@ -1406,7 +1400,7 @@ pub static LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static LOGS_THAT_BURN: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DarkOakLog, Item::DarkOakWood, Item::StrippedDarkOakLog, @@ -1446,7 +1440,7 @@ pub static LOGS_THAT_BURN: LazyLock> = LazyLock::new(|| { ]) }); pub static MANGROVE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::MangroveLog, Item::MangroveWood, Item::StrippedMangroveLog, @@ -1454,9 +1448,9 @@ pub static MANGROVE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static MAP_INVISIBILITY_EQUIPMENT: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CarvedPumpkin])); + LazyLock::new(|| HashSet::from_iter([Item::CarvedPumpkin])); pub static MEAT: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Beef, Item::Chicken, Item::CookedBeef, @@ -1471,9 +1465,9 @@ pub static MEAT: LazyLock> = LazyLock::new(|| { ]) }); pub static NETHERITE_TOOL_MATERIALS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::NetheriteIngot])); + LazyLock::new(|| HashSet::from_iter([Item::NetheriteIngot])); pub static NON_FLAMMABLE_WOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WarpedStem, Item::StrippedWarpedStem, Item::WarpedHyphae, @@ -1509,7 +1503,7 @@ pub static NON_FLAMMABLE_WOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static NOTEBLOCK_TOP_INSTRUMENTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::ZombieHead, Item::SkeletonSkull, Item::CreeperHead, @@ -1520,7 +1514,7 @@ pub static NOTEBLOCK_TOP_INSTRUMENTS: LazyLock> = LazyLock::new(|| ]) }); pub static OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakLog, Item::OakWood, Item::StrippedOakLog, @@ -1528,9 +1522,9 @@ pub static OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static OCELOT_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Cod, Item::Salmon])); + LazyLock::new(|| HashSet::from_iter([Item::Cod, Item::Salmon])); pub static PALE_OAK_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::PaleOakLog, Item::PaleOakWood, Item::StrippedPaleOakLog, @@ -1538,11 +1532,11 @@ pub static PALE_OAK_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static PANDA_EATS_FROM_GROUND: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Cake, Item::Bamboo])); + LazyLock::new(|| HashSet::from_iter([Item::Cake, Item::Bamboo])); pub static PANDA_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Bamboo])); + LazyLock::new(|| HashSet::from_iter([Item::Bamboo])); pub static PARROT_FOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WheatSeeds, Item::MelonSeeds, Item::PumpkinSeeds, @@ -1552,9 +1546,9 @@ pub static PARROT_FOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static PARROT_POISONOUS_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Cookie])); + LazyLock::new(|| HashSet::from_iter([Item::Cookie])); pub static PICKAXES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondPickaxe, Item::StonePickaxe, Item::GoldenPickaxe, @@ -1565,11 +1559,11 @@ pub static PICKAXES: LazyLock> = LazyLock::new(|| { ]) }); pub static PIG_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Carrot, Item::Potato, Item::Beetroot])); + LazyLock::new(|| HashSet::from_iter([Item::Carrot, Item::Potato, Item::Beetroot])); pub static PIGLIN_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Porkchop, Item::CookedPorkchop])); + LazyLock::new(|| HashSet::from_iter([Item::Porkchop, Item::CookedPorkchop])); pub static PIGLIN_LOVED: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::GoldBlock, Item::GildedBlackstone, Item::LightWeightedPressurePlate, @@ -1598,12 +1592,11 @@ pub static PIGLIN_LOVED: LazyLock> = LazyLock::new(|| { ]) }); pub static PIGLIN_PREFERRED_WEAPONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Crossbow])); -pub static PIGLIN_REPELLENTS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![Item::SoulTorch, Item::SoulLantern, Item::SoulCampfire]) -}); + LazyLock::new(|| HashSet::from_iter([Item::Crossbow])); +pub static PIGLIN_REPELLENTS: LazyLock> = + LazyLock::new(|| HashSet::from_iter([Item::SoulTorch, Item::SoulLantern, Item::SoulCampfire])); pub static PIGLIN_SAFE_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::GoldenHelmet, Item::GoldenChestplate, Item::GoldenLeggings, @@ -1611,9 +1604,9 @@ pub static PIGLIN_SAFE_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static PILLAGER_PREFERRED_WEAPONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Crossbow])); + LazyLock::new(|| HashSet::from_iter([Item::Crossbow])); pub static PLANKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakPlanks, Item::SprucePlanks, Item::BirchPlanks, @@ -1629,9 +1622,9 @@ pub static PLANKS: LazyLock> = LazyLock::new(|| { ]) }); pub static RABBIT_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Carrot, Item::GoldenCarrot, Item::Dandelion])); + LazyLock::new(|| HashSet::from_iter([Item::Carrot, Item::GoldenCarrot, Item::Dandelion])); pub static RAILS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Rail, Item::PoweredRail, Item::DetectorRail, @@ -1639,29 +1632,29 @@ pub static RAILS: LazyLock> = LazyLock::new(|| { ]) }); pub static REDSTONE_ORES: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::RedstoneOre, Item::DeepslateRedstoneOre])); + LazyLock::new(|| HashSet::from_iter([Item::RedstoneOre, Item::DeepslateRedstoneOre])); pub static REPAIRS_CHAIN_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::IronIngot])); + LazyLock::new(|| HashSet::from_iter([Item::IronIngot])); pub static REPAIRS_COPPER_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::CopperIngot])); + LazyLock::new(|| HashSet::from_iter([Item::CopperIngot])); pub static REPAIRS_DIAMOND_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Diamond])); + LazyLock::new(|| HashSet::from_iter([Item::Diamond])); pub static REPAIRS_GOLD_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::GoldIngot])); + LazyLock::new(|| HashSet::from_iter([Item::GoldIngot])); pub static REPAIRS_IRON_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::IronIngot])); + LazyLock::new(|| HashSet::from_iter([Item::IronIngot])); pub static REPAIRS_LEATHER_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Leather])); + LazyLock::new(|| HashSet::from_iter([Item::Leather])); pub static REPAIRS_NETHERITE_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::NetheriteIngot])); + LazyLock::new(|| HashSet::from_iter([Item::NetheriteIngot])); pub static REPAIRS_TURTLE_HELMET: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::TurtleScute])); + LazyLock::new(|| HashSet::from_iter([Item::TurtleScute])); pub static REPAIRS_WOLF_ARMOR: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::ArmadilloScute])); + LazyLock::new(|| HashSet::from_iter([Item::ArmadilloScute])); pub static SAND: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Sand, Item::RedSand, Item::SuspiciousSand])); + LazyLock::new(|| HashSet::from_iter([Item::Sand, Item::RedSand, Item::SuspiciousSand])); pub static SAPLINGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakSapling, Item::SpruceSapling, Item::BirchSapling, @@ -1676,11 +1669,11 @@ pub static SAPLINGS: LazyLock> = LazyLock::new(|| { ]) }); pub static SHEARABLE_FROM_COPPER_GOLEM: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Poppy])); + LazyLock::new(|| HashSet::from_iter([Item::Poppy])); pub static SHEEP_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Wheat])); + LazyLock::new(|| HashSet::from_iter([Item::Wheat])); pub static SHOVELS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondShovel, Item::StoneShovel, Item::GoldenShovel, @@ -1691,7 +1684,7 @@ pub static SHOVELS: LazyLock> = LazyLock::new(|| { ]) }); pub static SHULKER_BOXES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::ShulkerBox, Item::BlackShulkerBox, Item::BlueShulkerBox, @@ -1712,7 +1705,7 @@ pub static SHULKER_BOXES: LazyLock> = LazyLock::new(|| { ]) }); pub static SIGNS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakSign, Item::SpruceSign, Item::BirchSign, @@ -1728,9 +1721,9 @@ pub static SIGNS: LazyLock> = LazyLock::new(|| { ]) }); pub static SKELETON_PREFERRED_WEAPONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Bow])); + LazyLock::new(|| HashSet::from_iter([Item::Bow])); pub static SKULLS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::PlayerHead, Item::CreeperHead, Item::ZombieHead, @@ -1741,7 +1734,7 @@ pub static SKULLS: LazyLock> = LazyLock::new(|| { ]) }); pub static SLABS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::BambooMosaicSlab, Item::StoneSlab, Item::SmoothStoneSlab, @@ -1807,7 +1800,7 @@ pub static SLABS: LazyLock> = LazyLock::new(|| { ]) }); pub static SMALL_FLOWERS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Dandelion, Item::OpenEyeblossom, Item::Poppy, @@ -1827,13 +1820,13 @@ pub static SMALL_FLOWERS: LazyLock> = LazyLock::new(|| { ]) }); pub static SMELTS_TO_GLASS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Sand, Item::RedSand])); + LazyLock::new(|| HashSet::from_iter([Item::Sand, Item::RedSand])); pub static SNIFFER_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::TorchflowerSeeds])); + LazyLock::new(|| HashSet::from_iter([Item::TorchflowerSeeds])); pub static SOUL_FIRE_BASE_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::SoulSand, Item::SoulSoil])); + LazyLock::new(|| HashSet::from_iter([Item::SoulSand, Item::SoulSoil])); pub static SPRUCE_LOGS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::SpruceLog, Item::SpruceWood, Item::StrippedSpruceLog, @@ -1841,7 +1834,7 @@ pub static SPRUCE_LOGS: LazyLock> = LazyLock::new(|| { ]) }); pub static STAIRS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::BambooMosaicStairs, Item::CobblestoneStairs, Item::SandstoneStairs, @@ -1903,7 +1896,7 @@ pub static STAIRS: LazyLock> = LazyLock::new(|| { ]) }); pub static STONE_BRICKS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::StoneBricks, Item::MossyStoneBricks, Item::CrackedStoneBricks, @@ -1911,27 +1904,19 @@ pub static STONE_BRICKS: LazyLock> = LazyLock::new(|| { ]) }); pub static STONE_BUTTONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::StoneButton, Item::PolishedBlackstoneButton])); + LazyLock::new(|| HashSet::from_iter([Item::StoneButton, Item::PolishedBlackstoneButton])); pub static STONE_CRAFTING_MATERIALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::Cobblestone, - Item::Blackstone, - Item::CobbledDeepslate, - ]) + HashSet::from_iter([Item::Cobblestone, Item::Blackstone, Item::CobbledDeepslate]) }); pub static STONE_TOOL_MATERIALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ - Item::Cobblestone, - Item::Blackstone, - Item::CobbledDeepslate, - ]) + HashSet::from_iter([Item::Cobblestone, Item::Blackstone, Item::CobbledDeepslate]) }); pub static STRIDER_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::WarpedFungus])); + LazyLock::new(|| HashSet::from_iter([Item::WarpedFungus])); pub static STRIDER_TEMPT_ITEMS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::WarpedFungusOnAStick, Item::WarpedFungus])); + LazyLock::new(|| HashSet::from_iter([Item::WarpedFungusOnAStick, Item::WarpedFungus])); pub static SWORDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::DiamondSword, Item::StoneSword, Item::GoldenSword, @@ -1942,7 +1927,7 @@ pub static SWORDS: LazyLock> = LazyLock::new(|| { ]) }); pub static TERRACOTTA: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Terracotta, Item::WhiteTerracotta, Item::OrangeTerracotta, @@ -1963,7 +1948,7 @@ pub static TERRACOTTA: LazyLock> = LazyLock::new(|| { ]) }); pub static TRAPDOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::IronTrapdoor, Item::CopperTrapdoor, Item::ExposedCopperTrapdoor, @@ -1988,7 +1973,7 @@ pub static TRAPDOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static TRIM_MATERIALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AmethystShard, Item::CopperIngot, Item::Diamond, @@ -2003,7 +1988,7 @@ pub static TRIM_MATERIALS: LazyLock> = LazyLock::new(|| { ]) }); pub static TRIMMABLE_ARMOR: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::LeatherBoots, Item::CopperBoots, Item::ChainmailBoots, @@ -2036,9 +2021,9 @@ pub static TRIMMABLE_ARMOR: LazyLock> = LazyLock::new(|| { ]) }); pub static TURTLE_FOOD: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Seagrass])); + LazyLock::new(|| HashSet::from_iter([Item::Seagrass])); pub static VILLAGER_PICKS_UP: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Bread, Item::Wheat, Item::Beetroot, @@ -2051,7 +2036,7 @@ pub static VILLAGER_PICKS_UP: LazyLock> = LazyLock::new(|| { ]) }); pub static VILLAGER_PLANTABLE_SEEDS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WheatSeeds, Item::Potato, Item::Carrot, @@ -2061,7 +2046,7 @@ pub static VILLAGER_PLANTABLE_SEEDS: LazyLock> = LazyLock::new(|| ]) }); pub static WALLS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::CobblestoneWall, Item::MossyCobblestoneWall, Item::BrickWall, @@ -2091,7 +2076,7 @@ pub static WALLS: LazyLock> = LazyLock::new(|| { ]) }); pub static WARPED_STEMS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WarpedStem, Item::StrippedWarpedStem, Item::WarpedHyphae, @@ -2099,11 +2084,11 @@ pub static WARPED_STEMS: LazyLock> = LazyLock::new(|| { ]) }); pub static WART_BLOCKS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::NetherWartBlock, Item::WarpedWartBlock])); + LazyLock::new(|| HashSet::from_iter([Item::NetherWartBlock, Item::WarpedWartBlock])); pub static WITHER_SKELETON_DISLIKED_WEAPONS: LazyLock> = - LazyLock::new(|| HashSet::from_iter(vec![Item::Bow, Item::Crossbow])); + LazyLock::new(|| HashSet::from_iter([Item::Bow, Item::Crossbow])); pub static WOLF_FOOD: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::Cod, Item::CookedCod, Item::Salmon, @@ -2125,7 +2110,7 @@ pub static WOLF_FOOD: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_BUTTONS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakButton, Item::SpruceButton, Item::BirchButton, @@ -2141,7 +2126,7 @@ pub static WOODEN_BUTTONS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_DOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakDoor, Item::SpruceDoor, Item::BirchDoor, @@ -2157,7 +2142,7 @@ pub static WOODEN_DOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_FENCES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakFence, Item::AcaciaFence, Item::DarkOakFence, @@ -2173,7 +2158,7 @@ pub static WOODEN_FENCES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakPressurePlate, Item::SprucePressurePlate, Item::BirchPressurePlate, @@ -2189,7 +2174,7 @@ pub static WOODEN_PRESSURE_PLATES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_SHELVES: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AcaciaShelf, Item::BambooShelf, Item::BirchShelf, @@ -2205,7 +2190,7 @@ pub static WOODEN_SHELVES: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_SLABS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakSlab, Item::SpruceSlab, Item::BirchSlab, @@ -2221,7 +2206,7 @@ pub static WOODEN_SLABS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_STAIRS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakStairs, Item::SpruceStairs, Item::BirchStairs, @@ -2237,7 +2222,7 @@ pub static WOODEN_STAIRS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_TOOL_MATERIALS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::OakPlanks, Item::SprucePlanks, Item::BirchPlanks, @@ -2253,7 +2238,7 @@ pub static WOODEN_TOOL_MATERIALS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOODEN_TRAPDOORS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::AcaciaTrapdoor, Item::BirchTrapdoor, Item::DarkOakTrapdoor, @@ -2269,7 +2254,7 @@ pub static WOODEN_TRAPDOORS: LazyLock> = LazyLock::new(|| { ]) }); pub static WOOL: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WhiteWool, Item::OrangeWool, Item::MagentaWool, @@ -2289,7 +2274,7 @@ pub static WOOL: LazyLock> = LazyLock::new(|| { ]) }); pub static WOOL_CARPETS: LazyLock> = LazyLock::new(|| { - HashSet::from_iter(vec![ + HashSet::from_iter([ Item::WhiteCarpet, Item::OrangeCarpet, Item::MagentaCarpet, diff --git a/azalea-world/src/lib.rs b/azalea-world/src/lib.rs index 8514ce24..eea574c1 100644 --- a/azalea-world/src/lib.rs +++ b/azalea-world/src/lib.rs @@ -10,16 +10,7 @@ pub mod iterators; pub mod palette; mod world; -use std::backtrace::Backtrace; - pub use bit_storage::BitStorage; pub use chunk_storage::{Chunk, ChunkStorage, PartialChunkStorage, Section}; pub use container::*; -use thiserror::Error; pub use world::*; - -#[derive(Error, Debug)] -pub enum MoveEntityError { - #[error("Entity doesn't exist")] - EntityDoesNotExist(Backtrace), -} diff --git a/codegen/lib/code/tags.py b/codegen/lib/code/tags.py index 9bacc3d5..d3e561df 100644 --- a/codegen/lib/code/tags.py +++ b/codegen/lib/code/tags.py @@ -18,7 +18,7 @@ use crate::{struct_name}; for tag_name, tag in sorted(registries.items(), key=lambda x: x[0]): tag_name = tag_name.replace("/", "_") static_set_name = to_snake_case(tag_name).upper() - generated += f"pub static {static_set_name}: LazyLock> = LazyLock::new(|| HashSet::from_iter(vec![" + generated += f"pub static {static_set_name}: LazyLock> = LazyLock::new(|| HashSet::from_iter([" queue = tag["values"].copy() while queue != []: -- cgit v1.2.3