diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index f961288e..53eab199 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -13,8 +13,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import java.util.zip.GZIPInputStream; import java.util.zip.InflaterInputStream; @@ -27,7 +25,6 @@ import common.block.artificial.BlockCarpet; import common.block.artificial.BlockDoor; import common.block.artificial.BlockDoor.EnumDoorHalf; import common.block.artificial.BlockDoor.EnumHingePosition; -import common.block.artificial.BlockFence; import common.block.artificial.BlockFenceGate; import common.block.artificial.BlockHay; import common.block.artificial.BlockLadder; @@ -38,7 +35,6 @@ import common.block.artificial.BlockStainedGlass; import common.block.artificial.BlockStainedGlassPane; import common.block.artificial.BlockStairs; import common.block.artificial.BlockStairs.EnumHalf; -import common.block.artificial.BlockStairs.EnumShape; import common.block.artificial.BlockTrapDoor; import common.block.artificial.BlockTrapDoor.DoorHalf; import common.block.artificial.BlockWool; @@ -88,7 +84,6 @@ import common.block.tech.BlockRedstoneComparator.Mode; import common.block.tech.BlockRedstoneRepeater; import common.block.tech.BlockRedstoneTorch; import common.block.tech.BlockRedstoneWire; -import common.block.tech.BlockRedstoneWire.EnumAttachPosition; import common.block.tech.BlockTNT; import common.block.tech.BlockTripWire; import common.block.tech.BlockTripWireHook; @@ -99,7 +94,6 @@ import common.block.tile.BlockStandingSign; import common.block.tile.BlockWallSign; import common.collect.Lists; import common.collect.Maps; -import common.collect.Sets; import common.color.DyeColor; import common.entity.Entity; import common.entity.animal.EntityBat; @@ -115,13 +109,10 @@ import common.entity.animal.EntitySquid; import common.entity.animal.EntityWolf; import common.entity.item.EntityBoat; import common.entity.item.EntityMinecart; -import common.init.BlockRegistry; import common.init.Blocks; import common.init.EntityRegistry; import common.init.TileRegistry; import common.log.Log; -import common.properties.Property; -import common.properties.PropertyEnum; import common.rng.Random; import common.tags.TagObject; import common.tileentity.TileEntity; @@ -139,7 +130,6 @@ import common.tileentity.TileEntitySign; import common.util.Facing; import common.util.Facing.Axis; import common.util.NibbleArray; -import common.util.Util; import common.world.State; public abstract class Converter { @@ -337,8 +327,6 @@ public abstract class Converter { } private static void mapBlock(State state, int id, int data) { - if(BLOCK_MAP[(id << 4) | data] != 0) - Log.IO.debug("Remap: %s -> %d:%d", state.getId(), id, data); BLOCK_MAP[(id << 4) | data] = (char)State.ID_MAP.get(state); } @@ -690,7 +678,7 @@ public abstract class Converter { mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 5, 13); mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 6, 14); mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 7, 15); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 54, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 54); mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 54, 3, 9, 15); mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 54, 4, 10); mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 54, 5, 11); @@ -713,7 +701,7 @@ public abstract class Converter { mapBlock(Blocks.diamond_ore, 56); mapBlock(Blocks.diamond_block, 57); mapBlock(Blocks.workbench, 58); - mapBlock(Blocks.wheat.getState().withProperty(BlockCrops.AGE, 0), 59, 0, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.wheat.getState().withProperty(BlockCrops.AGE, 0), 59); mapBlock(Blocks.wheat.getState().withProperty(BlockCrops.AGE, 1), 59, 1); mapBlock(Blocks.wheat.getState().withProperty(BlockCrops.AGE, 2), 59, 2); mapBlock(Blocks.wheat.getState().withProperty(BlockCrops.AGE, 3), 59, 3); @@ -729,11 +717,11 @@ public abstract class Converter { mapBlock(Blocks.farmland.getState().withProperty(BlockFarmland.MOISTURE, 5), 60, 5, 13); mapBlock(Blocks.farmland.getState().withProperty(BlockFarmland.MOISTURE, 6), 60, 6, 14); mapBlock(Blocks.farmland.getState().withProperty(BlockFarmland.MOISTURE, 7), 60, 7, 15); - mapBlock(Blocks.furnace.getState().withProperty(BlockFurnace.FACING, Facing.NORTH), 61, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.furnace.getState().withProperty(BlockFurnace.FACING, Facing.NORTH), 61); mapBlock(Blocks.furnace.getState().withProperty(BlockFurnace.FACING, Facing.SOUTH), 61, 3, 9, 15); mapBlock(Blocks.furnace.getState().withProperty(BlockFurnace.FACING, Facing.WEST), 61, 4, 10); mapBlock(Blocks.furnace.getState().withProperty(BlockFurnace.FACING, Facing.EAST), 61, 5, 11); - mapBlock(Blocks.lit_furnace.getState().withProperty(BlockFurnace.FACING, Facing.NORTH), 62, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.lit_furnace.getState().withProperty(BlockFurnace.FACING, Facing.NORTH), 62); mapBlock(Blocks.lit_furnace.getState().withProperty(BlockFurnace.FACING, Facing.SOUTH), 62, 3, 9, 15); mapBlock(Blocks.lit_furnace.getState().withProperty(BlockFurnace.FACING, Facing.WEST), 62, 4, 10); mapBlock(Blocks.lit_furnace.getState().withProperty(BlockFurnace.FACING, Facing.EAST), 62, 5, 11); @@ -765,11 +753,11 @@ public abstract class Converter { mapBlock(Blocks.oak_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.RIGHT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, false), 64, 9, 13); mapBlock(Blocks.oak_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, true), 64, 10, 14); mapBlock(Blocks.oak_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.RIGHT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, true), 64, 11, 15); - mapBlock(Blocks.ladder.getState().withProperty(BlockLadder.FACING, Facing.NORTH), 65, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.ladder.getState().withProperty(BlockLadder.FACING, Facing.NORTH), 65); mapBlock(Blocks.ladder.getState().withProperty(BlockLadder.FACING, Facing.SOUTH), 65, 3, 9, 15); mapBlock(Blocks.ladder.getState().withProperty(BlockLadder.FACING, Facing.WEST), 65, 4, 10); mapBlock(Blocks.ladder.getState().withProperty(BlockLadder.FACING, Facing.EAST), 65, 5, 11); - mapBlock(Blocks.rail.getState().withProperty(BlockRail.SHAPE, EnumRailDirection.NORTH_SOUTH), 66, 0, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.rail.getState().withProperty(BlockRail.SHAPE, EnumRailDirection.NORTH_SOUTH), 66); mapBlock(Blocks.rail.getState().withProperty(BlockRail.SHAPE, EnumRailDirection.EAST_WEST), 66, 1); mapBlock(Blocks.rail.getState().withProperty(BlockRail.SHAPE, EnumRailDirection.ASCENDING_EAST), 66, 2); mapBlock(Blocks.rail.getState().withProperty(BlockRail.SHAPE, EnumRailDirection.ASCENDING_WEST), 66, 3); @@ -787,7 +775,7 @@ public abstract class Converter { mapBlock(Blocks.cobblestone_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 67, 5, 13); mapBlock(Blocks.cobblestone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 67, 6, 14); mapBlock(Blocks.cobblestone_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 67, 7, 15); - mapBlock(Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, Facing.NORTH), 68, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, Facing.NORTH), 68); mapBlock(Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, Facing.SOUTH), 68, 3, 9, 15); mapBlock(Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, Facing.WEST), 68, 4, 10); mapBlock(Blocks.wall_sign.getState().withProperty(BlockWallSign.FACING, Facing.EAST), 68, 5, 11); @@ -807,7 +795,7 @@ public abstract class Converter { mapBlock(Blocks.lever.getState().withProperty(BlockLever.FACING, EnumOrientation.UP_Z).withProperty(BlockLever.POWERED, true), 69, 13); mapBlock(Blocks.lever.getState().withProperty(BlockLever.FACING, EnumOrientation.UP_X).withProperty(BlockLever.POWERED, true), 69, 14); mapBlock(Blocks.lever.getState().withProperty(BlockLever.FACING, EnumOrientation.DOWN_Z).withProperty(BlockLever.POWERED, true), 69, 15); - mapBlock(Blocks.stone_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, false), 70, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.stone_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, false), 70); mapBlock(Blocks.stone_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, true), 70, 1); mapBlock(Blocks.iron_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), 71, 0); mapBlock(Blocks.iron_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), 71, 1); @@ -821,16 +809,16 @@ public abstract class Converter { mapBlock(Blocks.iron_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.RIGHT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, false), 71, 9, 13); mapBlock(Blocks.iron_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.LEFT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, true), 71, 10, 14); mapBlock(Blocks.iron_door.getState().withProperty(BlockDoor.FACING, Facing.NORTH).withProperty(BlockDoor.HALF, EnumDoorHalf.UPPER).withProperty(BlockDoor.HINGE, EnumHingePosition.RIGHT).withProperty(BlockDoor.OPEN, false).withProperty(BlockDoor.POWERED, true), 71, 11, 15); - mapBlock(Blocks.wooden_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, false), 72, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.wooden_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, false), 72); mapBlock(Blocks.wooden_pressure_plate.getState().withProperty(BlockPressurePlate.POWERED, true), 72, 1); mapBlock(Blocks.redstone_ore, 73); mapBlock(Blocks.lit_redstone_ore, 74); - mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.UP), 75, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.UP), 75); mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.EAST), 75, 1); mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.WEST), 75, 2); mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.SOUTH), 75, 3); mapBlock(Blocks.unlit_redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.NORTH), 75, 4); - mapBlock(Blocks.redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.UP), 76, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.UP), 76); mapBlock(Blocks.redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.EAST), 76, 1); mapBlock(Blocks.redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.WEST), 76, 2); mapBlock(Blocks.redstone_torch.getState().withProperty(BlockRedstoneTorch.FACING, Facing.SOUTH), 76, 3); @@ -893,7 +881,7 @@ public abstract class Converter { 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); mapBlock(Blocks.lit_pumpkin.getState().withProperty(BlockPumpkin.FACING, Facing.EAST), 91, 3, 7, 11, 15); - mapBlock(Blocks.cake.getState().withProperty(BlockCake.BITES, 0), 92, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.cake.getState().withProperty(BlockCake.BITES, 0), 92); mapBlock(Blocks.cake.getState().withProperty(BlockCake.BITES, 1), 92, 1); mapBlock(Blocks.cake.getState().withProperty(BlockCake.BITES, 2), 92, 2); mapBlock(Blocks.cake.getState().withProperty(BlockCake.BITES, 3), 92, 3); @@ -963,7 +951,7 @@ public abstract class Converter { mapBlock(Blocks.mossy_stonebrick.getState(), 98, 1); mapBlock(Blocks.cracked_stonebrick.getState(), 98, 2); mapBlock(Blocks.carved_stonebrick.getState(), 98, 3); - mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_INSIDE), 99, 0, 11, 12, 13); + 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); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH_EAST), 99, 3); @@ -976,7 +964,7 @@ public abstract class Converter { mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.STEM), 99, 10); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_OUTSIDE), 99, 14); mapBlock(Blocks.brown_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_STEM), 99, 15); - mapBlock(Blocks.red_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_INSIDE), 100, 0, 11, 12, 13); + mapBlock(Blocks.red_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.ALL_INSIDE), 100); mapBlock(Blocks.red_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH_WEST), 100, 1); mapBlock(Blocks.red_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH), 100, 2); mapBlock(Blocks.red_mushroom_block.getState().withProperty(BlockHugeMushroom.VARIANT, EnumType.NORTH_EAST), 100, 3); @@ -992,7 +980,7 @@ public abstract class Converter { mapBlock(Blocks.iron_bars, 101); mapBlock(Blocks.glass_pane, 102); mapBlock(Blocks.melon_block, 103); - mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 0), 104, 0, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 0), 104); mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 1), 104, 1); mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 2), 104, 2); mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 3), 104, 3); @@ -1000,7 +988,7 @@ public abstract class Converter { mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 5), 104, 5); mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 6), 104, 6); mapBlock(Blocks.pumpkin_stem.getState().withProperty(BlockStem.AGE, 7), 104, 7); - mapBlock(Blocks.melon_stem.getState().withProperty(BlockStem.AGE, 0), 105, 0, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.melon_stem.getState().withProperty(BlockStem.AGE, 0), 105); mapBlock(Blocks.melon_stem.getState().withProperty(BlockStem.AGE, 1), 105, 1); mapBlock(Blocks.melon_stem.getState().withProperty(BlockStem.AGE, 2), 105, 2); mapBlock(Blocks.melon_stem.getState().withProperty(BlockStem.AGE, 3), 105, 3); @@ -1071,7 +1059,7 @@ public abstract class Converter { mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 5, 13); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 6, 14); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 7, 15); - mapBlock(Blocks.soul_wart.getState().withProperty(BlockWart.AGE, 0), 115, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.soul_wart.getState().withProperty(BlockWart.AGE, 0), 115); mapBlock(Blocks.soul_wart.getState().withProperty(BlockWart.AGE, 1), 115, 1); mapBlock(Blocks.soul_wart.getState().withProperty(BlockWart.AGE, 2), 115, 2); mapBlock(Blocks.soul_wart.getState().withProperty(BlockWart.AGE, 3), 115, 3); @@ -1084,7 +1072,7 @@ public abstract class Converter { mapBlock(Blocks.brewing_stand.getState().withProperty(BlockBrewingStand.HAS_BOTTLE_0, true).withProperty(BlockBrewingStand.HAS_BOTTLE_1, false).withProperty(BlockBrewingStand.HAS_BOTTLE_2, true), 117, 5, 13); mapBlock(Blocks.brewing_stand.getState().withProperty(BlockBrewingStand.HAS_BOTTLE_0, false).withProperty(BlockBrewingStand.HAS_BOTTLE_1, true).withProperty(BlockBrewingStand.HAS_BOTTLE_2, true), 117, 6, 14); mapBlock(Blocks.brewing_stand.getState().withProperty(BlockBrewingStand.HAS_BOTTLE_0, true).withProperty(BlockBrewingStand.HAS_BOTTLE_1, true).withProperty(BlockBrewingStand.HAS_BOTTLE_2, true), 117, 7, 15); - mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 0), 118, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 0), 118); 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); @@ -1151,7 +1139,7 @@ public abstract class Converter { mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 128, 6, 14); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 128, 7, 15); mapBlock(Blocks.emerald_ore, 129); - mapBlock(Blocks.warp_chest.getState().withProperty(BlockWarpChest.FACING, Facing.NORTH), 130, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.warp_chest.getState().withProperty(BlockWarpChest.FACING, Facing.NORTH), 130); mapBlock(Blocks.warp_chest.getState().withProperty(BlockWarpChest.FACING, Facing.SOUTH), 130, 3, 9, 15); mapBlock(Blocks.warp_chest.getState().withProperty(BlockWarpChest.FACING, Facing.WEST), 130, 4, 10); mapBlock(Blocks.warp_chest.getState().withProperty(BlockWarpChest.FACING, Facing.EAST), 130, 5, 11); @@ -1217,7 +1205,7 @@ public abstract class Converter { mapBlock(Blocks.cobblestone_wall.getState(), 139); mapBlock(Blocks.mossy_cobblestone_wall.getState(), 139, 1); mapBlock(Blocks.flowerpot.getState(), 140); - mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 0), 141, 0, 8, 9, 10, 11, 12, 13, 14, 15); + 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); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 3), 141, 3); @@ -1225,7 +1213,7 @@ public abstract class Converter { mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 5), 141, 5); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 6), 141, 6); mapBlock(Blocks.carrot.getState().withProperty(BlockCarrot.AGE, 7), 141, 7); - mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 0), 142, 0, 8, 9, 10, 11, 12, 13, 14, 15); + mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 0), 142); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 1), 142, 1); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 2), 142, 2); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 3), 142, 3); @@ -1253,7 +1241,7 @@ public abstract class Converter { mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.WEST), 145, 1, 5, 9, 13); mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.NORTH), 145, 2, 6, 10, 14); mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.EAST), 145, 3, 7, 11, 15); - mapBlock(Blocks.trapped_chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 146, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.trapped_chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 146); mapBlock(Blocks.trapped_chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 146, 3, 9, 15); mapBlock(Blocks.trapped_chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 146, 4, 10); mapBlock(Blocks.trapped_chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 146, 5, 11); @@ -1458,7 +1446,7 @@ public abstract class Converter { mapBlock(Blocks.smooth_rock.getState(), 168, 1); mapBlock(Blocks.black_brick, 168, 2); mapBlock(Blocks.lamp, 169); - mapBlock(Blocks.hay_block.getState().withProperty(BlockHay.AXIS, Axis.Y), 170, 0, 1, 2, 3, 12, 13, 14, 15); + mapBlock(Blocks.hay_block.getState().withProperty(BlockHay.AXIS, Axis.Y), 170); mapBlock(Blocks.hay_block.getState().withProperty(BlockHay.AXIS, Axis.X), 170, 4, 5, 6, 7); mapBlock(Blocks.hay_block.getState().withProperty(BlockHay.AXIS, Axis.Z), 170, 8, 9, 10, 11); mapBlock(new BlockFunction() { @@ -1491,7 +1479,7 @@ public abstract class Converter { mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 13), 176, 13); mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 14), 176, 14); mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 15), 176, 15); - mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.NORTH), 177, 0, 1, 2, 6, 7, 8, 12, 13, 14); + mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.NORTH), 177); mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.SOUTH), 177, 3, 9, 15); mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.WEST), 177, 4, 10); mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.EAST), 177, 5, 11); @@ -1693,7 +1681,7 @@ public abstract class Converter { mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP), 205, 8); mapBlock(Blocks.stonebrick.getState(), 206); - mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 0), 207, 0, 8, 9, 10, 11, 12, 13, 14, 15); + 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); mapBlock(Blocks.potato.getState().withProperty(BlockPotato.AGE, 3), 207, 3); @@ -1740,8 +1728,6 @@ public abstract class Converter { } }, 252); mapBlock(Blocks.obsidian, 255); - - Log.IO.debug("Hash: %08x", Arrays.hashCode(BLOCK_MAP)); // 7650fec9 } private static Object read(DataInput input, byte id) throws IOException {