From 0d8f7ea1c9d74e7b2621e61634fbd8c3b8985671 Mon Sep 17 00:00:00 2001 From: Sen Date: Thu, 26 Jun 2025 13:33:30 +0200 Subject: [PATCH] converter remove fixed block meta ids --- .../src/main/java/server/world/Converter.java | 112 +++++++++--------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index 53eab199..d3387cdb 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -384,17 +384,17 @@ public abstract class Converter { mapTile(TileEntityComparator.class, "Comparator", "comparator"); mapTile(TileEntityBanner.class, "Banner", "banner"); - mapBlock(Blocks.stone.getState(), 1); - mapBlock(Blocks.rock.getState(), 1, 1); - mapBlock(Blocks.smooth_rock.getState(), 1, 2); - mapBlock(Blocks.rock.getState(), 1, 3); - mapBlock(Blocks.smooth_rock.getState(), 1, 4); - mapBlock(Blocks.rock.getState(), 1, 5); - mapBlock(Blocks.smooth_rock.getState(), 1, 6); + mapBlock(Blocks.stone, 1); + mapBlock(Blocks.rock, 1, 1); + mapBlock(Blocks.smooth_rock, 1, 2); + mapBlock(Blocks.rock, 1, 3); + mapBlock(Blocks.smooth_rock, 1, 4); + mapBlock(Blocks.rock, 1, 5); + mapBlock(Blocks.smooth_rock, 1, 6); mapBlock(Blocks.grass, 2); - mapBlock(Blocks.dirt.getState(), 3); - mapBlock(Blocks.dirt.getState(), 3, 1); - mapBlock(Blocks.dirt.getState(), 3, 2); + mapBlock(Blocks.dirt, 3); + mapBlock(Blocks.coarse_dirt, 3, 1); + mapBlock(Blocks.podzol, 3, 2); mapBlock(Blocks.cobblestone, 4); mapBlock(Blocks.oak_planks, 5); mapBlock(Blocks.spruce_planks, 5, 1); @@ -429,8 +429,8 @@ public abstract class Converter { return Blocks.lava.getState().withProperty(BlockLiquid.LEVEL, data); } }, 11); - mapBlock(Blocks.sand.getState(), 12); - mapBlock(Blocks.red_sand.getState(), 12, 1); + mapBlock(Blocks.sand, 12); + mapBlock(Blocks.red_sand, 12, 1); mapBlock(Blocks.gravel, 13); mapBlock(Blocks.gold_ore, 14); mapBlock(Blocks.iron_ore, 15); @@ -499,9 +499,9 @@ public abstract class Converter { mapBlock(Blocks.dispenser.getState().withProperty(BlockDispenser.FACING, Facing.SOUTH).withProperty(BlockDispenser.TRIGGERED, true), 23, 11); mapBlock(Blocks.dispenser.getState().withProperty(BlockDispenser.FACING, Facing.WEST).withProperty(BlockDispenser.TRIGGERED, true), 23, 12); mapBlock(Blocks.dispenser.getState().withProperty(BlockDispenser.FACING, Facing.EAST).withProperty(BlockDispenser.TRIGGERED, true), 23, 13); - mapBlock(Blocks.sandstone.getState(), 24); - mapBlock(Blocks.carved_sandstone.getState(), 24, 1); - mapBlock(Blocks.smooth_sandstone.getState(), 24, 2); + mapBlock(Blocks.sandstone, 24); + mapBlock(Blocks.carved_sandstone, 24, 1); + mapBlock(Blocks.smooth_sandstone, 24, 2); mapBlock(Blocks.noteblock, 25); mapBlock(Blocks.red_bed.getState().withProperty(BlockBed.FACING, Facing.SOUTH).withProperty(BlockBed.PART, EnumPartType.FOOT), 26, 0, 4); mapBlock(Blocks.red_bed.getState().withProperty(BlockBed.FACING, Facing.WEST).withProperty(BlockBed.PART, EnumPartType.FOOT), 26, 1, 5); @@ -548,9 +548,9 @@ public abstract class Converter { mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.WEST), 29, 12); mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.EAST), 29, 13); mapBlock(Blocks.web, 30); - mapBlock(Blocks.dead_bush.getState(), 31); - mapBlock(Blocks.tallgrass.getState(), 31, 1); - mapBlock(Blocks.fern.getState(), 31, 2); + mapBlock(Blocks.dead_bush, 31); + mapBlock(Blocks.tallgrass, 31, 1); + mapBlock(Blocks.fern, 31, 2); mapBlock(Blocks.deadbush, 32); mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.DOWN), 33, 0, 7); mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.UP), 33, 1, 6); @@ -582,7 +582,7 @@ public abstract class Converter { } }, 35); mapBlock(Blocks.stone, 36); // mapBlockData(Blocks.piston_extension, 36); - mapBlock(Blocks.dandelion.getState(), 37); + mapBlock(Blocks.dandelion, 37); mapBlock(Blocks.poppy.getState(), 38); mapBlock(Blocks.blue_orchid.getState(), @@ -868,7 +868,7 @@ public abstract class Converter { mapBlock(Blocks.reeds.getState().withProperty(BlockReed.AGE, 14), 83, 14); mapBlock(Blocks.reeds.getState().withProperty(BlockReed.AGE, 15), 83, 15); mapBlock(Blocks.jukebox, 84); - mapBlock(Blocks.oak_fence.getState(), 85); + mapBlock(Blocks.oak_fence, 85); mapBlock(Blocks.pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.SOUTH), 86, 0, 4, 8, 12); mapBlock(Blocks.pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.WEST), 86, 1, 5, 9, 13); mapBlock(Blocks.pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.NORTH), 86, 2, 6, 10, 14); @@ -876,7 +876,7 @@ public abstract class Converter { mapBlock(Blocks.hellrock, 87); mapBlock(Blocks.soul_sand, 88); mapBlock(Blocks.glowstone, 89); - mapBlock(Blocks.purple_glass_pane.getState(), 90); + mapBlock(Blocks.purple_glass_pane, 90); mapBlock(Blocks.lit_pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.SOUTH), 91, 0, 4, 8, 12); mapBlock(Blocks.lit_pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.WEST), 91, 1, 5, 9, 13); mapBlock(Blocks.lit_pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.NORTH), 91, 2, 6, 10, 14); @@ -943,14 +943,14 @@ public abstract class Converter { mapBlock(Blocks.trapdoor.getState().withProperty(BlockTrapDoor.FACING, Facing.EAST).withProperty(BlockTrapDoor.HALF, DoorHalf.TOP).withProperty(BlockTrapDoor.OPEN, true), 96, 15); mapBlock(Blocks.stone, 97); mapBlock(Blocks.cobblestone, 97, 1); - mapBlock(Blocks.stonebrick.getState(), 97, 2); - mapBlock(Blocks.mossy_stonebrick.getState(), 97, 3); - mapBlock(Blocks.cracked_stonebrick.getState(), 97, 4); - mapBlock(Blocks.carved_stonebrick.getState(), 97, 5); - mapBlock(Blocks.stonebrick.getState(), 98); - mapBlock(Blocks.mossy_stonebrick.getState(), 98, 1); - mapBlock(Blocks.cracked_stonebrick.getState(), 98, 2); - mapBlock(Blocks.carved_stonebrick.getState(), 98, 3); + mapBlock(Blocks.stonebrick, 97, 2); + mapBlock(Blocks.mossy_stonebrick, 97, 3); + mapBlock(Blocks.cracked_stonebrick, 97, 4); + mapBlock(Blocks.carved_stonebrick, 97, 5); + mapBlock(Blocks.stonebrick, 98); + mapBlock(Blocks.mossy_stonebrick, 98, 1); + mapBlock(Blocks.cracked_stonebrick, 98, 2); + mapBlock(Blocks.carved_stonebrick, 98, 3); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_INSIDE), 99); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH_WEST), 99, 1); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH), 99, 2); @@ -1050,7 +1050,7 @@ public abstract class Converter { mapBlock(Blocks.waterlily.getState().withProperty(BlockLilyPad.FACING, Facing.NORTH), 111, 2, 6, 10, 14); mapBlock(Blocks.waterlily.getState().withProperty(BlockLilyPad.FACING, Facing.EAST), 111, 3, 7, 11, 15); mapBlock(Blocks.blood_brick, 112); - mapBlock(Blocks.blood_brick_fence.getState(), 113); + mapBlock(Blocks.blood_brick_fence, 113); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.EAST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 114, 0, 8); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 114, 1, 9); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 114, 2, 10); @@ -1076,7 +1076,7 @@ public abstract class Converter { mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 1), 118, 1); mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 2), 118, 2); mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 3), 118, 3); - mapBlock(Blocks.black_glass.getState(), 119); + mapBlock(Blocks.black_glass, 119); mapBlock(Blocks.obsidian, 120); mapBlock(Blocks.cell_rock, 121); mapBlock(Blocks.dragon_egg, 122); @@ -1202,9 +1202,9 @@ public abstract class Converter { mapBlock(Blocks.spruce_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 136, 7, 15); mapBlock(Blocks.obsidian, 137); mapBlock(Blocks.beacon, 138); - mapBlock(Blocks.cobblestone_wall.getState(), 139); - mapBlock(Blocks.mossy_cobblestone_wall.getState(), 139, 1); - mapBlock(Blocks.flowerpot.getState(), 140); + mapBlock(Blocks.cobblestone_wall, 139); + mapBlock(Blocks.mossy_cobblestone_wall, 139, 1); + mapBlock(Blocks.flowerpot, 140); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 0), 141); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 1), 141, 1); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 2), 141, 2); @@ -1337,8 +1337,8 @@ public abstract class Converter { mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.ENABLED, false).withProperty(BlockHopper.FACING, Facing.SOUTH), 154, 11); mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.ENABLED, false).withProperty(BlockHopper.FACING, Facing.WEST), 154, 12); mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.ENABLED, false).withProperty(BlockHopper.FACING, Facing.EAST), 154, 13); - mapBlock(Blocks.quartz_block.getState(), 155); - mapBlock(Blocks.quartz_ornaments.getState(), 155, 1); + mapBlock(Blocks.quartz_block, 155); + mapBlock(Blocks.quartz_ornaments, 155, 1); mapBlock(Blocks.quartz_pillar.getState().withProperty(BlockQuartzPillar.AXIS, Facing.Axis.Y), 155, 2); mapBlock(Blocks.quartz_pillar.getState().withProperty(BlockQuartzPillar.AXIS, Facing.Axis.X), 155, 3); mapBlock(Blocks.quartz_pillar.getState().withProperty(BlockQuartzPillar.AXIS, Facing.Axis.Z), 155, 4); @@ -1442,8 +1442,8 @@ public abstract class Converter { mapBlock(Blocks.iron_trapdoor.getState().withProperty(BlockTrapDoor.FACING, Facing.SOUTH).withProperty(BlockTrapDoor.HALF, DoorHalf.TOP).withProperty(BlockTrapDoor.OPEN, true), 167, 13); mapBlock(Blocks.iron_trapdoor.getState().withProperty(BlockTrapDoor.FACING, Facing.WEST).withProperty(BlockTrapDoor.HALF, DoorHalf.TOP).withProperty(BlockTrapDoor.OPEN, true), 167, 14); mapBlock(Blocks.iron_trapdoor.getState().withProperty(BlockTrapDoor.FACING, Facing.EAST).withProperty(BlockTrapDoor.HALF, DoorHalf.TOP).withProperty(BlockTrapDoor.OPEN, true), 167, 15); - mapBlock(Blocks.stonebrick.getState(), 168); - mapBlock(Blocks.smooth_rock.getState(), 168, 1); + mapBlock(Blocks.stonebrick, 168); + mapBlock(Blocks.smooth_rock, 168, 1); mapBlock(Blocks.black_brick, 168, 2); mapBlock(Blocks.lamp, 169); mapBlock(Blocks.hay_block.getState().withProperty(BlockHay.AXIS, Axis.Y), 170); @@ -1457,12 +1457,12 @@ public abstract class Converter { mapBlock(Blocks.hardened_clay, 172); mapBlock(Blocks.coal_block, 173); mapBlock(Blocks.packed_ice, 174); - mapBlock(Blocks.dandelion.getState(), 175, 0); - mapBlock(Blocks.blue_orchid.getState(), 175, 1); - mapBlock(Blocks.tallgrass.getState(), 175, 2); - mapBlock(Blocks.fern.getState(), 175, 3); - mapBlock(Blocks.rose.getState(), 175, 4); - mapBlock(Blocks.pink_tulip.getState(), 175, 5); + mapBlock(Blocks.dandelion, 175, 0); + mapBlock(Blocks.blue_orchid, 175, 1); + mapBlock(Blocks.tallgrass, 175, 2); + mapBlock(Blocks.fern, 175, 3); + mapBlock(Blocks.rose, 175, 4); + mapBlock(Blocks.pink_tulip, 175, 5); mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 0), 176, 0); mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 1), 176, 1); mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 2), 176, 2); @@ -1499,9 +1499,9 @@ public abstract class Converter { mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 13), 178, 13); mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 14), 178, 14); mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 15), 178, 15); - mapBlock(Blocks.sandstone.getState(), 179); - mapBlock(Blocks.carved_sandstone.getState(), 179, 1); - mapBlock(Blocks.smooth_sandstone.getState(), 179, 2); + mapBlock(Blocks.sandstone, 179); + mapBlock(Blocks.carved_sandstone, 179, 1); + mapBlock(Blocks.smooth_sandstone, 179, 2); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.EAST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 180, 0, 8); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 180, 1, 9); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 180, 2, 10); @@ -1596,11 +1596,11 @@ public abstract class Converter { mapBlock(Blocks.acacia_fence_gate.getState().withProperty(BlockFenceGate.FACING, Facing.WEST).withProperty(BlockFenceGate.OPEN, true).withProperty(BlockFenceGate.POWERED, true), 187, 13); mapBlock(Blocks.acacia_fence_gate.getState().withProperty(BlockFenceGate.FACING, Facing.NORTH).withProperty(BlockFenceGate.OPEN, true).withProperty(BlockFenceGate.POWERED, true), 187, 14); mapBlock(Blocks.acacia_fence_gate.getState().withProperty(BlockFenceGate.FACING, Facing.EAST).withProperty(BlockFenceGate.OPEN, true).withProperty(BlockFenceGate.POWERED, true), 187, 15); - mapBlock(Blocks.spruce_fence.getState(), 188); - mapBlock(Blocks.birch_fence.getState(), 189); - mapBlock(Blocks.jungle_fence.getState(), 190); - mapBlock(Blocks.dark_oak_fence.getState(), 191); - mapBlock(Blocks.acacia_fence.getState(), 192); + mapBlock(Blocks.spruce_fence, 188); + mapBlock(Blocks.birch_fence, 189); + mapBlock(Blocks.jungle_fence, 190); + mapBlock(Blocks.dark_oak_fence, 191); + mapBlock(Blocks.acacia_fence, 192); mapBlock(Blocks.spruce_door.getState().withProperty(BlockDoor.FACING, Facing.EAST).withProperty(BlockDoor.HALF, EnumDoorHalf.LOWER).withProperty(BlockDoor.HINGE, EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, false), 193, 0); mapBlock(Blocks.spruce_door.getState().withProperty(BlockDoor.FACING, Facing.SOUTH).withProperty(BlockDoor.HALF, EnumDoorHalf.LOWER).withProperty(BlockDoor.HINGE, EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, false), 193, 1); mapBlock(Blocks.spruce_door.getState().withProperty(BlockDoor.FACING, Facing.WEST).withProperty(BlockDoor.HALF, EnumDoorHalf.LOWER).withProperty(BlockDoor.HINGE, EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, false), 193, 2); @@ -1665,7 +1665,7 @@ public abstract class Converter { mapBlock(Blocks.iron_bars, 198); mapBlock(Blocks.glass_pane, 199); mapBlock(Blocks.glass_pane, 200); - mapBlock(Blocks.quartz_block.getState(), 201); + mapBlock(Blocks.quartz_block, 201); mapBlock(Blocks.quartz_pillar.getState().withProperty(BlockQuartzPillar.AXIS, Facing.Axis.Y), 202); mapBlock(Blocks.quartz_stairs.getState().withProperty(BlockStairs.FACING, Facing.EAST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 203, 0, 8); mapBlock(Blocks.quartz_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 203, 1, 9); @@ -1680,7 +1680,7 @@ public abstract class Converter { 205); mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP), 205, 8); - mapBlock(Blocks.stonebrick.getState(), 206); + mapBlock(Blocks.stonebrick, 206); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 0), 207); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 1), 207, 1); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 2), 207, 2); @@ -1690,14 +1690,14 @@ public abstract class Converter { mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 6), 207, 6); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 7), 207, 7); mapBlock(Blocks.farmland, 208); - mapBlock(Blocks.black_glass.getState(), 209); + mapBlock(Blocks.black_glass, 209); mapBlock(Blocks.obsidian, 210); mapBlock(Blocks.obsidian, 211); mapBlock(Blocks.ice, 212); mapBlock(Blocks.hellrock, 213); mapBlock(Blocks.red_mushroom_block, 214); mapBlock(Blocks.blood_brick, 215); - mapBlock(Blocks.quartz_block.getState(), 216); + mapBlock(Blocks.quartz_block, 216); mapBlock(Blocks.glass, 217); mapBlock(Blocks.dropper.getState().withProperty(BlockDropper.FACING, Facing.DOWN).withProperty(BlockDropper.TRIGGERED, false), 218, 0, 6); mapBlock(Blocks.dropper.getState().withProperty(BlockDropper.FACING, Facing.UP).withProperty(BlockDropper.TRIGGERED, false), 218, 1, 7);