aboutsummaryrefslogtreecommitdiff
path: root/azalea-registry/src
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2023-09-21 11:16:29 -0500
committerGitHub <noreply@github.com>2023-09-21 11:16:29 -0500
commit7b3e2e4bf793466a351510c7fbbd08234e93bb0e (patch)
tree7177a919de9982d9e3c7f36a76d2025696f465b6 /azalea-registry/src
parent83cce236145cdab1872a472a70943b669a880965 (diff)
downloadazalea-drasl-7b3e2e4bf793466a351510c7fbbd08234e93bb0e.tar.xz
1.20.2 (#99)
* add configuration state * start updating to 23w31a * implement a bit more of 23w31a * chunk batching * start adding configuration state * ioasfhjgsd * almost works * configuration state mostly implemented * handle other packets in configuration state and fix keepalive * cleanup, fix warnings * 23w32a * fix some doctests * 23w33a * 23w35a * 1.20.2-pre2 * fix system conflicts * 1.20.2-pre4 * make tests compile * tests pass * 1.20.2-rc2 * 1.20.2 * Revert "1.20.2" This reverts commit dd152fd265332ead333c919e585ded6d609d7468. * didn't mean to commit that code --------- Co-authored-by: mat <git@matdoes.dev>
Diffstat (limited to 'azalea-registry/src')
-rwxr-xr-xazalea-registry/src/lib.rs17
-rw-r--r--azalea-registry/src/tags/blocks.rs58
-rw-r--r--azalea-registry/src/tags/items.rs2
3 files changed, 69 insertions, 8 deletions
diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs
index c1edcd3f..c6c67367 100755
--- a/azalea-registry/src/lib.rs
+++ b/azalea-registry/src/lib.rs
@@ -122,6 +122,7 @@ enum Attribute {
GenericArmor => "minecraft:generic.armor",
GenericArmorToughness => "minecraft:generic.armor_toughness",
GenericLuck => "minecraft:generic.luck",
+ GenericMaxAbsorption => "minecraft:generic.max_absorption",
ZombieSpawnReinforcements => "minecraft:zombie.spawn_reinforcements",
HorseJumpStrength => "minecraft:horse.jump_strength",
}
@@ -1642,8 +1643,7 @@ enum GameEvent {
EntityInteract => "minecraft:entity_interact",
EntityMount => "minecraft:entity_mount",
EntityPlace => "minecraft:entity_place",
- EntityRoar => "minecraft:entity_roar",
- EntityShake => "minecraft:entity_shake",
+ EntityAction => "minecraft:entity_action",
Equip => "minecraft:equip",
Explode => "minecraft:explode",
Flap => "minecraft:flap",
@@ -1667,6 +1667,7 @@ enum GameEvent {
Step => "minecraft:step",
Swim => "minecraft:swim",
Teleport => "minecraft:teleport",
+ Unequip => "minecraft:unequip",
Resonate1 => "minecraft:resonate_1",
Resonate2 => "minecraft:resonate_2",
Resonate3 => "minecraft:resonate_3",
@@ -3031,6 +3032,7 @@ enum LootFunctionKind {
SetPotion => "minecraft:set_potion",
SetInstrument => "minecraft:set_instrument",
Reference => "minecraft:reference",
+ Sequence => "minecraft:sequence",
}
}
@@ -4810,6 +4812,12 @@ enum SoundEvent {
EntitySpiderStep => "minecraft:entity.spider.step",
EntitySplashPotionBreak => "minecraft:entity.splash_potion.break",
EntitySplashPotionThrow => "minecraft:entity.splash_potion.throw",
+ BlockSpongeBreak => "minecraft:block.sponge.break",
+ BlockSpongeFall => "minecraft:block.sponge.fall",
+ BlockSpongeHit => "minecraft:block.sponge.hit",
+ BlockSpongePlace => "minecraft:block.sponge.place",
+ BlockSpongeStep => "minecraft:block.sponge.step",
+ BlockSpongeAbsorb => "minecraft:block.sponge.absorb",
ItemSpyglassUse => "minecraft:item.spyglass.use",
ItemSpyglassStopUsing => "minecraft:item.spyglass.stop_using",
EntitySquidAmbient => "minecraft:entity.squid.ambient",
@@ -4954,6 +4962,11 @@ enum SoundEvent {
BlockWetGrassHit => "minecraft:block.wet_grass.hit",
BlockWetGrassPlace => "minecraft:block.wet_grass.place",
BlockWetGrassStep => "minecraft:block.wet_grass.step",
+ BlockWetSpongeBreak => "minecraft:block.wet_sponge.break",
+ BlockWetSpongeFall => "minecraft:block.wet_sponge.fall",
+ BlockWetSpongeHit => "minecraft:block.wet_sponge.hit",
+ BlockWetSpongePlace => "minecraft:block.wet_sponge.place",
+ BlockWetSpongeStep => "minecraft:block.wet_sponge.step",
EntityWitchAmbient => "minecraft:entity.witch.ambient",
EntityWitchCelebrate => "minecraft:entity.witch.celebrate",
EntityWitchDeath => "minecraft:entity.witch.death",
diff --git a/azalea-registry/src/tags/blocks.rs b/azalea-registry/src/tags/blocks.rs
index aae39c07..f21a8012 100644
--- a/azalea-registry/src/tags/blocks.rs
+++ b/azalea-registry/src/tags/blocks.rs
@@ -22,6 +22,12 @@ pub static MINEABLE_SHOVEL: Lazy<HashSet<Block>> = Lazy::new(|| {
Block::Snow,
Block::SoulSand,
Block::DirtPath,
+ Block::SoulSoil,
+ Block::RootedDirt,
+ Block::MuddyMangroveRoots,
+ Block::Mud,
+ Block::SuspiciousSand,
+ Block::SuspiciousGravel,
Block::WhiteConcretePowder,
Block::OrangeConcretePowder,
Block::MagentaConcretePowder,
@@ -38,12 +44,6 @@ pub static MINEABLE_SHOVEL: Lazy<HashSet<Block>> = Lazy::new(|| {
Block::GreenConcretePowder,
Block::RedConcretePowder,
Block::BlackConcretePowder,
- Block::SoulSoil,
- Block::RootedDirt,
- Block::MuddyMangroveRoots,
- Block::Mud,
- Block::SuspiciousSand,
- Block::SuspiciousGravel,
])
});
pub static MINEABLE_AXE: Lazy<HashSet<Block>> = Lazy::new(|| {
@@ -979,6 +979,26 @@ pub static DEAD_BUSH_MAY_PLACE_ON: Lazy<HashSet<Block>> = Lazy::new(|| {
Block::MuddyMangroveRoots,
])
});
+pub static CONCRETE_POWDER: Lazy<HashSet<Block>> = Lazy::new(|| {
+ HashSet::from_iter(vec![
+ Block::WhiteConcretePowder,
+ Block::OrangeConcretePowder,
+ Block::MagentaConcretePowder,
+ Block::LightBlueConcretePowder,
+ Block::YellowConcretePowder,
+ Block::LimeConcretePowder,
+ Block::PinkConcretePowder,
+ Block::GrayConcretePowder,
+ Block::LightGrayConcretePowder,
+ Block::CyanConcretePowder,
+ Block::PurpleConcretePowder,
+ Block::BlueConcretePowder,
+ Block::BrownConcretePowder,
+ Block::GreenConcretePowder,
+ Block::RedConcretePowder,
+ Block::BlackConcretePowder,
+ ])
+});
pub static WOLVES_SPAWNABLE_ON: Lazy<HashSet<Block>> =
Lazy::new(|| HashSet::from_iter(vec![Block::GrassBlock, Block::Snow, Block::SnowBlock]));
pub static LUSH_GROUND_REPLACEABLE: Lazy<HashSet<Block>> = Lazy::new(|| {
@@ -1370,6 +1390,30 @@ pub static LOGS_THAT_BURN: Lazy<HashSet<Block>> = Lazy::new(|| {
Block::StrippedCherryWood,
])
});
+pub static CAMEL_SAND_STEP_SOUND_BLOCKS: Lazy<HashSet<Block>> = Lazy::new(|| {
+ HashSet::from_iter(vec![
+ Block::Sand,
+ Block::RedSand,
+ Block::SuspiciousSand,
+ Block::SuspiciousSand,
+ Block::WhiteConcretePowder,
+ Block::OrangeConcretePowder,
+ Block::MagentaConcretePowder,
+ Block::LightBlueConcretePowder,
+ Block::YellowConcretePowder,
+ Block::LimeConcretePowder,
+ Block::PinkConcretePowder,
+ Block::GrayConcretePowder,
+ Block::LightGrayConcretePowder,
+ Block::CyanConcretePowder,
+ Block::PurpleConcretePowder,
+ Block::BlueConcretePowder,
+ Block::BrownConcretePowder,
+ Block::GreenConcretePowder,
+ Block::RedConcretePowder,
+ Block::BlackConcretePowder,
+ ])
+});
pub static CHERRY_LOGS: Lazy<HashSet<Block>> = Lazy::new(|| {
HashSet::from_iter(vec![
Block::CherryLog,
@@ -1528,6 +1572,8 @@ pub static FLOWERS: Lazy<HashSet<Block>> = Lazy::new(|| {
Block::MangrovePropagule,
Block::CherryLeaves,
Block::PinkPetals,
+ Block::ChorusFlower,
+ Block::SporeBlossom,
Block::Dandelion,
Block::Poppy,
Block::BlueOrchid,
diff --git a/azalea-registry/src/tags/items.rs b/azalea-registry/src/tags/items.rs
index d826703d..6d5d3755 100644
--- a/azalea-registry/src/tags/items.rs
+++ b/azalea-registry/src/tags/items.rs
@@ -376,6 +376,8 @@ pub static FLOWERS: Lazy<HashSet<Item>> = Lazy::new(|| {
Item::MangrovePropagule,
Item::CherryLeaves,
Item::PinkPetals,
+ Item::ChorusFlower,
+ Item::SporeBlossom,
Item::Dandelion,
Item::Poppy,
Item::BlueOrchid,