diff --git a/level/block/block_entities.nbt b/level/block/block_entities.nbt index 9467231..44a12ac 100644 Binary files a/level/block/block_entities.nbt and b/level/block/block_entities.nbt differ diff --git a/level/block/block_states.nbt b/level/block/block_states.nbt index f771b27..d3ce153 100644 Binary files a/level/block/block_states.nbt and b/level/block/block_states.nbt differ diff --git a/level/block/blockentities.go b/level/block/blockentities.go index e5f47ef..f401453 100644 --- a/level/block/blockentities.go +++ b/level/block/blockentities.go @@ -38,53 +38,55 @@ var EntityList = [...]Entity{ CampfireEntity{}, BeehiveEntity{}, SculkSensorEntity{}, + CalibratedSculkSensorEntity{}, SculkCatalystEntity{}, SculkShriekerEntity{}, ChiseledBookshelfEntity{}, - SuspiciousSandEntity{}, + BrushableBlockEntity{}, DecoratedPotEntity{}, } -func (FurnaceEntity) ID() string { return "minecraft:furnace" } -func (ChestEntity) ID() string { return "minecraft:chest" } -func (TrappedChestEntity) ID() string { return "minecraft:trapped_chest" } -func (EnderChestEntity) ID() string { return "minecraft:ender_chest" } -func (JukeboxEntity) ID() string { return "minecraft:jukebox" } -func (DispenserEntity) ID() string { return "minecraft:dispenser" } -func (DropperEntity) ID() string { return "minecraft:dropper" } -func (SignEntity) ID() string { return "minecraft:sign" } -func (HangingSignEntity) ID() string { return "minecraft:hanging_sign" } -func (MobSpawnerEntity) ID() string { return "minecraft:mob_spawner" } -func (PistonEntity) ID() string { return "minecraft:piston" } -func (BrewingStandEntity) ID() string { return "minecraft:brewing_stand" } -func (EnchantingTableEntity) ID() string { return "minecraft:enchanting_table" } -func (EndPortalEntity) ID() string { return "minecraft:end_portal" } -func (BeaconEntity) ID() string { return "minecraft:beacon" } -func (SkullEntity) ID() string { return "minecraft:skull" } -func (DaylightDetectorEntity) ID() string { return "minecraft:daylight_detector" } -func (HopperEntity) ID() string { return "minecraft:hopper" } -func (ComparatorEntity) ID() string { return "minecraft:comparator" } -func (BannerEntity) ID() string { return "minecraft:banner" } -func (StructureBlockEntity) ID() string { return "minecraft:structure_block" } -func (EndGatewayEntity) ID() string { return "minecraft:end_gateway" } -func (CommandBlockEntity) ID() string { return "minecraft:command_block" } -func (ShulkerBoxEntity) ID() string { return "minecraft:shulker_box" } -func (BedEntity) ID() string { return "minecraft:bed" } -func (ConduitEntity) ID() string { return "minecraft:conduit" } -func (BarrelEntity) ID() string { return "minecraft:barrel" } -func (SmokerEntity) ID() string { return "minecraft:smoker" } -func (BlastFurnaceEntity) ID() string { return "minecraft:blast_furnace" } -func (LecternEntity) ID() string { return "minecraft:lectern" } -func (BellEntity) ID() string { return "minecraft:bell" } -func (JigsawEntity) ID() string { return "minecraft:jigsaw" } -func (CampfireEntity) ID() string { return "minecraft:campfire" } -func (BeehiveEntity) ID() string { return "minecraft:beehive" } -func (SculkSensorEntity) ID() string { return "minecraft:sculk_sensor" } -func (SculkCatalystEntity) ID() string { return "minecraft:sculk_catalyst" } -func (SculkShriekerEntity) ID() string { return "minecraft:sculk_shrieker" } -func (ChiseledBookshelfEntity) ID() string { return "minecraft:chiseled_bookshelf" } -func (SuspiciousSandEntity) ID() string { return "minecraft:suspicious_sand" } -func (DecoratedPotEntity) ID() string { return "minecraft:decorated_pot" } +func (FurnaceEntity) ID() string { return "minecraft:furnace" } +func (ChestEntity) ID() string { return "minecraft:chest" } +func (TrappedChestEntity) ID() string { return "minecraft:trapped_chest" } +func (EnderChestEntity) ID() string { return "minecraft:ender_chest" } +func (JukeboxEntity) ID() string { return "minecraft:jukebox" } +func (DispenserEntity) ID() string { return "minecraft:dispenser" } +func (DropperEntity) ID() string { return "minecraft:dropper" } +func (SignEntity) ID() string { return "minecraft:sign" } +func (HangingSignEntity) ID() string { return "minecraft:hanging_sign" } +func (MobSpawnerEntity) ID() string { return "minecraft:mob_spawner" } +func (PistonEntity) ID() string { return "minecraft:piston" } +func (BrewingStandEntity) ID() string { return "minecraft:brewing_stand" } +func (EnchantingTableEntity) ID() string { return "minecraft:enchanting_table" } +func (EndPortalEntity) ID() string { return "minecraft:end_portal" } +func (BeaconEntity) ID() string { return "minecraft:beacon" } +func (SkullEntity) ID() string { return "minecraft:skull" } +func (DaylightDetectorEntity) ID() string { return "minecraft:daylight_detector" } +func (HopperEntity) ID() string { return "minecraft:hopper" } +func (ComparatorEntity) ID() string { return "minecraft:comparator" } +func (BannerEntity) ID() string { return "minecraft:banner" } +func (StructureBlockEntity) ID() string { return "minecraft:structure_block" } +func (EndGatewayEntity) ID() string { return "minecraft:end_gateway" } +func (CommandBlockEntity) ID() string { return "minecraft:command_block" } +func (ShulkerBoxEntity) ID() string { return "minecraft:shulker_box" } +func (BedEntity) ID() string { return "minecraft:bed" } +func (ConduitEntity) ID() string { return "minecraft:conduit" } +func (BarrelEntity) ID() string { return "minecraft:barrel" } +func (SmokerEntity) ID() string { return "minecraft:smoker" } +func (BlastFurnaceEntity) ID() string { return "minecraft:blast_furnace" } +func (LecternEntity) ID() string { return "minecraft:lectern" } +func (BellEntity) ID() string { return "minecraft:bell" } +func (JigsawEntity) ID() string { return "minecraft:jigsaw" } +func (CampfireEntity) ID() string { return "minecraft:campfire" } +func (BeehiveEntity) ID() string { return "minecraft:beehive" } +func (SculkSensorEntity) ID() string { return "minecraft:sculk_sensor" } +func (CalibratedSculkSensorEntity) ID() string { return "minecraft:calibrated_sculk_sensor" } +func (SculkCatalystEntity) ID() string { return "minecraft:sculk_catalyst" } +func (SculkShriekerEntity) ID() string { return "minecraft:sculk_shrieker" } +func (ChiseledBookshelfEntity) ID() string { return "minecraft:chiseled_bookshelf" } +func (BrushableBlockEntity) ID() string { return "minecraft:brushable_block" } +func (DecoratedPotEntity) ID() string { return "minecraft:decorated_pot" } func (f FurnaceEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:furnace" @@ -392,6 +394,10 @@ func (s SculkSensorEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:sculk_sensor" } +func (c CalibratedSculkSensorEntity) IsValidBlock(block Block) bool { + return block.ID() == "minecraft:calibrated_sculk_sensor" +} + func (s SculkCatalystEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:sculk_catalyst" } @@ -404,8 +410,14 @@ func (c ChiseledBookshelfEntity) IsValidBlock(block Block) bool { return block.ID() == "minecraft:chiseled_bookshelf" } -func (s SuspiciousSandEntity) IsValidBlock(block Block) bool { - return block.ID() == "minecraft:suspicious_sand" +func (b BrushableBlockEntity) IsValidBlock(block Block) bool { + switch block.ID() { + case "minecraft:suspicious_sand", + "minecraft:suspicious_gravel": + return true + default: + return false + } } func (d DecoratedPotEntity) IsValidBlock(block Block) bool { diff --git a/level/block/blockentity.go b/level/block/blockentity.go index a017961..555ff88 100644 --- a/level/block/blockentity.go +++ b/level/block/blockentity.go @@ -7,46 +7,48 @@ type Entity interface { } type ( - FurnaceEntity struct{} - ChestEntity struct{} - TrappedChestEntity struct{} - EnderChestEntity struct{} - JukeboxEntity struct{} - DispenserEntity struct{} - DropperEntity struct{} - SignEntity struct{} - HangingSignEntity struct{} - MobSpawnerEntity struct{} - PistonEntity struct{} - BrewingStandEntity struct{} - EnchantingTableEntity struct{} - EndPortalEntity struct{} - BeaconEntity struct{} - SkullEntity struct{} - DaylightDetectorEntity struct{} - HopperEntity struct{} - ComparatorEntity struct{} - BannerEntity struct{} - StructureBlockEntity struct{} - EndGatewayEntity struct{} - CommandBlockEntity struct{} - ShulkerBoxEntity struct{} - BedEntity struct{} - ConduitEntity struct{} - BarrelEntity struct{} - SmokerEntity struct{} - BlastFurnaceEntity struct{} - LecternEntity struct{} - BellEntity struct{} - JigsawEntity struct{} - CampfireEntity struct{} - BeehiveEntity struct{} - SculkSensorEntity struct{} - SculkCatalystEntity struct{} - SculkShriekerEntity struct{} - ChiseledBookshelfEntity struct{} - SuspiciousSandEntity struct{} - DecoratedPotEntity struct{} + FurnaceEntity struct{} + ChestEntity struct{} + TrappedChestEntity struct{} + EnderChestEntity struct{} + JukeboxEntity struct{} + DispenserEntity struct{} + DropperEntity struct{} + SignEntity struct{} + HangingSignEntity struct{} + MobSpawnerEntity struct{} + PistonEntity struct{} + BrewingStandEntity struct{} + EnchantingTableEntity struct{} + EndPortalEntity struct{} + BeaconEntity struct{} + SkullEntity struct{} + DaylightDetectorEntity struct{} + HopperEntity struct{} + ComparatorEntity struct{} + BannerEntity struct{} + StructureBlockEntity struct{} + EndGatewayEntity struct{} + CommandBlockEntity struct{} + ShulkerBoxEntity struct{} + BedEntity struct{} + ConduitEntity struct{} + BarrelEntity struct{} + SmokerEntity struct{} + BlastFurnaceEntity struct{} + LecternEntity struct{} + BellEntity struct{} + JigsawEntity struct{} + CampfireEntity struct{} + BeehiveEntity struct{} + SculkSensorEntity struct{} + CalibratedSculkSensorEntity struct{} + SculkCatalystEntity struct{} + SculkShriekerEntity struct{} + ChiseledBookshelfEntity struct{} + SuspiciousSandEntity struct{} + BrushableBlockEntity struct{} + DecoratedPotEntity struct{} ) type EntityType int32 diff --git a/level/block/blocks.go b/level/block/blocks.go index 636e45e..c8816fe 100644 --- a/level/block/blocks.go +++ b/level/block/blocks.go @@ -70,6 +70,9 @@ type ( } RedSand struct{} Gravel struct{} + SuspiciousGravel struct { + Dusted Integer `nbt:"dusted"` + } GoldOre struct{} DeepslateGoldOre struct{} IronOre struct{} @@ -1892,6 +1895,13 @@ type ( TorchflowerCrop struct { Age Integer `nbt:"age"` } + PitcherCrop struct { + Age Integer `nbt:"age"` + Half DoubleBlockHalf `nbt:"half"` + } + PitcherPlant struct { + Half DoubleBlockHalf `nbt:"half"` + } Beetroots struct { Age Integer `nbt:"age"` } @@ -2059,6 +2069,9 @@ type ( Eggs Integer `nbt:"eggs"` Hatch Integer `nbt:"hatch"` } + SnifferEgg struct { + Hatch Integer `nbt:"hatch"` + } DeadTubeCoralBlock struct{} DeadBrainCoralBlock struct{} DeadBubbleCoralBlock struct{} @@ -2908,6 +2921,12 @@ type ( Sculk_sensor_phase SculkSensorPhase `nbt:"sculk_sensor_phase"` Waterlogged Boolean `nbt:"waterlogged"` } + CalibratedSculkSensor struct { + Facing Direction `nbt:"facing"` + Power Integer `nbt:"power"` + Sculk_sensor_phase SculkSensorPhase `nbt:"sculk_sensor_phase"` + Waterlogged Boolean `nbt:"waterlogged"` + } Sculk struct{} SculkVein struct { Down Boolean `nbt:"down"` @@ -3173,6 +3192,7 @@ type ( Frogspawn struct{} ReinforcedDeepslate struct{} DecoratedPot struct { + Cracked Boolean `nbt:"cracked"` Facing Direction `nbt:"facing"` Waterlogged Boolean `nbt:"waterlogged"` } @@ -3216,6 +3236,7 @@ func (Sand) ID() string { return "minecraft:sand" } func (SuspiciousSand) ID() string { return "minecraft:suspicious_sand" } func (RedSand) ID() string { return "minecraft:red_sand" } func (Gravel) ID() string { return "minecraft:gravel" } +func (SuspiciousGravel) ID() string { return "minecraft:suspicious_gravel" } func (GoldOre) ID() string { return "minecraft:gold_ore" } func (DeepslateGoldOre) ID() string { return "minecraft:deepslate_gold_ore" } func (IronOre) ID() string { return "minecraft:iron_ore" } @@ -3776,6 +3797,8 @@ func (PurpurPillar) ID() string { return "minecraft:purpur_pillar func (PurpurStairs) ID() string { return "minecraft:purpur_stairs" } func (EndStoneBricks) ID() string { return "minecraft:end_stone_bricks" } func (TorchflowerCrop) ID() string { return "minecraft:torchflower_crop" } +func (PitcherCrop) ID() string { return "minecraft:pitcher_crop" } +func (PitcherPlant) ID() string { return "minecraft:pitcher_plant" } func (Beetroots) ID() string { return "minecraft:beetroots" } func (DirtPath) ID() string { return "minecraft:dirt_path" } func (EndGateway) ID() string { return "minecraft:end_gateway" } @@ -3857,6 +3880,7 @@ func (Kelp) ID() string { return "minecraft:kelp" } func (KelpPlant) ID() string { return "minecraft:kelp_plant" } func (DriedKelpBlock) ID() string { return "minecraft:dried_kelp_block" } func (TurtleEgg) ID() string { return "minecraft:turtle_egg" } +func (SnifferEgg) ID() string { return "minecraft:sniffer_egg" } func (DeadTubeCoralBlock) ID() string { return "minecraft:dead_tube_coral_block" } func (DeadBrainCoralBlock) ID() string { return "minecraft:dead_brain_coral_block" } func (DeadBubbleCoralBlock) ID() string { return "minecraft:dead_bubble_coral_block" } @@ -4092,6 +4116,7 @@ func (Calcite) ID() string { return "minecraft:calcite" } func (TintedGlass) ID() string { return "minecraft:tinted_glass" } func (PowderSnow) ID() string { return "minecraft:powder_snow" } func (SculkSensor) ID() string { return "minecraft:sculk_sensor" } +func (CalibratedSculkSensor) ID() string { return "minecraft:calibrated_sculk_sensor" } func (Sculk) ID() string { return "minecraft:sculk" } func (SculkVein) ID() string { return "minecraft:sculk_vein" } func (SculkCatalyst) ID() string { return "minecraft:sculk_catalyst" } @@ -4222,6 +4247,7 @@ var FromID = map[string]Block{ "minecraft:suspicious_sand": SuspiciousSand{}, "minecraft:red_sand": RedSand{}, "minecraft:gravel": Gravel{}, + "minecraft:suspicious_gravel": SuspiciousGravel{}, "minecraft:gold_ore": GoldOre{}, "minecraft:deepslate_gold_ore": DeepslateGoldOre{}, "minecraft:iron_ore": IronOre{}, @@ -4782,6 +4808,8 @@ var FromID = map[string]Block{ "minecraft:purpur_stairs": PurpurStairs{}, "minecraft:end_stone_bricks": EndStoneBricks{}, "minecraft:torchflower_crop": TorchflowerCrop{}, + "minecraft:pitcher_crop": PitcherCrop{}, + "minecraft:pitcher_plant": PitcherPlant{}, "minecraft:beetroots": Beetroots{}, "minecraft:dirt_path": DirtPath{}, "minecraft:end_gateway": EndGateway{}, @@ -4863,6 +4891,7 @@ var FromID = map[string]Block{ "minecraft:kelp_plant": KelpPlant{}, "minecraft:dried_kelp_block": DriedKelpBlock{}, "minecraft:turtle_egg": TurtleEgg{}, + "minecraft:sniffer_egg": SnifferEgg{}, "minecraft:dead_tube_coral_block": DeadTubeCoralBlock{}, "minecraft:dead_brain_coral_block": DeadBrainCoralBlock{}, "minecraft:dead_bubble_coral_block": DeadBubbleCoralBlock{}, @@ -5094,6 +5123,7 @@ var FromID = map[string]Block{ "minecraft:tinted_glass": TintedGlass{}, "minecraft:powder_snow": PowderSnow{}, "minecraft:sculk_sensor": SculkSensor{}, + "minecraft:calibrated_sculk_sensor": CalibratedSculkSensor{}, "minecraft:sculk": Sculk{}, "minecraft:sculk_vein": SculkVein{}, "minecraft:sculk_catalyst": SculkCatalyst{}, diff --git a/level/block/blocks.nbt b/level/block/blocks.nbt index c3c7d1b..9c697bb 100644 Binary files a/level/block/blocks.nbt and b/level/block/blocks.nbt differ