diff --git a/common/src/main/java/common/entity/item/EntityItem.java b/common/src/main/java/common/entity/item/EntityItem.java index ab34b011..c124c282 100755 --- a/common/src/main/java/common/entity/item/EntityItem.java +++ b/common/src/main/java/common/entity/item/EntityItem.java @@ -7,7 +7,6 @@ import common.entity.Entity; import common.entity.EntityType; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; -import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; import common.init.SoundEvent; diff --git a/common/src/main/java/common/entity/projectile/FishConstants.java b/common/src/main/java/common/entity/projectile/FishConstants.java index 3db7127b..e43f5017 100644 --- a/common/src/main/java/common/entity/projectile/FishConstants.java +++ b/common/src/main/java/common/entity/projectile/FishConstants.java @@ -1,6 +1,5 @@ package common.entity.projectile; -import common.init.Blocks; import common.init.Items; import common.item.ItemStack; import common.rng.WeightedList; diff --git a/common/src/main/java/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java index 7c253c6b..3b32785e 100755 --- a/common/src/main/java/common/tileentity/TileEntityBanner.java +++ b/common/src/main/java/common/tileentity/TileEntityBanner.java @@ -4,7 +4,6 @@ import java.util.List; import common.collect.Lists; import common.color.DyeColor; -import common.init.Blocks; import common.init.Items; import common.item.ItemStack; import common.network.Packet; diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index 37eb8fc5..3475da97 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -20,22 +20,17 @@ import java.util.zip.InflaterInputStream; import common.biome.Biome; import common.block.Block; import common.block.artificial.BlockCarpet; -import common.block.artificial.BlockFlowerPot; -import common.block.artificial.BlockQuartz; +import common.block.artificial.BlockQuartzPillar; import common.block.artificial.BlockSlab; import common.block.artificial.BlockStainedGlass; import common.block.artificial.BlockStainedGlassPane; -import common.block.artificial.BlockWall; import common.block.artificial.BlockWool; import common.block.foliage.BlockCactus; -import common.block.foliage.BlockFlower; import common.block.foliage.BlockLeaves; import common.block.foliage.BlockLog; -import common.block.foliage.BlockTallGrass; -import common.block.foliage.LeavesType; import common.block.liquid.BlockLiquid; +import common.block.natural.BlockColoredClay; import common.block.natural.BlockFire; -import common.block.natural.BlockSandStone; import common.block.tech.BlockPistonBase; import common.block.tech.BlockPistonHead; import common.block.tech.BlockTNT; @@ -346,18 +341,17 @@ public abstract class Converter { mapTile(TileEntityComparator.class, "Comparator", "comparator"); mapTile(TileEntityBanner.class, "Banner", "banner"); - /* mapBlock(Blocks.stone.getState(), 1); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, false), 1, 1); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, true), 1, 2); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, false), 1, 3); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, true), 1, 4); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, false), 1, 5); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, true), 1, 6); + 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.grass, 2); - mapBlock(Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), 3); - mapBlock(Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), 3, 1); - mapBlock(Blocks.dirt.getState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT), 3, 2); + mapBlock(Blocks.dirt.getState(), 3); + mapBlock(Blocks.dirt.getState(), 3, 1); + mapBlock(Blocks.dirt.getState(), 3, 2); mapBlock(Blocks.cobblestone, 4); mapBlock(Blocks.oak_planks, 5); mapBlock(Blocks.spruce_planks, 5, 1); @@ -392,8 +386,8 @@ public abstract class Converter { return Blocks.lava.getState().withProperty(BlockLiquid.LEVEL, data); } }, 11); - mapBlock(Blocks.sand.getState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.SAND), 12); - mapBlock(Blocks.sand.getState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.RED_SAND), 12, 1); + mapBlock(Blocks.sand.getState(), 12); + mapBlock(Blocks.red_sand.getState(), 12, 1); mapBlock(Blocks.gravel, 13); mapBlock(Blocks.gold_ore, 14); mapBlock(Blocks.iron_ore, 15); @@ -414,46 +408,46 @@ public abstract class Converter { mapBlock(Blocks.jungle_log.getState().withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.X), 17, 7); mapBlock(Blocks.jungle_log.getState().withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.Z), 17, 11); mapBlock(Blocks.jungle_log.getState().withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.NONE), 17, 15); - mapBlock(Blocks.oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18); - mapBlock(Blocks.oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 4); - mapBlock(Blocks.oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 8); - mapBlock(Blocks.oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 12); - mapBlock(Blocks.spruce_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.spruce_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 1); - mapBlock(Blocks.spruce_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.spruce_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 5); - mapBlock(Blocks.spruce_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.spruce_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 9); - mapBlock(Blocks.spruce_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.spruce_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 13); - mapBlock(Blocks.birch_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.birch_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 2); - mapBlock(Blocks.birch_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.birch_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 6); - mapBlock(Blocks.birch_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.birch_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 10); - mapBlock(Blocks.birch_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.birch_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 14); - mapBlock(Blocks.jungle_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.jungle_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 3); - mapBlock(Blocks.jungle_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.jungle_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 18, 7); - mapBlock(Blocks.jungle_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.jungle_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 11); - mapBlock(Blocks.jungle_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.jungle_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 18, 15); mapBlock(Blocks.sponge, 19); mapBlock(Blocks.glass, 20); mapBlock(Blocks.lapis_ore, 21); mapBlock(Blocks.lapis_block, 22); mapBlockData(Blocks.dispenser, 23); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT), 24); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.CHISELED), 24, 1); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.SMOOTH), 24, 2); + mapBlock(Blocks.sandstone.getState(), 24); + mapBlock(Blocks.carved_sandstone.getState(), 24, 1); + mapBlock(Blocks.smooth_sandstone.getState(), 24, 2); mapBlock(Blocks.noteblock, 25); mapBlockData(Blocks.red_bed, 26); mapBlockData(Blocks.golden_rail, 27); @@ -464,9 +458,9 @@ public abstract class Converter { mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP) .withProperty(BlockPistonBase.EXTENDED, true), 29, 14); mapBlock(Blocks.web, 30); - mapBlock(Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.DEAD_BUSH), 31); - mapBlock(Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.GRASS), 31, 1); - mapBlock(Blocks.tallgrass.getState().withProperty(BlockTallGrass.TYPE, BlockTallGrass.EnumType.FERN), 31, 2); + mapBlock(Blocks.dead_bush.getState(), 31); + mapBlock(Blocks.tallgrass.getState(), 31, 1); + mapBlock(Blocks.fern.getState(), 31, 2); mapBlock(Blocks.deadbush, 32); mapBlockData(Blocks.piston, 33); mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP) @@ -480,28 +474,28 @@ public abstract class Converter { .withProperty(BlockPistonHead.TYPE, BlockPistonHead.EnumPistonType.STICKY), 34, 14); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.wool.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(data)); + return BlockWool.getByColor(DyeColor.byMetadata(data)).getState(); } }, 35); mapBlock(Blocks.stone, 36); // mapBlockData(Blocks.piston_extension, 36); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.DANDELION), 37); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.POPPY), + mapBlock(Blocks.dandelion.getState(), 37); + mapBlock(Blocks.poppy.getState(), 38); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.BLUE_ORCHID), + mapBlock(Blocks.blue_orchid.getState(), 38, 1); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.ALLIUM), + mapBlock(Blocks.allium.getState(), 38, 2); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.HOUSTONIA), + mapBlock(Blocks.houstonia.getState(), 38, 3); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.RED_TULIP), + mapBlock(Blocks.red_tulip.getState(), 38, 4); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.ORANGE_TULIP), + mapBlock(Blocks.orange_tulip.getState(), 38, 5); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.WHITE_TULIP), + mapBlock(Blocks.white_tulip.getState(), 38, 6); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.PINK_TULIP), + mapBlock(Blocks.pink_tulip.getState(), 38, 7); - mapBlock(Blocks.flower.getState().withProperty(Blocks.flower.getTypeProperty(), BlockFlower.EnumFlowerType.OXEYE_DAISY), + mapBlock(Blocks.daisy.getState(), 38, 8); mapBlock(Blocks.brown_mushroom, 39); mapBlock(Blocks.red_mushroom, 40); @@ -560,8 +554,8 @@ public abstract class Converter { mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP), 44, 15); mapBlock(Blocks.brick_block, 45); - mapBlock(Blocks.tnt.getState().withProperty(BlockTNT.POWER, 0).withProperty(BlockTNT.EXPLODE, false), 46); - mapBlock(Blocks.tnt.getState().withProperty(BlockTNT.POWER, 0).withProperty(BlockTNT.EXPLODE, true), 46, 1); + mapBlock(Blocks.tnt.getState().withProperty(BlockTNT.EXPLODE, false), 46); + mapBlock(Blocks.tnt.getState().withProperty(BlockTNT.EXPLODE, true), 46, 1); mapBlock(Blocks.bookshelf, 47); mapBlock(Blocks.mossy_cobblestone, 48); mapBlock(Blocks.obsidian, 49); @@ -613,27 +607,27 @@ public abstract class Converter { mapBlock(Blocks.hellrock, 87); mapBlock(Blocks.soul_sand, 88); mapBlock(Blocks.glowstone, 89); - mapBlock(Blocks.stained_glass_pane.getState().withProperty(BlockStainedGlass.COLOR, DyeColor.PURPLE), 90); + mapBlock(Blocks.purple_glass_pane.getState(), 90); mapBlockData(Blocks.lit_pumpkin, 91); mapBlockData(Blocks.cake, 92); mapBlockData(Blocks.repeater, 93); mapBlockData(Blocks.powered_repeater, 94); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.stained_glass.getState().withProperty(BlockStainedGlass.COLOR, DyeColor.byMetadata(data)); + return BlockStainedGlass.getByColor(DyeColor.byMetadata(data)).getState(); } }, 95); mapBlockData(Blocks.trapdoor, 96); mapBlock(Blocks.stone, 97); mapBlock(Blocks.cobblestone, 97, 1); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT), 97, 2); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.MOSSY), 97, 3); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.CRACKED), 97, 4); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.CHISELED), 97, 5); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT), 98); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.MOSSY), 98, 1); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.CRACKED), 98, 2); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.CHISELED), 98, 3); + 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); mapBlockData(Blocks.brown_mushroom_block, 99); mapBlockData(Blocks.red_mushroom_block, 100); mapBlock(Blocks.iron_bars, 101); @@ -654,7 +648,7 @@ public abstract class Converter { mapBlock(Blocks.enchanting_table, 116); mapBlockData(Blocks.brewing_stand, 117); mapBlockData(Blocks.cauldron, 118); - mapBlock(Blocks.stained_glass.getState().withProperty(BlockStainedGlass.COLOR, DyeColor.BLACK), 119); + mapBlock(Blocks.black_glass.getState(), 119); mapBlock(Blocks.obsidian, 120); mapBlock(Blocks.cell_rock, 121); mapBlock(Blocks.dragon_egg, 122); @@ -708,9 +702,9 @@ public abstract class Converter { mapBlockData(Blocks.spruce_stairs, 136); mapBlock(Blocks.obsidian, 137); mapBlock(Blocks.beacon, 138); - mapBlock(Blocks.cobblestone_wall.getState().withProperty(BlockWall.VARIANT, BlockWall.EnumType.NORMAL), 139); - mapBlock(Blocks.cobblestone_wall.getState().withProperty(BlockWall.VARIANT, BlockWall.EnumType.MOSSY), 139, 1); - mapBlock(Blocks.flower_pot.getState().withProperty(BlockFlowerPot.CONTENTS, 0), 140); + mapBlock(Blocks.cobblestone_wall.getState(), 139); + mapBlock(Blocks.mossy_cobblestone_wall.getState(), 139, 1); + mapBlock(Blocks.flowerpot.getState(), 140); mapBlockData(Blocks.carrot, 141); mapBlockData(Blocks.potato, 142); mapBlockData(Blocks.wooden_button, 143); @@ -725,39 +719,39 @@ public abstract class Converter { mapBlock(Blocks.redstone_block, 152); mapBlock(Blocks.quartz_ore, 153); mapBlockData(Blocks.hopper, 154); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), 155); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.CHISELED), 155, 1); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.LINES_Y), 155, 2); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.LINES_X), 155, 3); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.LINES_Z), 155, 4); + mapBlock(Blocks.quartz_block.getState(), 155); + mapBlock(Blocks.quartz_ornaments.getState(), 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); mapBlockData(Blocks.quartz_stairs, 156); mapBlockData(Blocks.activator_rail, 157); mapBlockData(Blocks.dropper, 158); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.stained_hardened_clay.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(data)); + return BlockColoredClay.getByColor(DyeColor.byMetadata(data)).getState(); } }, 159); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.stained_glass_pane.getState().withProperty(BlockStainedGlassPane.COLOR, DyeColor.byMetadata(data)); + return BlockStainedGlassPane.getByColor(DyeColor.byMetadata(data)).getState(); } }, 160); - mapBlock(Blocks.acacia_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.acacia_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 161); - mapBlock(Blocks.acacia_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.acacia_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 161, 4); - mapBlock(Blocks.acacia_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.acacia_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 161, 8); - mapBlock(Blocks.acacia_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.acacia_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 161, 12); - mapBlock(Blocks.dark_oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.dark_oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 161, 1); - mapBlock(Blocks.dark_oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.dark_oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, false), 161, 5); - mapBlock(Blocks.dark_oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.dark_oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 161, 9); - mapBlock(Blocks.dark_oak_leaves.getState().withProperty(BlockLeaves.TYPE, LeavesType.SPRING) + mapBlock(Blocks.dark_oak_leaves_spring.getState() .withProperty(BlockLeaves.DECAY, true), 161, 13); mapBlock(Blocks.acacia_log.getState().withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.Y), 162); mapBlock(Blocks.acacia_log.getState().withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.X), 162, 4); @@ -772,26 +766,31 @@ public abstract class Converter { mapBlock(Blocks.slime_block, 165); mapBlock(Blocks.glass, 166); mapBlockData(Blocks.iron_trapdoor, 167); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT), 168); - mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, true), 168, 1); + mapBlock(Blocks.stonebrick.getState(), 168); + mapBlock(Blocks.smooth_rock.getState(), 168, 1); mapBlock(Blocks.black_brick, 168, 2); mapBlock(Blocks.lamp, 169); mapBlockData(Blocks.hay_block, 170); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.carpet.getState().withProperty(BlockCarpet.COLOR, DyeColor.byMetadata(data)); + return BlockCarpet.getByColor(DyeColor.byMetadata(data)).getState(); } }, 171); mapBlock(Blocks.hardened_clay, 172); mapBlock(Blocks.coal_block, 173); mapBlock(Blocks.packed_ice, 174); - mapBlockData(Blocks.double_plant, 175); + 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); mapBlockData(Blocks.banner, 176); mapBlockData(Blocks.wall_banner, 177); mapBlockData(Blocks.daylight_detector_inverted, 178); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT), 179); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.CHISELED), 179, 1); - mapBlock(Blocks.sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.SMOOTH), 179, 2); + mapBlock(Blocks.sandstone.getState(), 179); + mapBlock(Blocks.carved_sandstone.getState(), 179, 1); + mapBlock(Blocks.smooth_sandstone.getState(), 179, 2); mapBlockData(Blocks.sandstone_stairs, 180); mapBlock(Blocks.sandstone_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false), 181); @@ -818,45 +817,44 @@ public abstract class Converter { mapBlock(Blocks.iron_bars, 198); mapBlock(Blocks.glass_pane, 199); mapBlock(Blocks.glass_pane, 200); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), 201); - mapBlock(Blocks.quartz_block.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.LINES_Y), 202); + mapBlock(Blocks.quartz_block.getState(), 201); + mapBlock(Blocks.quartz_pillar.getState().withProperty(BlockQuartzPillar.AXIS, Facing.Axis.Y), 202); mapBlockData(Blocks.quartz_stairs, 203); mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, true).withProperty(BlockSlab.SEAMLESS, false), 204); mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.DOWN), 205); mapBlock(Blocks.quartz_slab.getState().withProperty(BlockSlab.DOUBLE, false).withProperty(BlockSlab.FACING, Facing.UP), 205, 8); - mapBlock(Blocks.stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT), 206); + mapBlock(Blocks.stonebrick.getState(), 206); mapBlockData(Blocks.potato, 207); mapBlock(Blocks.farmland, 208); - mapBlock(Blocks.stained_glass.getState().withProperty(BlockStainedGlass.COLOR, DyeColor.BLACK), 209); + mapBlock(Blocks.black_glass.getState(), 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().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), 216); + mapBlock(Blocks.quartz_block.getState(), 216); mapBlock(Blocks.glass, 217); mapBlockData(Blocks.dropper, 218); for(int id = 219; id <= 234; id++) { - mapBlock(Blocks.wool.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(id - 219)), id); + mapBlock(BlockWool.getByColor(DyeColor.byMetadata(id - 219)).getState(), id); } for(int id = 235; id <= 250; id++) { - mapBlock(Blocks.stained_hardened_clay.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(id - 235)), id); + mapBlock(BlockColoredClay.getByColor(DyeColor.byMetadata(id - 235)).getState(), id); } mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.stained_hardened_clay.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(data)); + return BlockColoredClay.getByColor(DyeColor.byMetadata(data)).getState(); } }, 251); mapBlock(new BlockFunction() { public State getState(int id, int data) { - return Blocks.stained_hardened_clay.getState().withProperty(BlockWool.COLOR, DyeColor.byMetadata(data)); + return BlockColoredClay.getByColor(DyeColor.byMetadata(data)).getState(); } }, 252); mapBlock(Blocks.obsidian, 255); - */ } private static Object read(DataInput input, byte id) throws IOException { @@ -1119,6 +1117,8 @@ public abstract class Converter { nsect.setByteArray("Dat1", data.getData()); if(adddata != null) nsect.setByteArray("Dat2", adddata.getData()); + nsect.setByteArray("BlockLight", sect.getByteArray("BlockLight")); + nsect.setByteArray("SkyLight", sect.getByteArray("SkyLight")); entities.add(nsect); } ntag.setList("Sections", entities); @@ -1290,6 +1290,7 @@ public abstract class Converter { Log.IO.error(e, "Konnte Weltdaten nicht speichern"); } } + Log.IO.info("Einstiegspunkt: /tele %d %d %d terra", tag.getInt("SpawnX"), tag.getInt("SpawnY"), tag.getInt("SpawnZ")); Log.IO.info("Welt wurde in %d Sekunden konvertiert", (System.currentTimeMillis() - cur) / 1000L); return true; }