diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index 2b503c82..966318ef 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -25,12 +25,12 @@ public class BlockInfo { public static Map soundName = new HashMap() {{ put(BlockSoundGroup.WOOD, "wood" ); - put(BlockSoundGroup.GROUND, "gravel"); - put(BlockSoundGroup.PLANT, "grass" ); + put(BlockSoundGroup.GRAVEL, "gravel"); + put(BlockSoundGroup.GRASS, "grass" ); put(BlockSoundGroup.STONE, "stone" ); put(BlockSoundGroup.METAL, "metal" ); put(BlockSoundGroup.GLASS , "glass" ); - put(BlockSoundGroup.CLOTH , "wool" ); + put(BlockSoundGroup.WOOL , "wool" ); put(BlockSoundGroup.SAND , "sand" ); put(BlockSoundGroup.SNOW , "snow" ); put(BlockSoundGroup.LADDER, "ladder"); @@ -38,25 +38,33 @@ public class BlockInfo put(BlockSoundGroup.SLIME , "slime" ); put(BlockSoundGroup.WET_GRASS , "sea_grass" ); put(BlockSoundGroup.CORAL , "coral" ); + put(BlockSoundGroup.BAMBOO , "bamboo" ); + put(BlockSoundGroup.BAMBOO_SAPLING , "shoots" ); + put(BlockSoundGroup.SCAFFOLDING , "scaffolding" ); + put(BlockSoundGroup.SWEET_BERRY_BUSH , "berry" ); + put(BlockSoundGroup.CROP , "crop" ); + put(BlockSoundGroup.field_18852 , "gourd" ); + put(BlockSoundGroup.NETHER_WART , "wart" ); + put(BlockSoundGroup.LANTERN , "lantern" ); }}; public static Map mapColourName = new HashMap() {{ put(MaterialColor.AIR , "air" ); put(MaterialColor.GRASS , "grass" ); put(MaterialColor.SAND , "sand" ); - put(MaterialColor.WOOL , "wool" ); - put(MaterialColor.TNT , "tnt" ); + put(MaterialColor.WEB , "wool" ); + put(MaterialColor.LAVA , "tnt" ); put(MaterialColor.ICE , "ice" ); put(MaterialColor.IRON , "iron" ); put(MaterialColor.FOLIAGE , "foliage" ); - put(MaterialColor.SNOW , "snow" ); + put(MaterialColor.WHITE , "snow" ); put(MaterialColor.CLAY , "clay" ); put(MaterialColor.DIRT , "dirt" ); put(MaterialColor.STONE , "stone" ); put(MaterialColor.WATER , "water" ); put(MaterialColor.WOOD , "wood" ); put(MaterialColor.QUARTZ , "quartz" ); - put(MaterialColor.ADOBE , "adobe" ); + put(MaterialColor.ORANGE , "adobe" ); put(MaterialColor.MAGENTA , "magenta" ); put(MaterialColor.LIGHT_BLUE, "light_blue"); put(MaterialColor.YELLOW , "yellow" ); @@ -75,8 +83,8 @@ public class BlockInfo put(MaterialColor.DIAMOND , "diamond" ); put(MaterialColor.LAPIS , "lapis" ); put(MaterialColor.EMERALD , "emerald" ); - put(MaterialColor.OBSIDIAN , "obsidian" ); - put(MaterialColor.NETHERRACK, "netherrack"); + put(MaterialColor.SPRUCE , "obsidian" ); + put(MaterialColor.NETHER, "netherrack"); //TODO fix these put(MaterialColor.WHITE_TERRACOTTA , "white_terracotta" ); put(MaterialColor.ORANGE_TERRACOTTA , "orange_terracotta" ); put(MaterialColor.MAGENTA_TERRACOTTA , "magenta_terracotta" ); @@ -100,39 +108,41 @@ public class BlockInfo put(Material.STRUCTURE_VOID , "void" ); put(Material.PORTAL , "portal" ); put(Material.CARPET , "carpet" ); - put(Material.PLANTS , "plant" ); - put(Material.OCEAN_PLANT , "water_plant" ); - put(Material.VINE , "vine" ); - put(Material.SEA_GRASS , "sea_grass" ); + put(Material.PLANT , "plant" ); + put(Material.UNDERWATER_PLANT , "water_plant" ); + put(Material.REPLACEABLE_PLANT , "vine" ); + put(Material.SEAGRASS , "sea_grass" ); put(Material.WATER , "water" ); put(Material.BUBBLE_COLUMN , "bubble_column"); put(Material.LAVA , "lava" ); put(Material.SNOW , "snow_layer" ); put(Material.FIRE , "fire" ); - put(Material.CIRCUITS , "redstone_bits"); - put(Material.WEB , "cobweb" ); - put(Material.REDSTONE_LIGHT , "redstone_lamp"); + put(Material.PART , "redstone_bits"); + put(Material.COBWEB , "cobweb" ); + put(Material.REDSTONE_LAMP , "redstone_lamp"); put(Material.CLAY , "clay" ); - put(Material.GROUND , "dirt" ); - put(Material.GRASS , "grass" ); + put(Material.EARTH , "dirt" ); + put(Material.ORGANIC , "grass" ); put(Material.PACKED_ICE , "packed_ice" ); put(Material.SAND , "sand" ); put(Material.SPONGE , "sponge" ); - put(Material.WOOD , "wood" ); - put(Material.CLOTH , "wool" ); + put(Material.SHULKER_BOX , "wood" ); + put(Material.WOOD , "wool" ); // fix these + put(Material.BAMBOO_SAPLING , "shoots" ); + put(Material.BAMBOO , "bamboo" ); put(Material.TNT , "tnt" ); put(Material.LEAVES , "leaves" ); put(Material.GLASS , "glass" ); put(Material.ICE , "ice" ); put(Material.CACTUS , "cactus" ); - put(Material.ROCK , "stone" ); - put(Material.IRON , "iron" ); - put(Material.CRAFTED_SNOW , "snow" ); + put(Material.STONE , "stone" ); + put(Material.METAL , "iron" ); + put(Material.SNOW_BLOCK , "snow" ); put(Material.ANVIL , "anvil" ); put(Material.BARRIER , "barrier" ); put(Material.PISTON , "piston" ); - put(Material.CORAL , "coral" ); - put(Material.GOURD , "gourd" ); + put(Material.UNUSED_PLANT , "coral" ); + put(Material.PUMPKIN , "gourd" ); put(Material.DRAGON_EGG , "dragon_egg" ); put(Material.CAKE , "cake" ); }}; @@ -143,44 +153,44 @@ public class BlockInfo Material material = state.getMaterial(); Block block = state.getBlock(); String metastring = ""; - for (net.minecraft.state.IProperty iproperty : state.getProperties()) + for (net.minecraft.state.property.Property iproperty : state.getProperties()) { metastring += ", "+iproperty.getName() + '='+state.get(iproperty); } List lst = new ArrayList<>(); lst.add(Messenger.s("")); lst.add(Messenger.s("=====================================")); - lst.add(Messenger.s(String.format("Block info for %s%s (id %d%s):",Registry.BLOCK.getKey(block),metastring, Registry.BLOCK.getId(block), metastring ))); + lst.add(Messenger.s(String.format("Block info for %s%s (id %d%s):",Registry.BLOCK.getId(block),metastring, Registry.BLOCK.getRawId(block), metastring ))); lst.add(Messenger.s(String.format(" - Material: %s", materialName.get(material)))); - lst.add(Messenger.s(String.format(" - Map colour: %s", mapColourName.get(state.getMaterialColor(world, pos))))); - lst.add(Messenger.s(String.format(" - Sound type: %s", soundName.get(block.getBlockSoundGroup())))); + lst.add(Messenger.s(String.format(" - Map colour: %s", mapColourName.get(state.getTopMaterialColor(world, pos))))); + lst.add(Messenger.s(String.format(" - Sound type: %s", soundName.get(block.getSoundGroup(state))))); lst.add(Messenger.s("")); - lst.add(Messenger.s(String.format(" - Full block: %s", state.isFullCube() ))); - lst.add(Messenger.s(String.format(" - Normal cube: %s", state.isNormalCube()))); + //lst.add(Messenger.s(String.format(" - Full block: %s", block.isShapeFullCube()))); // isFullCube() ))); + lst.add(Messenger.s(String.format(" - Normal cube: %s", state.isSimpleFullBlock(world, pos)))); //isNormalCube()))); lst.add(Messenger.s(String.format(" - Is liquid: %s", material.isLiquid()))); lst.add(Messenger.s(String.format(" - Is solid: %s", material.isSolid()))); lst.add(Messenger.s("")); - lst.add(Messenger.s(String.format(" - Light in: %d, above: %d", world.getLight(pos), world.getLight(pos.up())))); + lst.add(Messenger.s(String.format(" - Light in: %d, above: %d", world.getLightLevel(pos), world.getLightLevel(pos.up())))); lst.add(Messenger.s(String.format(" - Brightness in: %.2f, above: %.2f", world.getBrightness(pos), world.getBrightness(pos.up())))); - lst.add(Messenger.s(String.format(" - Is opaque: %s", material.isOpaque() ))); - lst.add(Messenger.s(String.format(" - Light opacity: %d", state.getOpacity(world,pos)))); - lst.add(Messenger.s(String.format(" - Blocks light: %s", state.propagatesSkylightDown(world, pos)))); - lst.add(Messenger.s(String.format(" - Emitted light: %d", state.getLightValue()))); - lst.add(Messenger.s(String.format(" - Picks neighbour light value: %s", state.useNeighborBrightness(world, pos)))); + lst.add(Messenger.s(String.format(" - Is opaque: %s", material.isSolid() ))); + //lst.add(Messenger.s(String.format(" - Light opacity: %d", state.getOpacity(world,pos)))); + //lst.add(Messenger.s(String.format(" - Blocks light: %s", state.propagatesSkylightDown(world, pos)))); + //lst.add(Messenger.s(String.format(" - Emitted light: %d", state.getLightValue()))); + //lst.add(Messenger.s(String.format(" - Picks neighbour light value: %s", state.useNeighborBrightness(world, pos)))); lst.add(Messenger.s("")); - lst.add(Messenger.s(String.format(" - Causes suffocation: %s", state.causesSuffocation()))); + lst.add(Messenger.s(String.format(" - Causes suffocation: %s", state.canSuffocate(world, pos)))); lst.add(Messenger.s(String.format(" - Blocks movement on land: %s", !state.canPlaceAtSide(world,pos, BlockPlacementEnvironment.LAND)))); lst.add(Messenger.s(String.format(" - Blocks movement in air: %s", !state.canPlaceAtSide(world,pos, BlockPlacementEnvironment.AIR)))); lst.add(Messenger.s(String.format(" - Blocks movement in liquids: %s", !state.canPlaceAtSide(world,pos, BlockPlacementEnvironment.WATER)))); - lst.add(Messenger.s(String.format(" - Can burn: %s", material.isFlammable()))); - lst.add(Messenger.s(String.format(" - Requires a tool: %s", !material.isToolNotRequired()))); - lst.add(Messenger.s(String.format(" - Hardness: %.2f", state.getBlockHardness(world, pos)))); - lst.add(Messenger.s(String.format(" - Blast resistance: %.2f", block.getExplosionResistance()))); - lst.add(Messenger.s(String.format(" - Ticks randomly: %s", block.ticksRandomly(state)))); + lst.add(Messenger.s(String.format(" - Can burn: %s", material.isBurnable()))); + lst.add(Messenger.s(String.format(" - Requires a tool: %s", !material.isReplaceable()))); //?maybe + lst.add(Messenger.s(String.format(" - Hardness: %.2f", state.getHardness(world, pos)))); + lst.add(Messenger.s(String.format(" - Blast resistance: %.2f", block.getBlastResistance()))); + lst.add(Messenger.s(String.format(" - Ticks randomly: %s", block.hasRandomTicks(state)))); lst.add(Messenger.s("")); - lst.add(Messenger.s(String.format(" - Can provide power: %s", state.canProvidePower()))); - lst.add(Messenger.s(String.format(" - Strong power level: %d", world.getStrongPower(pos)))); - lst.add(Messenger.s(String.format(" - Redstone power level: %d", world.getRedstonePowerFromNeighbors(pos)))); + lst.add(Messenger.s(String.format(" - Can provide power: %s", state.emitsRedstonePower()))); + lst.add(Messenger.s(String.format(" - Strong power level: %d", world.getReceivedStrongRedstonePower(pos)))); + lst.add(Messenger.s(String.format(" - Redstone power level: %d", world.getReceivedRedstonePower(pos)))); lst.add(Messenger.s("")); lst.add(wander_chances(pos.up(), world));