diff --git a/level/block/block_states.nbt b/level/block/block_states.nbt index bdba6e3..8d54da3 100644 Binary files a/level/block/block_states.nbt and b/level/block/block_states.nbt differ diff --git a/level/block/blocks.go b/level/block/blocks.go index 2ae44f8..ac67af4 100644 --- a/level/block/blocks.go +++ b/level/block/blocks.go @@ -1,4 +1,5 @@ // Code generated by generator/blocks/main.go; DO NOT EDIT. + package block type ( @@ -26,6 +27,8 @@ type ( AcaciaPlanks struct{} DarkOakPlanks struct{} MangrovePlanks struct{} + BambooPlanks struct{} + BambooMosaic struct{} OakSapling struct { Stage Integer `nbt:"stage"` } @@ -94,6 +97,9 @@ type ( MuddyMangroveRoots struct { Axis Axis `nbt:"axis"` } + BambooBlock struct { + Axis Axis `nbt:"axis"` + } StrippedSpruceLog struct { Axis Axis `nbt:"axis"` } @@ -115,6 +121,9 @@ type ( StrippedMangroveLog struct { Axis Axis `nbt:"axis"` } + StrippedBambooBlock struct { + Axis Axis `nbt:"axis"` + } OakWood struct { Axis Axis `nbt:"axis"` } @@ -372,7 +381,16 @@ type ( Tnt struct { Unstable Boolean `nbt:"unstable"` } - Bookshelf struct{} + Bookshelf struct{} + ChiseledBookshelf struct { + Facing Direction `nbt:"facing"` + Slot_0_occupied Boolean `nbt:"slot_0_occupied"` + Slot_1_occupied Boolean `nbt:"slot_1_occupied"` + Slot_2_occupied Boolean `nbt:"slot_2_occupied"` + Slot_3_occupied Boolean `nbt:"slot_3_occupied"` + Slot_4_occupied Boolean `nbt:"slot_4_occupied"` + Slot_5_occupied Boolean `nbt:"slot_5_occupied"` + } MossyCobblestone struct{} Obsidian struct{} Torch struct{} @@ -449,6 +467,10 @@ type ( Rotation Integer `nbt:"rotation"` Waterlogged Boolean `nbt:"waterlogged"` } + BambooSign struct { + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } OakDoor struct { Facing Direction `nbt:"facing"` Half DoubleBlockHalf `nbt:"half"` @@ -498,6 +520,100 @@ type ( Facing Direction `nbt:"facing"` Waterlogged Boolean `nbt:"waterlogged"` } + BambooWallSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + OakHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + SpruceHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BirchHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + AcaciaHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + JungleHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + DarkOakHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + CrimsonHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WarpedHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + MangroveHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BambooHangingSign struct { + Attached Boolean `nbt:"attached"` + Rotation Integer `nbt:"rotation"` + Waterlogged Boolean `nbt:"waterlogged"` + } + OakWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + SpruceWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BirchWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + AcaciaWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + JungleWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + DarkOakWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + MangroveWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + CrimsonWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + WarpedWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BambooWallHangingSign struct { + Facing Direction `nbt:"facing"` + Waterlogged Boolean `nbt:"waterlogged"` + } Lever struct { Face AttachFace `nbt:"face"` Facing Direction `nbt:"facing"` @@ -534,6 +650,9 @@ type ( MangrovePressurePlate struct { Powered Boolean `nbt:"powered"` } + BambooPressurePlate struct { + Powered Boolean `nbt:"powered"` + } RedstoneOre struct { Lit Boolean `nbt:"lit"` } @@ -672,6 +791,13 @@ type ( Powered Boolean `nbt:"powered"` Waterlogged Boolean `nbt:"waterlogged"` } + BambooTrapdoor struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + Waterlogged Boolean `nbt:"waterlogged"` + } StoneBricks struct{} MossyStoneBricks struct{} CrackedStoneBricks struct{} @@ -961,6 +1087,11 @@ type ( Facing Direction `nbt:"facing"` Powered Boolean `nbt:"powered"` } + BambooButton struct { + Face AttachFace `nbt:"face"` + Facing Direction `nbt:"facing"` + Powered Boolean `nbt:"powered"` + } SkeletonSkull struct { Rotation Integer `nbt:"rotation"` } @@ -997,6 +1128,12 @@ type ( DragonWallHead struct { Facing Direction `nbt:"facing"` } + PiglinHead struct { + Rotation Integer `nbt:"rotation"` + } + PiglinWallHead struct { + Facing Direction `nbt:"facing"` + } Anvil struct { Facing Direction `nbt:"facing"` } @@ -1198,6 +1335,18 @@ type ( Shape StairsShape `nbt:"shape"` Waterlogged Boolean `nbt:"waterlogged"` } + BambooStairs struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Shape StairsShape `nbt:"shape"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BambooMosaicStairs struct { + Facing Direction `nbt:"facing"` + Half Half `nbt:"half"` + Shape StairsShape `nbt:"shape"` + Waterlogged Boolean `nbt:"waterlogged"` + } SlimeBlock struct{} Barrier struct{} Light struct { @@ -1418,6 +1567,14 @@ type ( Type SlabType `nbt:"type"` Waterlogged Boolean `nbt:"waterlogged"` } + BambooSlab struct { + Type SlabType `nbt:"type"` + Waterlogged Boolean `nbt:"waterlogged"` + } + BambooMosaicSlab struct { + Type SlabType `nbt:"type"` + Waterlogged Boolean `nbt:"waterlogged"` + } StoneSlab struct { Type SlabType `nbt:"type"` Waterlogged Boolean `nbt:"waterlogged"` @@ -1514,6 +1671,12 @@ type ( Open Boolean `nbt:"open"` Powered Boolean `nbt:"powered"` } + BambooFenceGate struct { + Facing Direction `nbt:"facing"` + In_wall Boolean `nbt:"in_wall"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } SpruceFence struct { East Boolean `nbt:"east"` North Boolean `nbt:"north"` @@ -1556,6 +1719,13 @@ type ( Waterlogged Boolean `nbt:"waterlogged"` West Boolean `nbt:"west"` } + BambooFence struct { + East Boolean `nbt:"east"` + North Boolean `nbt:"north"` + South Boolean `nbt:"south"` + Waterlogged Boolean `nbt:"waterlogged"` + West Boolean `nbt:"west"` + } SpruceDoor struct { Facing Direction `nbt:"facing"` Half DoubleBlockHalf `nbt:"half"` @@ -1598,6 +1768,13 @@ type ( Open Boolean `nbt:"open"` Powered Boolean `nbt:"powered"` } + BambooDoor struct { + Facing Direction `nbt:"facing"` + Half DoubleBlockHalf `nbt:"half"` + Hinge DoorHingeSide `nbt:"hinge"` + Open Boolean `nbt:"open"` + Powered Boolean `nbt:"powered"` + } EndRod struct { Facing Direction `nbt:"facing"` } @@ -2921,6 +3098,8 @@ func (JunglePlanks) ID() string { return "minecraft:jungle_planks func (AcaciaPlanks) ID() string { return "minecraft:acacia_planks" } func (DarkOakPlanks) ID() string { return "minecraft:dark_oak_planks" } func (MangrovePlanks) ID() string { return "minecraft:mangrove_planks" } +func (BambooPlanks) ID() string { return "minecraft:bamboo_planks" } +func (BambooMosaic) ID() string { return "minecraft:bamboo_mosaic" } func (OakSapling) ID() string { return "minecraft:oak_sapling" } func (SpruceSapling) ID() string { return "minecraft:spruce_sapling" } func (BirchSapling) ID() string { return "minecraft:birch_sapling" } @@ -2950,6 +3129,7 @@ func (DarkOakLog) ID() string { return "minecraft:dark_oak_log" func (MangroveLog) ID() string { return "minecraft:mangrove_log" } func (MangroveRoots) ID() string { return "minecraft:mangrove_roots" } func (MuddyMangroveRoots) ID() string { return "minecraft:muddy_mangrove_roots" } +func (BambooBlock) ID() string { return "minecraft:bamboo_block" } func (StrippedSpruceLog) ID() string { return "minecraft:stripped_spruce_log" } func (StrippedBirchLog) ID() string { return "minecraft:stripped_birch_log" } func (StrippedJungleLog) ID() string { return "minecraft:stripped_jungle_log" } @@ -2957,6 +3137,7 @@ func (StrippedAcaciaLog) ID() string { return "minecraft:stripped_acac func (StrippedDarkOakLog) ID() string { return "minecraft:stripped_dark_oak_log" } func (StrippedOakLog) ID() string { return "minecraft:stripped_oak_log" } func (StrippedMangroveLog) ID() string { return "minecraft:stripped_mangrove_log" } +func (StrippedBambooBlock) ID() string { return "minecraft:stripped_bamboo_block" } func (OakWood) ID() string { return "minecraft:oak_wood" } func (SpruceWood) ID() string { return "minecraft:spruce_wood" } func (BirchWood) ID() string { return "minecraft:birch_wood" } @@ -3055,6 +3236,7 @@ func (IronBlock) ID() string { return "minecraft:iron_block" } func (Bricks) ID() string { return "minecraft:bricks" } func (Tnt) ID() string { return "minecraft:tnt" } func (Bookshelf) ID() string { return "minecraft:bookshelf" } +func (ChiseledBookshelf) ID() string { return "minecraft:chiseled_bookshelf" } func (MossyCobblestone) ID() string { return "minecraft:mossy_cobblestone" } func (Obsidian) ID() string { return "minecraft:obsidian" } func (Torch) ID() string { return "minecraft:torch" } @@ -3079,6 +3261,7 @@ func (AcaciaSign) ID() string { return "minecraft:acacia_sign" func (JungleSign) ID() string { return "minecraft:jungle_sign" } func (DarkOakSign) ID() string { return "minecraft:dark_oak_sign" } func (MangroveSign) ID() string { return "minecraft:mangrove_sign" } +func (BambooSign) ID() string { return "minecraft:bamboo_sign" } func (OakDoor) ID() string { return "minecraft:oak_door" } func (Ladder) ID() string { return "minecraft:ladder" } func (Rail) ID() string { return "minecraft:rail" } @@ -3090,6 +3273,27 @@ func (AcaciaWallSign) ID() string { return "minecraft:acacia_wall_s func (JungleWallSign) ID() string { return "minecraft:jungle_wall_sign" } func (DarkOakWallSign) ID() string { return "minecraft:dark_oak_wall_sign" } func (MangroveWallSign) ID() string { return "minecraft:mangrove_wall_sign" } +func (BambooWallSign) ID() string { return "minecraft:bamboo_wall_sign" } +func (OakHangingSign) ID() string { return "minecraft:oak_hanging_sign" } +func (SpruceHangingSign) ID() string { return "minecraft:spruce_hanging_sign" } +func (BirchHangingSign) ID() string { return "minecraft:birch_hanging_sign" } +func (AcaciaHangingSign) ID() string { return "minecraft:acacia_hanging_sign" } +func (JungleHangingSign) ID() string { return "minecraft:jungle_hanging_sign" } +func (DarkOakHangingSign) ID() string { return "minecraft:dark_oak_hanging_sign" } +func (CrimsonHangingSign) ID() string { return "minecraft:crimson_hanging_sign" } +func (WarpedHangingSign) ID() string { return "minecraft:warped_hanging_sign" } +func (MangroveHangingSign) ID() string { return "minecraft:mangrove_hanging_sign" } +func (BambooHangingSign) ID() string { return "minecraft:bamboo_hanging_sign" } +func (OakWallHangingSign) ID() string { return "minecraft:oak_wall_hanging_sign" } +func (SpruceWallHangingSign) ID() string { return "minecraft:spruce_wall_hanging_sign" } +func (BirchWallHangingSign) ID() string { return "minecraft:birch_wall_hanging_sign" } +func (AcaciaWallHangingSign) ID() string { return "minecraft:acacia_wall_hanging_sign" } +func (JungleWallHangingSign) ID() string { return "minecraft:jungle_wall_hanging_sign" } +func (DarkOakWallHangingSign) ID() string { return "minecraft:dark_oak_wall_hanging_sign" } +func (MangroveWallHangingSign) ID() string { return "minecraft:mangrove_wall_hanging_sign" } +func (CrimsonWallHangingSign) ID() string { return "minecraft:crimson_wall_hanging_sign" } +func (WarpedWallHangingSign) ID() string { return "minecraft:warped_wall_hanging_sign" } +func (BambooWallHangingSign) ID() string { return "minecraft:bamboo_wall_hanging_sign" } func (Lever) ID() string { return "minecraft:lever" } func (StonePressurePlate) ID() string { return "minecraft:stone_pressure_plate" } func (IronDoor) ID() string { return "minecraft:iron_door" } @@ -3100,6 +3304,7 @@ func (JunglePressurePlate) ID() string { return "minecraft:jungle_pressu func (AcaciaPressurePlate) ID() string { return "minecraft:acacia_pressure_plate" } func (DarkOakPressurePlate) ID() string { return "minecraft:dark_oak_pressure_plate" } func (MangrovePressurePlate) ID() string { return "minecraft:mangrove_pressure_plate" } +func (BambooPressurePlate) ID() string { return "minecraft:bamboo_pressure_plate" } func (RedstoneOre) ID() string { return "minecraft:redstone_ore" } func (DeepslateRedstoneOre) ID() string { return "minecraft:deepslate_redstone_ore" } func (RedstoneTorch) ID() string { return "minecraft:redstone_torch" } @@ -3150,6 +3355,7 @@ func (JungleTrapdoor) ID() string { return "minecraft:jungle_trapdo func (AcaciaTrapdoor) ID() string { return "minecraft:acacia_trapdoor" } func (DarkOakTrapdoor) ID() string { return "minecraft:dark_oak_trapdoor" } func (MangroveTrapdoor) ID() string { return "minecraft:mangrove_trapdoor" } +func (BambooTrapdoor) ID() string { return "minecraft:bamboo_trapdoor" } func (StoneBricks) ID() string { return "minecraft:stone_bricks" } func (MossyStoneBricks) ID() string { return "minecraft:mossy_stone_bricks" } func (CrackedStoneBricks) ID() string { return "minecraft:cracked_stone_bricks" } @@ -3246,6 +3452,7 @@ func (JungleButton) ID() string { return "minecraft:jungle_button func (AcaciaButton) ID() string { return "minecraft:acacia_button" } func (DarkOakButton) ID() string { return "minecraft:dark_oak_button" } func (MangroveButton) ID() string { return "minecraft:mangrove_button" } +func (BambooButton) ID() string { return "minecraft:bamboo_button" } func (SkeletonSkull) ID() string { return "minecraft:skeleton_skull" } func (SkeletonWallSkull) ID() string { return "minecraft:skeleton_wall_skull" } func (WitherSkeletonSkull) ID() string { return "minecraft:wither_skeleton_skull" } @@ -3258,6 +3465,8 @@ func (CreeperHead) ID() string { return "minecraft:creeper_head" func (CreeperWallHead) ID() string { return "minecraft:creeper_wall_head" } func (DragonHead) ID() string { return "minecraft:dragon_head" } func (DragonWallHead) ID() string { return "minecraft:dragon_wall_head" } +func (PiglinHead) ID() string { return "minecraft:piglin_head" } +func (PiglinWallHead) ID() string { return "minecraft:piglin_wall_head" } func (Anvil) ID() string { return "minecraft:anvil" } func (ChippedAnvil) ID() string { return "minecraft:chipped_anvil" } func (DamagedAnvil) ID() string { return "minecraft:damaged_anvil" } @@ -3310,6 +3519,8 @@ func (BlackStainedGlassPane) ID() string { return "minecraft:black_stained func (AcaciaStairs) ID() string { return "minecraft:acacia_stairs" } func (DarkOakStairs) ID() string { return "minecraft:dark_oak_stairs" } func (MangroveStairs) ID() string { return "minecraft:mangrove_stairs" } +func (BambooStairs) ID() string { return "minecraft:bamboo_stairs" } +func (BambooMosaicStairs) ID() string { return "minecraft:bamboo_mosaic_stairs" } func (SlimeBlock) ID() string { return "minecraft:slime_block" } func (Barrier) ID() string { return "minecraft:barrier" } func (Light) ID() string { return "minecraft:light" } @@ -3393,6 +3604,8 @@ func (JungleSlab) ID() string { return "minecraft:jungle_slab" func (AcaciaSlab) ID() string { return "minecraft:acacia_slab" } func (DarkOakSlab) ID() string { return "minecraft:dark_oak_slab" } func (MangroveSlab) ID() string { return "minecraft:mangrove_slab" } +func (BambooSlab) ID() string { return "minecraft:bamboo_slab" } +func (BambooMosaicSlab) ID() string { return "minecraft:bamboo_mosaic_slab" } func (StoneSlab) ID() string { return "minecraft:stone_slab" } func (SmoothStoneSlab) ID() string { return "minecraft:smooth_stone_slab" } func (SandstoneSlab) ID() string { return "minecraft:sandstone_slab" } @@ -3417,18 +3630,21 @@ func (JungleFenceGate) ID() string { return "minecraft:jungle_fence_ func (AcaciaFenceGate) ID() string { return "minecraft:acacia_fence_gate" } func (DarkOakFenceGate) ID() string { return "minecraft:dark_oak_fence_gate" } func (MangroveFenceGate) ID() string { return "minecraft:mangrove_fence_gate" } +func (BambooFenceGate) ID() string { return "minecraft:bamboo_fence_gate" } func (SpruceFence) ID() string { return "minecraft:spruce_fence" } func (BirchFence) ID() string { return "minecraft:birch_fence" } func (JungleFence) ID() string { return "minecraft:jungle_fence" } func (AcaciaFence) ID() string { return "minecraft:acacia_fence" } func (DarkOakFence) ID() string { return "minecraft:dark_oak_fence" } func (MangroveFence) ID() string { return "minecraft:mangrove_fence" } +func (BambooFence) ID() string { return "minecraft:bamboo_fence" } func (SpruceDoor) ID() string { return "minecraft:spruce_door" } func (BirchDoor) ID() string { return "minecraft:birch_door" } func (JungleDoor) ID() string { return "minecraft:jungle_door" } func (AcaciaDoor) ID() string { return "minecraft:acacia_door" } func (DarkOakDoor) ID() string { return "minecraft:dark_oak_door" } func (MangroveDoor) ID() string { return "minecraft:mangrove_door" } +func (BambooDoor) ID() string { return "minecraft:bamboo_door" } func (EndRod) ID() string { return "minecraft:end_rod" } func (ChorusPlant) ID() string { return "minecraft:chorus_plant" } func (ChorusFlower) ID() string { return "minecraft:chorus_flower" } @@ -3862,6 +4078,8 @@ var FromID = map[string]Block{ "minecraft:acacia_planks": AcaciaPlanks{}, "minecraft:dark_oak_planks": DarkOakPlanks{}, "minecraft:mangrove_planks": MangrovePlanks{}, + "minecraft:bamboo_planks": BambooPlanks{}, + "minecraft:bamboo_mosaic": BambooMosaic{}, "minecraft:oak_sapling": OakSapling{}, "minecraft:spruce_sapling": SpruceSapling{}, "minecraft:birch_sapling": BirchSapling{}, @@ -3891,6 +4109,7 @@ var FromID = map[string]Block{ "minecraft:mangrove_log": MangroveLog{}, "minecraft:mangrove_roots": MangroveRoots{}, "minecraft:muddy_mangrove_roots": MuddyMangroveRoots{}, + "minecraft:bamboo_block": BambooBlock{}, "minecraft:stripped_spruce_log": StrippedSpruceLog{}, "minecraft:stripped_birch_log": StrippedBirchLog{}, "minecraft:stripped_jungle_log": StrippedJungleLog{}, @@ -3898,6 +4117,7 @@ var FromID = map[string]Block{ "minecraft:stripped_dark_oak_log": StrippedDarkOakLog{}, "minecraft:stripped_oak_log": StrippedOakLog{}, "minecraft:stripped_mangrove_log": StrippedMangroveLog{}, + "minecraft:stripped_bamboo_block": StrippedBambooBlock{}, "minecraft:oak_wood": OakWood{}, "minecraft:spruce_wood": SpruceWood{}, "minecraft:birch_wood": BirchWood{}, @@ -3996,6 +4216,7 @@ var FromID = map[string]Block{ "minecraft:bricks": Bricks{}, "minecraft:tnt": Tnt{}, "minecraft:bookshelf": Bookshelf{}, + "minecraft:chiseled_bookshelf": ChiseledBookshelf{}, "minecraft:mossy_cobblestone": MossyCobblestone{}, "minecraft:obsidian": Obsidian{}, "minecraft:torch": Torch{}, @@ -4020,6 +4241,7 @@ var FromID = map[string]Block{ "minecraft:jungle_sign": JungleSign{}, "minecraft:dark_oak_sign": DarkOakSign{}, "minecraft:mangrove_sign": MangroveSign{}, + "minecraft:bamboo_sign": BambooSign{}, "minecraft:oak_door": OakDoor{}, "minecraft:ladder": Ladder{}, "minecraft:rail": Rail{}, @@ -4031,6 +4253,27 @@ var FromID = map[string]Block{ "minecraft:jungle_wall_sign": JungleWallSign{}, "minecraft:dark_oak_wall_sign": DarkOakWallSign{}, "minecraft:mangrove_wall_sign": MangroveWallSign{}, + "minecraft:bamboo_wall_sign": BambooWallSign{}, + "minecraft:oak_hanging_sign": OakHangingSign{}, + "minecraft:spruce_hanging_sign": SpruceHangingSign{}, + "minecraft:birch_hanging_sign": BirchHangingSign{}, + "minecraft:acacia_hanging_sign": AcaciaHangingSign{}, + "minecraft:jungle_hanging_sign": JungleHangingSign{}, + "minecraft:dark_oak_hanging_sign": DarkOakHangingSign{}, + "minecraft:crimson_hanging_sign": CrimsonHangingSign{}, + "minecraft:warped_hanging_sign": WarpedHangingSign{}, + "minecraft:mangrove_hanging_sign": MangroveHangingSign{}, + "minecraft:bamboo_hanging_sign": BambooHangingSign{}, + "minecraft:oak_wall_hanging_sign": OakWallHangingSign{}, + "minecraft:spruce_wall_hanging_sign": SpruceWallHangingSign{}, + "minecraft:birch_wall_hanging_sign": BirchWallHangingSign{}, + "minecraft:acacia_wall_hanging_sign": AcaciaWallHangingSign{}, + "minecraft:jungle_wall_hanging_sign": JungleWallHangingSign{}, + "minecraft:dark_oak_wall_hanging_sign": DarkOakWallHangingSign{}, + "minecraft:mangrove_wall_hanging_sign": MangroveWallHangingSign{}, + "minecraft:crimson_wall_hanging_sign": CrimsonWallHangingSign{}, + "minecraft:warped_wall_hanging_sign": WarpedWallHangingSign{}, + "minecraft:bamboo_wall_hanging_sign": BambooWallHangingSign{}, "minecraft:lever": Lever{}, "minecraft:stone_pressure_plate": StonePressurePlate{}, "minecraft:iron_door": IronDoor{}, @@ -4041,6 +4284,7 @@ var FromID = map[string]Block{ "minecraft:acacia_pressure_plate": AcaciaPressurePlate{}, "minecraft:dark_oak_pressure_plate": DarkOakPressurePlate{}, "minecraft:mangrove_pressure_plate": MangrovePressurePlate{}, + "minecraft:bamboo_pressure_plate": BambooPressurePlate{}, "minecraft:redstone_ore": RedstoneOre{}, "minecraft:deepslate_redstone_ore": DeepslateRedstoneOre{}, "minecraft:redstone_torch": RedstoneTorch{}, @@ -4091,6 +4335,7 @@ var FromID = map[string]Block{ "minecraft:acacia_trapdoor": AcaciaTrapdoor{}, "minecraft:dark_oak_trapdoor": DarkOakTrapdoor{}, "minecraft:mangrove_trapdoor": MangroveTrapdoor{}, + "minecraft:bamboo_trapdoor": BambooTrapdoor{}, "minecraft:stone_bricks": StoneBricks{}, "minecraft:mossy_stone_bricks": MossyStoneBricks{}, "minecraft:cracked_stone_bricks": CrackedStoneBricks{}, @@ -4187,6 +4432,7 @@ var FromID = map[string]Block{ "minecraft:acacia_button": AcaciaButton{}, "minecraft:dark_oak_button": DarkOakButton{}, "minecraft:mangrove_button": MangroveButton{}, + "minecraft:bamboo_button": BambooButton{}, "minecraft:skeleton_skull": SkeletonSkull{}, "minecraft:skeleton_wall_skull": SkeletonWallSkull{}, "minecraft:wither_skeleton_skull": WitherSkeletonSkull{}, @@ -4199,6 +4445,8 @@ var FromID = map[string]Block{ "minecraft:creeper_wall_head": CreeperWallHead{}, "minecraft:dragon_head": DragonHead{}, "minecraft:dragon_wall_head": DragonWallHead{}, + "minecraft:piglin_head": PiglinHead{}, + "minecraft:piglin_wall_head": PiglinWallHead{}, "minecraft:anvil": Anvil{}, "minecraft:chipped_anvil": ChippedAnvil{}, "minecraft:damaged_anvil": DamagedAnvil{}, @@ -4251,6 +4499,8 @@ var FromID = map[string]Block{ "minecraft:acacia_stairs": AcaciaStairs{}, "minecraft:dark_oak_stairs": DarkOakStairs{}, "minecraft:mangrove_stairs": MangroveStairs{}, + "minecraft:bamboo_stairs": BambooStairs{}, + "minecraft:bamboo_mosaic_stairs": BambooMosaicStairs{}, "minecraft:slime_block": SlimeBlock{}, "minecraft:barrier": Barrier{}, "minecraft:light": Light{}, @@ -4334,6 +4584,8 @@ var FromID = map[string]Block{ "minecraft:acacia_slab": AcaciaSlab{}, "minecraft:dark_oak_slab": DarkOakSlab{}, "minecraft:mangrove_slab": MangroveSlab{}, + "minecraft:bamboo_slab": BambooSlab{}, + "minecraft:bamboo_mosaic_slab": BambooMosaicSlab{}, "minecraft:stone_slab": StoneSlab{}, "minecraft:smooth_stone_slab": SmoothStoneSlab{}, "minecraft:sandstone_slab": SandstoneSlab{}, @@ -4358,18 +4610,21 @@ var FromID = map[string]Block{ "minecraft:acacia_fence_gate": AcaciaFenceGate{}, "minecraft:dark_oak_fence_gate": DarkOakFenceGate{}, "minecraft:mangrove_fence_gate": MangroveFenceGate{}, + "minecraft:bamboo_fence_gate": BambooFenceGate{}, "minecraft:spruce_fence": SpruceFence{}, "minecraft:birch_fence": BirchFence{}, "minecraft:jungle_fence": JungleFence{}, "minecraft:acacia_fence": AcaciaFence{}, "minecraft:dark_oak_fence": DarkOakFence{}, "minecraft:mangrove_fence": MangroveFence{}, + "minecraft:bamboo_fence": BambooFence{}, "minecraft:spruce_door": SpruceDoor{}, "minecraft:birch_door": BirchDoor{}, "minecraft:jungle_door": JungleDoor{}, "minecraft:acacia_door": AcaciaDoor{}, "minecraft:dark_oak_door": DarkOakDoor{}, "minecraft:mangrove_door": MangroveDoor{}, + "minecraft:bamboo_door": BambooDoor{}, "minecraft:end_rod": EndRod{}, "minecraft:chorus_plant": ChorusPlant{}, "minecraft:chorus_flower": ChorusFlower{}, diff --git a/level/block/blocks.nbt b/level/block/blocks.nbt index 8efc4cd..f79dbe4 100644 Binary files a/level/block/blocks.nbt and b/level/block/blocks.nbt differ diff --git a/level/block/generator/Main.java b/level/block/generator/Main.java index d521fb9..ccb25fd 100644 --- a/level/block/generator/Main.java +++ b/level/block/generator/Main.java @@ -1,10 +1,8 @@ -// This file is used to generate blocks.nbt and block_states.nbt -// The necessary environment can be generated from https://github.com/Hexeption/MCP-Reborn package tnze.github.com; import com.google.common.collect.ImmutableMap; import net.minecraft.SharedConstants; -import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtIo; @@ -31,13 +29,13 @@ public class Main { Blocks.rebuildCache(); try (FileOutputStream f = new FileOutputStream("blocks.nbt")) { - try (GZIPOutputStream g = new GZIPOutputStream(f)){ + try (GZIPOutputStream g = new GZIPOutputStream(f)) { DataOutput writer = new DataOutputStream(g); NbtIo.writeUnnamedTag(getBlocksWithMeta(), writer); } } try (FileOutputStream f = new FileOutputStream("block_states.nbt")) { - try (GZIPOutputStream g = new GZIPOutputStream(f)){ + try (GZIPOutputStream g = new GZIPOutputStream(f)) { DataOutput writer = new DataOutputStream(g); NbtIo.writeUnnamedTag(getBlockStates(), writer); } @@ -46,10 +44,10 @@ public class Main { private static ListTag getBlocksWithMeta() throws Exception { ListTag list = new ListTag(); - for (Block block : Registry.BLOCK) { + for (Block block : BuiltInRegistries.BLOCK) { BlockState state = block.defaultBlockState(); CompoundTag b = new CompoundTag(); - b.putString("Name", Registry.BLOCK.getKey(block).toString()); + b.putString("Name", BuiltInRegistries.BLOCK.getKey(block).toString()); ImmutableMap, Comparable> values = state.getValues(); if (!values.isEmpty()) { CompoundTag meta = new CompoundTag(); diff --git a/level/block/generator/blocks/blocks.go.tmpl b/level/block/generator/blocks/blocks.go.tmpl index 4ba8339..584a6da 100644 --- a/level/block/generator/blocks/blocks.go.tmpl +++ b/level/block/generator/blocks/blocks.go.tmpl @@ -1,4 +1,5 @@ // Code generated by {{Generator}}; DO NOT EDIT. + package block type ( diff --git a/level/palette_test.go b/level/palette_test.go index 689a164..02ade33 100644 --- a/level/palette_test.go +++ b/level/palette_test.go @@ -14,7 +14,7 @@ func TestPaletteContainer_seq(t *testing.T) { } for i := 0; i < 4096; i++ { if container.Get(i) != BlocksState(i) { - t.Errorf("Get Error, got: %v,but expect: %v", container.Get(i), BlocksState(i)) + t.Errorf("Get Error, got: %v, but expect: %v", container.Get(i), BlocksState(i)) } } }