mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
metadata stuff
This commit is contained in:
parent
9d950e4b70
commit
7101cf85b7
3 changed files with 262 additions and 25 deletions
|
|
@ -110,6 +110,8 @@ registry!(Block, {
|
|||
AcaciaPlanks => "minecraft:acacia_planks",
|
||||
DarkOakPlanks => "minecraft:dark_oak_planks",
|
||||
MangrovePlanks => "minecraft:mangrove_planks",
|
||||
BambooPlanks => "minecraft:bamboo_planks",
|
||||
BambooMosaic => "minecraft:bamboo_mosaic",
|
||||
OakSapling => "minecraft:oak_sapling",
|
||||
SpruceSapling => "minecraft:spruce_sapling",
|
||||
BirchSapling => "minecraft:birch_sapling",
|
||||
|
|
@ -244,6 +246,7 @@ registry!(Block, {
|
|||
Bricks => "minecraft:bricks",
|
||||
Tnt => "minecraft:tnt",
|
||||
Bookshelf => "minecraft:bookshelf",
|
||||
ChiseledBookshelf => "minecraft:chiseled_bookshelf",
|
||||
MossyCobblestone => "minecraft:mossy_cobblestone",
|
||||
Obsidian => "minecraft:obsidian",
|
||||
Torch => "minecraft:torch",
|
||||
|
|
@ -268,6 +271,7 @@ registry!(Block, {
|
|||
JungleSign => "minecraft:jungle_sign",
|
||||
DarkOakSign => "minecraft:dark_oak_sign",
|
||||
MangroveSign => "minecraft:mangrove_sign",
|
||||
BambooSign => "minecraft:bamboo_sign",
|
||||
OakDoor => "minecraft:oak_door",
|
||||
Ladder => "minecraft:ladder",
|
||||
Rail => "minecraft:rail",
|
||||
|
|
@ -279,6 +283,27 @@ registry!(Block, {
|
|||
JungleWallSign => "minecraft:jungle_wall_sign",
|
||||
DarkOakWallSign => "minecraft:dark_oak_wall_sign",
|
||||
MangroveWallSign => "minecraft:mangrove_wall_sign",
|
||||
BambooWallSign => "minecraft:bamboo_wall_sign",
|
||||
OakHangingSign => "minecraft:oak_hanging_sign",
|
||||
SpruceHangingSign => "minecraft:spruce_hanging_sign",
|
||||
BirchHangingSign => "minecraft:birch_hanging_sign",
|
||||
AcaciaHangingSign => "minecraft:acacia_hanging_sign",
|
||||
JungleHangingSign => "minecraft:jungle_hanging_sign",
|
||||
DarkOakHangingSign => "minecraft:dark_oak_hanging_sign",
|
||||
CrimsonHangingSign => "minecraft:crimson_hanging_sign",
|
||||
WarpedHangingSign => "minecraft:warped_hanging_sign",
|
||||
MangroveHangingSign => "minecraft:mangrove_hanging_sign",
|
||||
BambooHangingSign => "minecraft:bamboo_hanging_sign",
|
||||
OakWallHangingSign => "minecraft:oak_wall_hanging_sign",
|
||||
SpruceWallHangingSign => "minecraft:spruce_wall_hanging_sign",
|
||||
BirchWallHangingSign => "minecraft:birch_wall_hanging_sign",
|
||||
AcaciaWallHangingSign => "minecraft:acacia_wall_hanging_sign",
|
||||
JungleWallHangingSign => "minecraft:jungle_wall_hanging_sign",
|
||||
DarkOakWallHangingSign => "minecraft:dark_oak_wall_hanging_sign",
|
||||
MangroveWallHangingSign => "minecraft:mangrove_wall_hanging_sign",
|
||||
CrimsonWallHangingSign => "minecraft:crimson_wall_hanging_sign",
|
||||
WarpedWallHangingSign => "minecraft:warped_wall_hanging_sign",
|
||||
BambooWallHangingSign => "minecraft:bamboo_wall_hanging_sign",
|
||||
Lever => "minecraft:lever",
|
||||
StonePressurePlate => "minecraft:stone_pressure_plate",
|
||||
IronDoor => "minecraft:iron_door",
|
||||
|
|
@ -289,6 +314,7 @@ registry!(Block, {
|
|||
AcaciaPressurePlate => "minecraft:acacia_pressure_plate",
|
||||
DarkOakPressurePlate => "minecraft:dark_oak_pressure_plate",
|
||||
MangrovePressurePlate => "minecraft:mangrove_pressure_plate",
|
||||
BambooPressurePlate => "minecraft:bamboo_pressure_plate",
|
||||
RedstoneOre => "minecraft:redstone_ore",
|
||||
DeepslateRedstoneOre => "minecraft:deepslate_redstone_ore",
|
||||
RedstoneTorch => "minecraft:redstone_torch",
|
||||
|
|
@ -339,6 +365,7 @@ registry!(Block, {
|
|||
AcaciaTrapdoor => "minecraft:acacia_trapdoor",
|
||||
DarkOakTrapdoor => "minecraft:dark_oak_trapdoor",
|
||||
MangroveTrapdoor => "minecraft:mangrove_trapdoor",
|
||||
BambooTrapdoor => "minecraft:bamboo_trapdoor",
|
||||
StoneBricks => "minecraft:stone_bricks",
|
||||
MossyStoneBricks => "minecraft:mossy_stone_bricks",
|
||||
CrackedStoneBricks => "minecraft:cracked_stone_bricks",
|
||||
|
|
@ -435,6 +462,7 @@ registry!(Block, {
|
|||
AcaciaButton => "minecraft:acacia_button",
|
||||
DarkOakButton => "minecraft:dark_oak_button",
|
||||
MangroveButton => "minecraft:mangrove_button",
|
||||
BambooButton => "minecraft:bamboo_button",
|
||||
SkeletonSkull => "minecraft:skeleton_skull",
|
||||
SkeletonWallSkull => "minecraft:skeleton_wall_skull",
|
||||
WitherSkeletonSkull => "minecraft:wither_skeleton_skull",
|
||||
|
|
@ -499,6 +527,8 @@ registry!(Block, {
|
|||
AcaciaStairs => "minecraft:acacia_stairs",
|
||||
DarkOakStairs => "minecraft:dark_oak_stairs",
|
||||
MangroveStairs => "minecraft:mangrove_stairs",
|
||||
BambooStairs => "minecraft:bamboo_stairs",
|
||||
BambooMosaicStairs => "minecraft:bamboo_mosaic_stairs",
|
||||
SlimeBlock => "minecraft:slime_block",
|
||||
Barrier => "minecraft:barrier",
|
||||
Light => "minecraft:light",
|
||||
|
|
@ -582,6 +612,8 @@ registry!(Block, {
|
|||
AcaciaSlab => "minecraft:acacia_slab",
|
||||
DarkOakSlab => "minecraft:dark_oak_slab",
|
||||
MangroveSlab => "minecraft:mangrove_slab",
|
||||
BambooSlab => "minecraft:bamboo_slab",
|
||||
BambooMosaicSlab => "minecraft:bamboo_mosaic_slab",
|
||||
StoneSlab => "minecraft:stone_slab",
|
||||
SmoothStoneSlab => "minecraft:smooth_stone_slab",
|
||||
SandstoneSlab => "minecraft:sandstone_slab",
|
||||
|
|
@ -606,18 +638,21 @@ registry!(Block, {
|
|||
AcaciaFenceGate => "minecraft:acacia_fence_gate",
|
||||
DarkOakFenceGate => "minecraft:dark_oak_fence_gate",
|
||||
MangroveFenceGate => "minecraft:mangrove_fence_gate",
|
||||
BambooFenceGate => "minecraft:bamboo_fence_gate",
|
||||
SpruceFence => "minecraft:spruce_fence",
|
||||
BirchFence => "minecraft:birch_fence",
|
||||
JungleFence => "minecraft:jungle_fence",
|
||||
AcaciaFence => "minecraft:acacia_fence",
|
||||
DarkOakFence => "minecraft:dark_oak_fence",
|
||||
MangroveFence => "minecraft:mangrove_fence",
|
||||
BambooFence => "minecraft:bamboo_fence",
|
||||
SpruceDoor => "minecraft:spruce_door",
|
||||
BirchDoor => "minecraft:birch_door",
|
||||
JungleDoor => "minecraft:jungle_door",
|
||||
AcaciaDoor => "minecraft:acacia_door",
|
||||
DarkOakDoor => "minecraft:dark_oak_door",
|
||||
MangroveDoor => "minecraft:mangrove_door",
|
||||
BambooDoor => "minecraft:bamboo_door",
|
||||
EndRod => "minecraft:end_rod",
|
||||
ChorusPlant => "minecraft:chorus_plant",
|
||||
ChorusFlower => "minecraft:chorus_flower",
|
||||
|
|
@ -1034,6 +1069,7 @@ registry!(BlockEntityType, {
|
|||
Dispenser => "minecraft:dispenser",
|
||||
Dropper => "minecraft:dropper",
|
||||
Sign => "minecraft:sign",
|
||||
HangingSign => "minecraft:hanging_sign",
|
||||
MobSpawner => "minecraft:mob_spawner",
|
||||
Piston => "minecraft:piston",
|
||||
BrewingStand => "minecraft:brewing_stand",
|
||||
|
|
@ -1062,6 +1098,7 @@ registry!(BlockEntityType, {
|
|||
SculkSensor => "minecraft:sculk_sensor",
|
||||
SculkCatalyst => "minecraft:sculk_catalyst",
|
||||
SculkShrieker => "minecraft:sculk_shrieker",
|
||||
ChiseledBookshelf => "minecraft:chiseled_bookshelf",
|
||||
});
|
||||
|
||||
registry!(BlockPredicateType, {
|
||||
|
|
@ -1144,17 +1181,16 @@ registry!(CommandArgumentType, {
|
|||
Team => "minecraft:team",
|
||||
ItemSlot => "minecraft:item_slot",
|
||||
ResourceLocation => "minecraft:resource_location",
|
||||
MobEffect => "minecraft:mob_effect",
|
||||
Function => "minecraft:function",
|
||||
EntityAnchor => "minecraft:entity_anchor",
|
||||
IntRange => "minecraft:int_range",
|
||||
FloatRange => "minecraft:float_range",
|
||||
ItemEnchantment => "minecraft:item_enchantment",
|
||||
EntitySummon => "minecraft:entity_summon",
|
||||
Dimension => "minecraft:dimension",
|
||||
Time => "minecraft:time",
|
||||
ResourceOrTag => "minecraft:resource_or_tag",
|
||||
ResourceOrTagKey => "minecraft:resource_or_tag_key",
|
||||
Resource => "minecraft:resource",
|
||||
ResourceKey => "minecraft:resource_key",
|
||||
TemplateMirror => "minecraft:template_mirror",
|
||||
TemplateRotation => "minecraft:template_rotation",
|
||||
Uuid => "minecraft:uuid",
|
||||
|
|
@ -1292,6 +1328,7 @@ registry!(EntityType, {
|
|||
Boat => "minecraft:boat",
|
||||
ChestBoat => "minecraft:chest_boat",
|
||||
Cat => "minecraft:cat",
|
||||
Camel => "minecraft:camel",
|
||||
CaveSpider => "minecraft:cave_spider",
|
||||
Chicken => "minecraft:chicken",
|
||||
Cod => "minecraft:cod",
|
||||
|
|
@ -1531,8 +1568,10 @@ registry!(Item, {
|
|||
AcaciaPlanks => "minecraft:acacia_planks",
|
||||
DarkOakPlanks => "minecraft:dark_oak_planks",
|
||||
MangrovePlanks => "minecraft:mangrove_planks",
|
||||
BambooPlanks => "minecraft:bamboo_planks",
|
||||
CrimsonPlanks => "minecraft:crimson_planks",
|
||||
WarpedPlanks => "minecraft:warped_planks",
|
||||
BambooMosaic => "minecraft:bamboo_mosaic",
|
||||
OakSapling => "minecraft:oak_sapling",
|
||||
SpruceSapling => "minecraft:spruce_sapling",
|
||||
BirchSapling => "minecraft:birch_sapling",
|
||||
|
|
@ -1722,6 +1761,8 @@ registry!(Item, {
|
|||
AcaciaSlab => "minecraft:acacia_slab",
|
||||
DarkOakSlab => "minecraft:dark_oak_slab",
|
||||
MangroveSlab => "minecraft:mangrove_slab",
|
||||
BambooSlab => "minecraft:bamboo_slab",
|
||||
BambooMosaicSlab => "minecraft:bamboo_mosaic_slab",
|
||||
CrimsonSlab => "minecraft:crimson_slab",
|
||||
WarpedSlab => "minecraft:warped_slab",
|
||||
StoneSlab => "minecraft:stone_slab",
|
||||
|
|
@ -1747,6 +1788,7 @@ registry!(Item, {
|
|||
SmoothStone => "minecraft:smooth_stone",
|
||||
Bricks => "minecraft:bricks",
|
||||
Bookshelf => "minecraft:bookshelf",
|
||||
ChiseledBookshelf => "minecraft:chiseled_bookshelf",
|
||||
MossyCobblestone => "minecraft:mossy_cobblestone",
|
||||
Obsidian => "minecraft:obsidian",
|
||||
Torch => "minecraft:torch",
|
||||
|
|
@ -1776,6 +1818,7 @@ registry!(Item, {
|
|||
AcaciaFence => "minecraft:acacia_fence",
|
||||
DarkOakFence => "minecraft:dark_oak_fence",
|
||||
MangroveFence => "minecraft:mangrove_fence",
|
||||
BambooFence => "minecraft:bamboo_fence",
|
||||
CrimsonFence => "minecraft:crimson_fence",
|
||||
WarpedFence => "minecraft:warped_fence",
|
||||
Pumpkin => "minecraft:pumpkin",
|
||||
|
|
@ -1846,6 +1889,8 @@ registry!(Item, {
|
|||
AcaciaStairs => "minecraft:acacia_stairs",
|
||||
DarkOakStairs => "minecraft:dark_oak_stairs",
|
||||
MangroveStairs => "minecraft:mangrove_stairs",
|
||||
BambooStairs => "minecraft:bamboo_stairs",
|
||||
BambooMosaicStairs => "minecraft:bamboo_mosaic_stairs",
|
||||
CrimsonStairs => "minecraft:crimson_stairs",
|
||||
WarpedStairs => "minecraft:warped_stairs",
|
||||
CommandBlock => "minecraft:command_block",
|
||||
|
|
@ -2142,6 +2187,7 @@ registry!(Item, {
|
|||
AcaciaButton => "minecraft:acacia_button",
|
||||
DarkOakButton => "minecraft:dark_oak_button",
|
||||
MangroveButton => "minecraft:mangrove_button",
|
||||
BambooButton => "minecraft:bamboo_button",
|
||||
CrimsonButton => "minecraft:crimson_button",
|
||||
WarpedButton => "minecraft:warped_button",
|
||||
StonePressurePlate => "minecraft:stone_pressure_plate",
|
||||
|
|
@ -2155,6 +2201,7 @@ registry!(Item, {
|
|||
AcaciaPressurePlate => "minecraft:acacia_pressure_plate",
|
||||
DarkOakPressurePlate => "minecraft:dark_oak_pressure_plate",
|
||||
MangrovePressurePlate => "minecraft:mangrove_pressure_plate",
|
||||
BambooPressurePlate => "minecraft:bamboo_pressure_plate",
|
||||
CrimsonPressurePlate => "minecraft:crimson_pressure_plate",
|
||||
WarpedPressurePlate => "minecraft:warped_pressure_plate",
|
||||
IronDoor => "minecraft:iron_door",
|
||||
|
|
@ -2165,6 +2212,7 @@ registry!(Item, {
|
|||
AcaciaDoor => "minecraft:acacia_door",
|
||||
DarkOakDoor => "minecraft:dark_oak_door",
|
||||
MangroveDoor => "minecraft:mangrove_door",
|
||||
BambooDoor => "minecraft:bamboo_door",
|
||||
CrimsonDoor => "minecraft:crimson_door",
|
||||
WarpedDoor => "minecraft:warped_door",
|
||||
IronTrapdoor => "minecraft:iron_trapdoor",
|
||||
|
|
@ -2175,6 +2223,7 @@ registry!(Item, {
|
|||
AcaciaTrapdoor => "minecraft:acacia_trapdoor",
|
||||
DarkOakTrapdoor => "minecraft:dark_oak_trapdoor",
|
||||
MangroveTrapdoor => "minecraft:mangrove_trapdoor",
|
||||
BambooTrapdoor => "minecraft:bamboo_trapdoor",
|
||||
CrimsonTrapdoor => "minecraft:crimson_trapdoor",
|
||||
WarpedTrapdoor => "minecraft:warped_trapdoor",
|
||||
OakFenceGate => "minecraft:oak_fence_gate",
|
||||
|
|
@ -2184,6 +2233,7 @@ registry!(Item, {
|
|||
AcaciaFenceGate => "minecraft:acacia_fence_gate",
|
||||
DarkOakFenceGate => "minecraft:dark_oak_fence_gate",
|
||||
MangroveFenceGate => "minecraft:mangrove_fence_gate",
|
||||
BambooFenceGate => "minecraft:bamboo_fence_gate",
|
||||
CrimsonFenceGate => "minecraft:crimson_fence_gate",
|
||||
WarpedFenceGate => "minecraft:warped_fence_gate",
|
||||
PoweredRail => "minecraft:powered_rail",
|
||||
|
|
@ -2213,6 +2263,8 @@ registry!(Item, {
|
|||
DarkOakChestBoat => "minecraft:dark_oak_chest_boat",
|
||||
MangroveBoat => "minecraft:mangrove_boat",
|
||||
MangroveChestBoat => "minecraft:mangrove_chest_boat",
|
||||
BambooRaft => "minecraft:bamboo_raft",
|
||||
BambooChestRaft => "minecraft:bamboo_chest_raft",
|
||||
StructureBlock => "minecraft:structure_block",
|
||||
Jigsaw => "minecraft:jigsaw",
|
||||
TurtleHelmet => "minecraft:turtle_helmet",
|
||||
|
|
@ -2312,8 +2364,19 @@ registry!(Item, {
|
|||
AcaciaSign => "minecraft:acacia_sign",
|
||||
DarkOakSign => "minecraft:dark_oak_sign",
|
||||
MangroveSign => "minecraft:mangrove_sign",
|
||||
BambooSign => "minecraft:bamboo_sign",
|
||||
CrimsonSign => "minecraft:crimson_sign",
|
||||
WarpedSign => "minecraft:warped_sign",
|
||||
OakHangingSign => "minecraft:oak_hanging_sign",
|
||||
SpruceHangingSign => "minecraft:spruce_hanging_sign",
|
||||
BirchHangingSign => "minecraft:birch_hanging_sign",
|
||||
JungleHangingSign => "minecraft:jungle_hanging_sign",
|
||||
AcaciaHangingSign => "minecraft:acacia_hanging_sign",
|
||||
DarkOakHangingSign => "minecraft:dark_oak_hanging_sign",
|
||||
MangroveHangingSign => "minecraft:mangrove_hanging_sign",
|
||||
BambooHangingSign => "minecraft:bamboo_hanging_sign",
|
||||
CrimsonHangingSign => "minecraft:crimson_hanging_sign",
|
||||
WarpedHangingSign => "minecraft:warped_hanging_sign",
|
||||
Bucket => "minecraft:bucket",
|
||||
WaterBucket => "minecraft:water_bucket",
|
||||
LavaBucket => "minecraft:lava_bucket",
|
||||
|
|
@ -2419,6 +2482,7 @@ registry!(Item, {
|
|||
BeeSpawnEgg => "minecraft:bee_spawn_egg",
|
||||
BlazeSpawnEgg => "minecraft:blaze_spawn_egg",
|
||||
CatSpawnEgg => "minecraft:cat_spawn_egg",
|
||||
CamelSpawnEgg => "minecraft:camel_spawn_egg",
|
||||
CaveSpiderSpawnEgg => "minecraft:cave_spider_spawn_egg",
|
||||
ChickenSpawnEgg => "minecraft:chicken_spawn_egg",
|
||||
CodSpawnEgg => "minecraft:cod_spawn_egg",
|
||||
|
|
@ -2428,6 +2492,7 @@ registry!(Item, {
|
|||
DonkeySpawnEgg => "minecraft:donkey_spawn_egg",
|
||||
DrownedSpawnEgg => "minecraft:drowned_spawn_egg",
|
||||
ElderGuardianSpawnEgg => "minecraft:elder_guardian_spawn_egg",
|
||||
EnderDragonSpawnEgg => "minecraft:ender_dragon_spawn_egg",
|
||||
EndermanSpawnEgg => "minecraft:enderman_spawn_egg",
|
||||
EndermiteSpawnEgg => "minecraft:endermite_spawn_egg",
|
||||
EvokerSpawnEgg => "minecraft:evoker_spawn_egg",
|
||||
|
|
@ -2440,6 +2505,7 @@ registry!(Item, {
|
|||
HoglinSpawnEgg => "minecraft:hoglin_spawn_egg",
|
||||
HorseSpawnEgg => "minecraft:horse_spawn_egg",
|
||||
HuskSpawnEgg => "minecraft:husk_spawn_egg",
|
||||
IronGolemSpawnEgg => "minecraft:iron_golem_spawn_egg",
|
||||
LlamaSpawnEgg => "minecraft:llama_spawn_egg",
|
||||
MagmaCubeSpawnEgg => "minecraft:magma_cube_spawn_egg",
|
||||
MooshroomSpawnEgg => "minecraft:mooshroom_spawn_egg",
|
||||
|
|
@ -2463,6 +2529,7 @@ registry!(Item, {
|
|||
SkeletonSpawnEgg => "minecraft:skeleton_spawn_egg",
|
||||
SkeletonHorseSpawnEgg => "minecraft:skeleton_horse_spawn_egg",
|
||||
SlimeSpawnEgg => "minecraft:slime_spawn_egg",
|
||||
SnowGolemSpawnEgg => "minecraft:snow_golem_spawn_egg",
|
||||
SpiderSpawnEgg => "minecraft:spider_spawn_egg",
|
||||
SquidSpawnEgg => "minecraft:squid_spawn_egg",
|
||||
StraySpawnEgg => "minecraft:stray_spawn_egg",
|
||||
|
|
@ -2477,6 +2544,7 @@ registry!(Item, {
|
|||
WanderingTraderSpawnEgg => "minecraft:wandering_trader_spawn_egg",
|
||||
WardenSpawnEgg => "minecraft:warden_spawn_egg",
|
||||
WitchSpawnEgg => "minecraft:witch_spawn_egg",
|
||||
WitherSpawnEgg => "minecraft:wither_spawn_egg",
|
||||
WitherSkeletonSpawnEgg => "minecraft:wither_skeleton_spawn_egg",
|
||||
WolfSpawnEgg => "minecraft:wolf_spawn_egg",
|
||||
ZoglinSpawnEgg => "minecraft:zoglin_spawn_egg",
|
||||
|
|
@ -2773,6 +2841,7 @@ registry!(MemoryModuleType, {
|
|||
PlayDeadTicks => "minecraft:play_dead_ticks",
|
||||
TemptingPlayer => "minecraft:tempting_player",
|
||||
TemptationCooldownTicks => "minecraft:temptation_cooldown_ticks",
|
||||
GazeCooldownTicks => "minecraft:gaze_cooldown_ticks",
|
||||
IsTempted => "minecraft:is_tempted",
|
||||
LongJumpCoolingDown => "minecraft:long_jump_cooling_down",
|
||||
LongJumpMidJump => "minecraft:long_jump_mid_jump",
|
||||
|
|
@ -3167,6 +3236,7 @@ registry!(SensorType, {
|
|||
AxolotlTemptations => "minecraft:axolotl_temptations",
|
||||
GoatTemptations => "minecraft:goat_temptations",
|
||||
FrogTemptations => "minecraft:frog_temptations",
|
||||
CamelTemptations => "minecraft:camel_temptations",
|
||||
FrogAttackables => "minecraft:frog_attackables",
|
||||
IsInWater => "minecraft:is_in_water",
|
||||
WardenEntitySensor => "minecraft:warden_entity_sensor",
|
||||
|
|
@ -3270,6 +3340,21 @@ registry!(SoundEvent, {
|
|||
BlockBambooSaplingBreak => "minecraft:block.bamboo_sapling.break",
|
||||
BlockBambooSaplingHit => "minecraft:block.bamboo_sapling.hit",
|
||||
BlockBambooSaplingPlace => "minecraft:block.bamboo_sapling.place",
|
||||
BlockBambooWoodBreak => "minecraft:block.bamboo_wood.break",
|
||||
BlockBambooWoodFall => "minecraft:block.bamboo_wood.fall",
|
||||
BlockBambooWoodHit => "minecraft:block.bamboo_wood.hit",
|
||||
BlockBambooWoodPlace => "minecraft:block.bamboo_wood.place",
|
||||
BlockBambooWoodStep => "minecraft:block.bamboo_wood.step",
|
||||
BlockBambooWoodDoorClose => "minecraft:block.bamboo_wood_door.close",
|
||||
BlockBambooWoodDoorOpen => "minecraft:block.bamboo_wood_door.open",
|
||||
BlockBambooWoodTrapdoorClose => "minecraft:block.bamboo_wood_trapdoor.close",
|
||||
BlockBambooWoodTrapdoorOpen => "minecraft:block.bamboo_wood_trapdoor.open",
|
||||
BlockBambooWoodButtonClickOff => "minecraft:block.bamboo_wood_button.click_off",
|
||||
BlockBambooWoodButtonClickOn => "minecraft:block.bamboo_wood_button.click_on",
|
||||
BlockBambooWoodPressurePlateClickOff => "minecraft:block.bamboo_wood_pressure_plate.click_off",
|
||||
BlockBambooWoodPressurePlateClickOn => "minecraft:block.bamboo_wood_pressure_plate.click_on",
|
||||
BlockBambooWoodFenceGateClose => "minecraft:block.bamboo_wood_fence_gate.close",
|
||||
BlockBambooWoodFenceGateOpen => "minecraft:block.bamboo_wood_fence_gate.open",
|
||||
BlockBarrelClose => "minecraft:block.barrel.close",
|
||||
BlockBarrelOpen => "minecraft:block.barrel.open",
|
||||
BlockBasaltBreak => "minecraft:block.basalt.break",
|
||||
|
|
@ -3350,6 +3435,17 @@ registry!(SoundEvent, {
|
|||
BlockCalcitePlace => "minecraft:block.calcite.place",
|
||||
BlockCalciteHit => "minecraft:block.calcite.hit",
|
||||
BlockCalciteFall => "minecraft:block.calcite.fall",
|
||||
EntityCamelAmbient => "minecraft:entity.camel.ambient",
|
||||
EntityCamelDash => "minecraft:entity.camel.dash",
|
||||
EntityCamelDashReady => "minecraft:entity.camel.dash_ready",
|
||||
EntityCamelDeath => "minecraft:entity.camel.death",
|
||||
EntityCamelEat => "minecraft:entity.camel.eat",
|
||||
EntityCamelHurt => "minecraft:entity.camel.hurt",
|
||||
EntityCamelSaddle => "minecraft:entity.camel.saddle",
|
||||
EntityCamelSit => "minecraft:entity.camel.sit",
|
||||
EntityCamelStand => "minecraft:entity.camel.stand",
|
||||
EntityCamelStep => "minecraft:entity.camel.step",
|
||||
EntityCamelStepSand => "minecraft:entity.camel.step_sand",
|
||||
BlockCampfireCrackle => "minecraft:block.campfire.crackle",
|
||||
BlockCandleAmbient => "minecraft:block.candle.ambient",
|
||||
BlockCandleBreak => "minecraft:block.candle.break",
|
||||
|
|
@ -3680,6 +3776,11 @@ registry!(SoundEvent, {
|
|||
BlockHangingRootsHit => "minecraft:block.hanging_roots.hit",
|
||||
BlockHangingRootsPlace => "minecraft:block.hanging_roots.place",
|
||||
BlockHangingRootsStep => "minecraft:block.hanging_roots.step",
|
||||
BlockHangingSignStep => "minecraft:block.hanging_sign.step",
|
||||
BlockHangingSignBreak => "minecraft:block.hanging_sign.break",
|
||||
BlockHangingSignFall => "minecraft:block.hanging_sign.fall",
|
||||
BlockHangingSignHit => "minecraft:block.hanging_sign.hit",
|
||||
BlockHangingSignPlace => "minecraft:block.hanging_sign.place",
|
||||
ItemHoeTill => "minecraft:item.hoe.till",
|
||||
EntityHoglinAmbient => "minecraft:entity.hoglin.ambient",
|
||||
EntityHoglinAngry => "minecraft:entity.hoglin.angry",
|
||||
|
|
@ -3896,6 +3997,21 @@ registry!(SoundEvent, {
|
|||
BlockNetherBricksFall => "minecraft:block.nether_bricks.fall",
|
||||
BlockNetherWartBreak => "minecraft:block.nether_wart.break",
|
||||
ItemNetherWartPlant => "minecraft:item.nether_wart.plant",
|
||||
BlockNetherWoodBreak => "minecraft:block.nether_wood.break",
|
||||
BlockNetherWoodFall => "minecraft:block.nether_wood.fall",
|
||||
BlockNetherWoodHit => "minecraft:block.nether_wood.hit",
|
||||
BlockNetherWoodPlace => "minecraft:block.nether_wood.place",
|
||||
BlockNetherWoodStep => "minecraft:block.nether_wood.step",
|
||||
BlockNetherWoodDoorClose => "minecraft:block.nether_wood_door.close",
|
||||
BlockNetherWoodDoorOpen => "minecraft:block.nether_wood_door.open",
|
||||
BlockNetherWoodTrapdoorClose => "minecraft:block.nether_wood_trapdoor.close",
|
||||
BlockNetherWoodTrapdoorOpen => "minecraft:block.nether_wood_trapdoor.open",
|
||||
BlockNetherWoodButtonClickOff => "minecraft:block.nether_wood_button.click_off",
|
||||
BlockNetherWoodButtonClickOn => "minecraft:block.nether_wood_button.click_on",
|
||||
BlockNetherWoodPressurePlateClickOff => "minecraft:block.nether_wood_pressure_plate.click_off",
|
||||
BlockNetherWoodPressurePlateClickOn => "minecraft:block.nether_wood_pressure_plate.click_on",
|
||||
BlockNetherWoodFenceGateClose => "minecraft:block.nether_wood_fence_gate.close",
|
||||
BlockNetherWoodFenceGateOpen => "minecraft:block.nether_wood_fence_gate.open",
|
||||
BlockPackedMudBreak => "minecraft:block.packed_mud.break",
|
||||
BlockPackedMudFall => "minecraft:block.packed_mud.fall",
|
||||
BlockPackedMudHit => "minecraft:block.packed_mud.hit",
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// Don't change it manually!
|
||||
|
||||
#![allow(clippy::clone_on_copy, clippy::derivable_impls)]
|
||||
use super::{EntityDataValue, Pose, Rotations, VillagerData};
|
||||
use super::{EntityDataValue, OptionalUnsignedInt, Pose, Rotations, VillagerData};
|
||||
use azalea_block::BlockState;
|
||||
use azalea_chat::Component;
|
||||
use azalea_core::{BlockPos, Direction, Particle, Slot};
|
||||
|
|
@ -105,7 +105,7 @@ impl Default for AreaEffectCloud {
|
|||
fn default() -> Self {
|
||||
Self {
|
||||
abstract_entity: Default::default(),
|
||||
radius: 0.5,
|
||||
radius: 3.0,
|
||||
color: 0,
|
||||
waiting: false,
|
||||
particle: Default::default(),
|
||||
|
|
@ -681,6 +681,114 @@ impl Deref for Boat {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Camel {
|
||||
pub abstract_animal: AbstractAnimal,
|
||||
pub tamed: bool,
|
||||
pub eating: bool,
|
||||
pub standing: bool,
|
||||
pub bred: bool,
|
||||
pub saddled: bool,
|
||||
pub owner_uuid: Option<Uuid>,
|
||||
pub dash: bool,
|
||||
pub last_pose_change_tick: i64,
|
||||
}
|
||||
|
||||
impl Camel {
|
||||
pub fn read(metadata: &mut VecDeque<EntityDataValue>) -> Option<Self> {
|
||||
let abstract_animal = AbstractAnimal::read(metadata)?;
|
||||
let bitfield = metadata.pop_front()?.into_byte().ok()?;
|
||||
let tamed = bitfield & 0x2 != 0;
|
||||
let eating = bitfield & 0x10 != 0;
|
||||
let standing = bitfield & 0x20 != 0;
|
||||
let bred = bitfield & 0x8 != 0;
|
||||
let saddled = bitfield & 0x4 != 0;
|
||||
let owner_uuid = metadata.pop_front()?.into_optional_uuid().ok()?;
|
||||
let dash = metadata.pop_front()?.into_boolean().ok()?;
|
||||
let last_pose_change_tick = metadata.pop_front()?.into_long().ok()?;
|
||||
Some(Self {
|
||||
abstract_animal,
|
||||
tamed,
|
||||
eating,
|
||||
standing,
|
||||
bred,
|
||||
saddled,
|
||||
owner_uuid,
|
||||
dash,
|
||||
last_pose_change_tick,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn write(&self) -> Vec<EntityDataValue> {
|
||||
let mut metadata = Vec::new();
|
||||
metadata.extend(self.abstract_animal.write());
|
||||
let mut bitfield = 0u8;
|
||||
if self.tamed {
|
||||
bitfield &= 0x2;
|
||||
}
|
||||
if self.eating {
|
||||
bitfield &= 0x10;
|
||||
}
|
||||
if self.standing {
|
||||
bitfield &= 0x20;
|
||||
}
|
||||
if self.bred {
|
||||
bitfield &= 0x8;
|
||||
}
|
||||
if self.saddled {
|
||||
bitfield &= 0x4;
|
||||
}
|
||||
metadata.push(EntityDataValue::Byte(bitfield));
|
||||
metadata.push(EntityDataValue::OptionalUuid(self.owner_uuid.clone()));
|
||||
metadata.push(EntityDataValue::Boolean(self.dash.clone()));
|
||||
metadata.push(EntityDataValue::Long(self.last_pose_change_tick.clone()));
|
||||
metadata
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Camel {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
abstract_animal: Default::default(),
|
||||
tamed: false,
|
||||
eating: false,
|
||||
standing: false,
|
||||
bred: false,
|
||||
saddled: false,
|
||||
owner_uuid: None,
|
||||
dash: false,
|
||||
last_pose_change_tick: -52,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Camel {
|
||||
pub fn set_index(&mut self, index: u8, value: EntityDataValue) -> Option<()> {
|
||||
match index {
|
||||
0..=16 => self.abstract_animal.set_index(index, value)?,
|
||||
17 => {
|
||||
let bitfield = value.into_byte().ok()?;
|
||||
self.tamed = bitfield & 0x2 != 0;
|
||||
self.eating = bitfield & 0x10 != 0;
|
||||
self.standing = bitfield & 0x20 != 0;
|
||||
self.bred = bitfield & 0x8 != 0;
|
||||
self.saddled = bitfield & 0x4 != 0;
|
||||
}
|
||||
18 => self.owner_uuid = value.into_optional_uuid().ok()?,
|
||||
19 => self.dash = value.into_boolean().ok()?,
|
||||
20 => self.last_pose_change_tick = value.into_long().ok()?,
|
||||
_ => {}
|
||||
}
|
||||
Some(())
|
||||
}
|
||||
}
|
||||
impl Deref for Camel {
|
||||
type Target = AbstractAnimal;
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.abstract_animal
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Cat {
|
||||
pub abstract_tameable: AbstractTameable,
|
||||
|
|
@ -1594,7 +1702,7 @@ impl Deref for EnderPearl {
|
|||
#[derive(Debug, Clone)]
|
||||
pub struct Enderman {
|
||||
pub abstract_monster: AbstractMonster,
|
||||
pub carry_state: Option<BlockState>,
|
||||
pub carry_state: BlockState,
|
||||
pub creepy: bool,
|
||||
pub stared_at: bool,
|
||||
}
|
||||
|
|
@ -1602,7 +1710,7 @@ pub struct Enderman {
|
|||
impl Enderman {
|
||||
pub fn read(metadata: &mut VecDeque<EntityDataValue>) -> Option<Self> {
|
||||
let abstract_monster = AbstractMonster::read(metadata)?;
|
||||
let carry_state = metadata.pop_front()?.into_optional_block_state().ok()?;
|
||||
let carry_state = metadata.pop_front()?.into_block_state().ok()?;
|
||||
let creepy = metadata.pop_front()?.into_boolean().ok()?;
|
||||
let stared_at = metadata.pop_front()?.into_boolean().ok()?;
|
||||
Some(Self {
|
||||
|
|
@ -1616,9 +1724,7 @@ impl Enderman {
|
|||
pub fn write(&self) -> Vec<EntityDataValue> {
|
||||
let mut metadata = Vec::new();
|
||||
metadata.extend(self.abstract_monster.write());
|
||||
metadata.push(EntityDataValue::OptionalBlockState(
|
||||
self.carry_state.clone(),
|
||||
));
|
||||
metadata.push(EntityDataValue::BlockState(self.carry_state.clone()));
|
||||
metadata.push(EntityDataValue::Boolean(self.creepy.clone()));
|
||||
metadata.push(EntityDataValue::Boolean(self.stared_at.clone()));
|
||||
metadata
|
||||
|
|
@ -1629,7 +1735,7 @@ impl Default for Enderman {
|
|||
fn default() -> Self {
|
||||
Self {
|
||||
abstract_monster: Default::default(),
|
||||
carry_state: None,
|
||||
carry_state: BlockState::Air,
|
||||
creepy: false,
|
||||
stared_at: false,
|
||||
}
|
||||
|
|
@ -1640,7 +1746,7 @@ impl Enderman {
|
|||
pub fn set_index(&mut self, index: u8, value: EntityDataValue) -> Option<()> {
|
||||
match index {
|
||||
0..=15 => self.abstract_monster.set_index(index, value)?,
|
||||
16 => self.carry_state = value.into_optional_block_state().ok()?,
|
||||
16 => self.carry_state = value.into_block_state().ok()?,
|
||||
17 => self.creepy = value.into_boolean().ok()?,
|
||||
18 => self.stared_at = value.into_boolean().ok()?,
|
||||
_ => {}
|
||||
|
|
@ -2029,7 +2135,7 @@ impl Deref for Fireball {
|
|||
pub struct FireworkRocket {
|
||||
pub abstract_entity: AbstractEntity,
|
||||
pub fireworks_item: Slot,
|
||||
pub attached_to_target: Option<u32>,
|
||||
pub attached_to_target: OptionalUnsignedInt,
|
||||
pub shot_at_angle: bool,
|
||||
}
|
||||
|
||||
|
|
@ -2064,7 +2170,7 @@ impl Default for FireworkRocket {
|
|||
Self {
|
||||
abstract_entity: Default::default(),
|
||||
fireworks_item: Slot::Empty,
|
||||
attached_to_target: None,
|
||||
attached_to_target: OptionalUnsignedInt(None),
|
||||
shot_at_angle: false,
|
||||
}
|
||||
}
|
||||
|
|
@ -2265,7 +2371,7 @@ impl Deref for Fox {
|
|||
pub struct Frog {
|
||||
pub abstract_animal: AbstractAnimal,
|
||||
pub variant: azalea_registry::FrogVariant,
|
||||
pub tongue_target: Option<u32>,
|
||||
pub tongue_target: OptionalUnsignedInt,
|
||||
}
|
||||
|
||||
impl Frog {
|
||||
|
|
@ -2296,7 +2402,7 @@ impl Default for Frog {
|
|||
Self {
|
||||
abstract_animal: Default::default(),
|
||||
variant: azalea_registry::FrogVariant::Temperate,
|
||||
tongue_target: None,
|
||||
tongue_target: OptionalUnsignedInt(None),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5897,7 +6003,11 @@ impl Default for Villager {
|
|||
Self {
|
||||
abstract_ageable: Default::default(),
|
||||
unhappy_counter: 0,
|
||||
villager_data: Default::default(),
|
||||
villager_data: VillagerData {
|
||||
kind: azalea_registry::VillagerType::Plains,
|
||||
profession: azalea_registry::VillagerProfession::None,
|
||||
level: 0,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6585,7 +6695,11 @@ impl Default for ZombieVillager {
|
|||
Self {
|
||||
zombie: Default::default(),
|
||||
converting: false,
|
||||
villager_data: Default::default(),
|
||||
villager_data: VillagerData {
|
||||
kind: azalea_registry::VillagerType::Plains,
|
||||
profession: azalea_registry::VillagerProfession::None,
|
||||
level: 0,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7286,6 +7400,7 @@ pub enum EntityMetadata {
|
|||
Bee(Bee),
|
||||
Blaze(Blaze),
|
||||
Boat(Boat),
|
||||
Camel(Camel),
|
||||
Cat(Cat),
|
||||
CaveSpider(CaveSpider),
|
||||
ChestBoat(ChestBoat),
|
||||
|
|
@ -7413,6 +7528,7 @@ impl From<azalea_registry::EntityType> for EntityMetadata {
|
|||
azalea_registry::EntityType::Bee => EntityMetadata::Bee(Bee::default()),
|
||||
azalea_registry::EntityType::Blaze => EntityMetadata::Blaze(Blaze::default()),
|
||||
azalea_registry::EntityType::Boat => EntityMetadata::Boat(Boat::default()),
|
||||
azalea_registry::EntityType::Camel => EntityMetadata::Camel(Camel::default()),
|
||||
azalea_registry::EntityType::Cat => EntityMetadata::Cat(Cat::default()),
|
||||
azalea_registry::EntityType::CaveSpider => {
|
||||
EntityMetadata::CaveSpider(CaveSpider::default())
|
||||
|
|
@ -7636,6 +7752,7 @@ impl EntityMetadata {
|
|||
EntityMetadata::Bee(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::Blaze(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::Boat(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::Camel(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::Cat(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::CaveSpider(entity) => entity.set_index(index, value),
|
||||
EntityMetadata::ChestBoat(entity) => entity.set_index(index, value),
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
|
|||
# TODO: auto generate this and use it for generating the EntityDataValue enum
|
||||
metadata_types = [
|
||||
{'name': 'Byte', 'type': 'u8'},
|
||||
{'name': 'Int', 'type': 'i32'},
|
||||
{'name': 'Int', 'type': 'i32', 'var': True},
|
||||
{'name': 'Long', 'type': 'i64'},
|
||||
{'name': 'Float', 'type': 'f32'},
|
||||
{'name': 'String', 'type': 'String'},
|
||||
{'name': 'Component', 'type': 'Component'},
|
||||
|
|
@ -23,11 +24,11 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
|
|||
{'name': 'OptionalBlockPos', 'type': 'Option<BlockPos>'},
|
||||
{'name': 'Direction', 'type': 'Direction'},
|
||||
{'name': 'OptionalUuid', 'type': 'Option<Uuid>'},
|
||||
{'name': 'OptionalBlockState', 'type': 'Option<BlockState>'},
|
||||
{'name': 'BlockState', 'type': 'BlockState'},
|
||||
{'name': 'CompoundTag', 'type': 'azalea_nbt::Tag'},
|
||||
{'name': 'Particle', 'type': 'Particle'},
|
||||
{'name': 'VillagerData', 'type': 'VillagerData'},
|
||||
{'name': 'OptionalUnsignedInt', 'type': 'Option<u32>'},
|
||||
{'name': 'OptionalUnsignedInt', 'type': 'OptionalUnsignedInt'},
|
||||
{'name': 'Pose', 'type': 'Pose'},
|
||||
{'name': 'CatVariant', 'type': 'azalea_registry::CatVariant'},
|
||||
{'name': 'FrogVariant', 'type': 'azalea_registry::FrogVariant'},
|
||||
|
|
@ -40,7 +41,8 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
|
|||
code.append("// Don't change it manually!")
|
||||
code.append('')
|
||||
code.append('#![allow(clippy::clone_on_copy, clippy::derivable_impls)]')
|
||||
code.append('use super::{EntityDataValue, Rotations, VillagerData, Pose};')
|
||||
code.append(
|
||||
'use super::{EntityDataValue, Rotations, VillagerData, OptionalUnsignedInt, Pose};')
|
||||
code.append('use azalea_block::BlockState;')
|
||||
code.append('use azalea_chat::Component;')
|
||||
code.append('use azalea_core::{BlockPos, Direction, Particle, Slot};')
|
||||
|
|
@ -185,6 +187,8 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
|
|||
default = 'azalea_registry::PaintingVariant::Kebab'
|
||||
elif type_name == 'FrogVariant':
|
||||
default = 'azalea_registry::FrogVariant::Temperate'
|
||||
elif type_name == 'VillagerData':
|
||||
default = 'VillagerData { kind: azalea_registry::VillagerType::Plains, profession: azalea_registry::VillagerProfession::None, level: 0 }'
|
||||
else:
|
||||
default = 'Default::default()'
|
||||
else:
|
||||
|
|
@ -200,11 +204,11 @@ def generate_entity_metadata(burger_entity_data: dict, mappings: Mappings):
|
|||
elif type_name == 'OptionalUuid':
|
||||
default = f'Some(uuid::uuid!({default}))' if default != 'Empty' else 'None'
|
||||
elif type_name == 'OptionalUnsignedInt':
|
||||
default = f'Some({default})' if default != 'Empty' else 'None'
|
||||
default = f'OptionalUnsignedInt(Some({default}))' if default != 'Empty' else 'OptionalUnsignedInt(None)'
|
||||
elif type_name == 'ItemStack':
|
||||
default = f'Slot::Present({default})' if default != 'Empty' else 'Slot::Empty'
|
||||
elif type_name == 'OptionalBlockState':
|
||||
default = f'Some({default})' if default != 'Empty' else 'None'
|
||||
elif type_name == 'BlockState':
|
||||
default = f'{default}' if default != 'Empty' else 'BlockState::Air'
|
||||
elif type_name == 'OptionalComponent':
|
||||
default = f'Some({default})' if default != 'Empty' else 'None'
|
||||
elif type_name == 'CompoundTag':
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue