Update to Minecraft 1.12-pre6

3 files changed, 747 insertions, 742 deletions

diff --git a/mappings/bukkit-1.12-pre5-cl.csrg b/mappings/bukkit-1.12-pre6-cl.csrg
index efb95c2..b67b1e2 100644
--- a/mappings/bukkit-1.12-pre5-cl.csrg
+++ b/mappings/bukkit-1.12-pre6-cl.csrg
@@ -301,757 +301,757 @@ ajv ItemSplashPotion
 ajw ItemSword
 ajx ItemWithAuxData
 ajy ItemTippedArrow
-ajz EnumAnimation
 ak CriterionTriggerImpossible
-aka ItemWaterLily
-akb ItemBookAndQuill
-akc ItemWrittenBook
-akd PotionRegistry
-ake PotionBrewer
-ake$a PotionBrewer$PredicatedCombination
-akf PotionUtil
-akg Potions
-aki RecipeArmorDye
-akj RecipesBanner
-akj$a RecipesBanner$AddRecipe
-akj$b RecipesBanner$DuplicateRecipe
-akk RecipeBookClone
-akl RecipeFireworks
-akm RecipesFurnace
-akn RecipeItemStack
-ako RecipeMapClone
-akp RecipeMapExtend
-akq IRecipe
-akr CraftingManager
-aks RecipeRepair
-akt ShapedRecipes
-aku ShapelessRecipes
-akv RecipiesShield
-akv$a RecipiesShield$Decoration
-akw RecipeShulkerBox
-akw$a RecipeShulkerBox$Dye
-akx RecipeTippedArrow
-akz EnchantmentArrowDamage
+aka EnumAnimation
+akb ItemWaterLily
+akc ItemBookAndQuill
+akd ItemWrittenBook
+ake PotionRegistry
+akf PotionBrewer
+akf$a PotionBrewer$PredicatedCombination
+akg PotionUtil
+akh Potions
+akj RecipeArmorDye
+akk RecipesBanner
+akk$a RecipesBanner$AddRecipe
+akk$b RecipesBanner$DuplicateRecipe
+akl RecipeBookClone
+akm RecipeFireworks
+akn RecipesFurnace
+ako RecipeItemStack
+akp RecipeMapClone
+akq RecipeMapExtend
+akr IRecipe
+aks CraftingManager
+akt RecipeRepair
+aku ShapedRecipes
+akv ShapelessRecipes
+akw RecipiesShield
+akw$a RecipiesShield$Decoration
+akx RecipeShulkerBox
+akx$a RecipeShulkerBox$Dye
+aky RecipeTippedArrow
 al CriterionTriggerInventoryChanged
-ala EnchantmentFlameArrows
-alb EnchantmentInfiniteArrows
-alc EnchantmentArrowKnockback
-ald EnchantmentBinding
-ale EnchantmentWeaponDamage
-alf EnchantmentDurability
-alg EnchantmentDigging
-alh Enchantment
-alh$a Enchantment$Rarity
-ali EnchantmentSlotType
-alj EnchantmentManager
-alj$a EnchantmentManager$EnchantmentModifierArthropods
-alj$b EnchantmentManager$EnchantmentModifierThorns
-alj$c EnchantmentManager$EnchantmentModifier
-alj$d EnchantmentManager$EnchantmentModifierDamage
-alj$e EnchantmentManager$EnchantmentModifierProtection
-alk WeightedRandomEnchant
-all Enchantments
-alm EnchantmentFire
-aln EnchantmentLure
-alo EnchantmentFrostWalker
-alp EnchantmentKnockback
-alq EnchantmentLootBonus
-alr EnchantmentMending
-als EnchantmentOxygen
-alt EnchantmentProtection
-alt$a EnchantmentProtection$DamageType
-alu EnchantmentSweeping
-alv EnchantmentThorns
-alw EnchantmentSilkTouch
-alx EnchantmentVanishing
-aly EnchantmentDepthStrider
-alz EnchantmentWaterWorker
+ala EnchantmentArrowDamage
+alb EnchantmentFlameArrows
+alc EnchantmentInfiniteArrows
+ald EnchantmentArrowKnockback
+ale EnchantmentBinding
+alf EnchantmentWeaponDamage
+alg EnchantmentDurability
+alh EnchantmentDigging
+ali Enchantment
+ali$a Enchantment$Rarity
+alj EnchantmentSlotType
+alk EnchantmentManager
+alk$a EnchantmentManager$EnchantmentModifierArthropods
+alk$b EnchantmentManager$EnchantmentModifierThorns
+alk$c EnchantmentManager$EnchantmentModifier
+alk$d EnchantmentManager$EnchantmentModifierDamage
+alk$e EnchantmentManager$EnchantmentModifierProtection
+all WeightedRandomEnchant
+alm Enchantments
+aln EnchantmentFire
+alo EnchantmentLure
+alp EnchantmentFrostWalker
+alq EnchantmentKnockback
+alr EnchantmentLootBonus
+als EnchantmentMending
+alt EnchantmentOxygen
+alu EnchantmentProtection
+alu$a EnchantmentProtection$DamageType
+alv EnchantmentSweeping
+alw EnchantmentThorns
+alx EnchantmentSilkTouch
+aly EnchantmentVanishing
+alz EnchantmentDepthStrider
 am CriterionTriggerItemDurabilityChanged
-amc IMerchant
-amd MerchantRecipe
-ame MerchantRecipeList
-amg CommandBlockListenerAbstract
-amh MobSpawnerAbstract
-ami BlockActionData
-amk ChunkCoordIntPair
-amm Explosion
-amo GameRules
-amo$a GameRules$GameRuleValue
-amo$b GameRules$EnumGameRuleType
-amp EnumGamemode
-amr World
-ams ExceptionWorldConflict
-amt IWorldAccess
-amu WorldSettings
-amv IBlockAccess
-amw WorldType
-amx EnumSkyBlock
-amy SpawnerCreature
-amz PortalTravelAgent
-amz$a PortalTravelAgent$ChunkCoordinatesPortal
+ama EnchantmentWaterWorker
+amd IMerchant
+ame MerchantRecipe
+amf MerchantRecipeList
+amh CommandBlockListenerAbstract
+ami MobSpawnerAbstract
+amj BlockActionData
+aml ChunkCoordIntPair
+amn Explosion
+amp GameRules
+amp$a GameRules$GameRuleValue
+amp$b GameRules$EnumGameRuleType
+amq EnumGamemode
+ams World
+amt ExceptionWorldConflict
+amu IWorldAccess
+amv WorldSettings
+amw IBlockAccess
+amx WorldType
+amy EnumSkyBlock
+amz SpawnerCreature
 an CriterionConditionItem
-ana ChunkCache
-anb MobSpawnerData
-anc NextTickListEntry
-and BiomeBeach
-ane BiomeBase
-ane$b BiomeBase$EnumTemperature
-ane$c BiomeBase$BiomeMeta
-anf BiomeCache
-anh BiomeDecorator
-ani WorldChunkManager
-anj Biomes
-anl BiomeDesert
-anm BiomeBigHills
-anm$a BiomeBigHills$Type
-ann WorldChunkManagerHell
-ano BiomeForest
-ano$a BiomeForest$Type
-anp BiomeHell
-anq BiomeDecoratorHell
-anr BiomeIcePlains
-ans BiomeJungle
-ant BiomeMesa
-anu BiomeMushrooms
-anv BiomeForestMutated
-anw BiomeSavannaMutated
-anx BiomeOcean
-any BiomePlains
-anz BiomeRiver
+ana PortalTravelAgent
+ana$a PortalTravelAgent$ChunkCoordinatesPortal
+anb ChunkCache
+anc MobSpawnerData
+and NextTickListEntry
+ane BiomeBeach
+anf BiomeBase
+anf$b BiomeBase$EnumTemperature
+anf$c BiomeBase$BiomeMeta
+ang BiomeCache
+ani BiomeDecorator
+anj WorldChunkManager
+ank Biomes
+anm BiomeDesert
+ann BiomeBigHills
+ann$a BiomeBigHills$Type
+ano WorldChunkManagerHell
+anp BiomeForest
+anp$a BiomeForest$Type
+anq BiomeHell
+anr BiomeDecoratorHell
+ans BiomeIcePlains
+ant BiomeJungle
+anu BiomeMesa
+anv BiomeMushrooms
+anw BiomeForestMutated
+anx BiomeSavannaMutated
+any BiomeOcean
+anz BiomePlains
 ao CriterionTriggerKilled
-aoa BiomeSavanna
-aob BiomeStoneBeach
-aoc BiomeSwamp
-aod BiomeTaiga
-aod$a BiomeTaiga$Type
-aoe BiomeTheEnd
-aof BiomeTheEndDecorator
-aof$a BiomeTheEndDecorator$SpikeCache
-aog BiomeVoid
-aoh BiomeVoidDecorator
-aoj BlockAir
-aok BlockAnvil
-aok$a BlockAnvil$TileEntityContainerAnvil
-aol BlockBanner
-aol$a BlockBanner$BlockStandingBanner
-aol$b BlockBanner$BlockWallBanner
-aom BlockBarrier
-aon BlockTileEntity
-aoo BlockPressurePlateAbstract
-aop BlockMinecartTrackAbstract
-aop$a BlockMinecartTrackAbstract$MinecartTrackLogic
-aop$b BlockMinecartTrackAbstract$EnumTrackPosition
-aoq BlockBeacon
-aor BlockBed
-aor$a BlockBed$EnumBedPart
-aos BlockBeetroot
-aot Block
-aot$a Block$EnumRandomOffset
-aou Blocks
-aov BlockBone
-aow IBlockFragilePlantElement
-aox BlockBookshelf
-aoy BlockBrewingStand
-aoz BlockPlant
+aoa BiomeRiver
+aob BiomeSavanna
+aoc BiomeStoneBeach
+aod BiomeSwamp
+aoe BiomeTaiga
+aoe$a BiomeTaiga$Type
+aof BiomeTheEnd
+aog BiomeTheEndDecorator
+aog$a BiomeTheEndDecorator$SpikeCache
+aoh BiomeVoid
+aoi BiomeVoidDecorator
+aok BlockAir
+aol BlockAnvil
+aol$a BlockAnvil$TileEntityContainerAnvil
+aom BlockBanner
+aom$a BlockBanner$BlockStandingBanner
+aom$b BlockBanner$BlockWallBanner
+aon BlockBarrier
+aoo BlockTileEntity
+aop BlockPressurePlateAbstract
+aoq BlockMinecartTrackAbstract
+aoq$a BlockMinecartTrackAbstract$MinecartTrackLogic
+aoq$b BlockMinecartTrackAbstract$EnumTrackPosition
+aor BlockBeacon
+aos BlockBed
+aos$a BlockBed$EnumBedPart
+aot BlockBeetroot
+aou Block
+aou$a Block$EnumRandomOffset
+aov Blocks
+aow BlockBone
+aox IBlockFragilePlantElement
+aoy BlockBookshelf
+aoz BlockBrewingStand
 ap CriterionTriggerLevitation
-apa BlockButtonAbstract
-apb BlockCactus
-apc BlockCake
-apd BlockCarrots
-ape BlockCauldron
-apf BlockChest
-apf$a BlockChest$Type
-apg BlockChorusFlower
-aph BlockChorusFruit
-api BlockClay
-apj BlockCocoa
-apk BlockCloth
-apl BlockCommand
-apm BlockRedstoneComparator
-apm$a BlockRedstoneComparator$EnumComparatorMode
-apn BlockConcretePowder
-apo BlockWorkbench
-apo$a BlockWorkbench$TileEntityContainerWorkbench
-app BlockCrops
-apq BlockDaylightDetector
-apr BlockDeadBush
-aps BlockMinecartDetector
-apt BlockDiodeAbstract
-apu BlockDirectional
-apv BlockDirt
-apv$a BlockDirt$EnumDirtVariant
-apw BlockDispenser
-apx BlockDoor
-apx$a BlockDoor$EnumDoorHalf
-apx$b BlockDoor$EnumDoorHinge
-apy BlockTallPlant
-apy$a BlockTallPlant$EnumTallPlantHalf
-apy$b BlockTallPlant$EnumTallFlowerVariants
-apz BlockDragonEgg
+apa BlockPlant
+apb BlockButtonAbstract
+apc BlockCactus
+apd BlockCake
+ape BlockCarrots
+apf BlockCauldron
+apg BlockChest
+apg$a BlockChest$Type
+aph BlockChorusFlower
+api BlockChorusFruit
+apj BlockClay
+apk BlockCocoa
+apl BlockCloth
+apm BlockCommand
+apn BlockRedstoneComparator
+apn$a BlockRedstoneComparator$EnumComparatorMode
+apo BlockConcretePowder
+app BlockWorkbench
+app$a BlockWorkbench$TileEntityContainerWorkbench
+apq BlockCrops
+apr BlockDaylightDetector
+aps BlockDeadBush
+apt BlockMinecartDetector
+apu BlockDiodeAbstract
+apv BlockDirectional
+apw BlockDirt
+apw$a BlockDirt$EnumDirtVariant
+apx BlockDispenser
+apy BlockDoor
+apy$a BlockDoor$EnumDoorHalf
+apy$b BlockDoor$EnumDoorHinge
+apz BlockTallPlant
+apz$a BlockTallPlant$EnumTallPlantHalf
+apz$b BlockTallPlant$EnumTallFlowerVariants
 aq CriterionConditionLocation
-aqa BlockDropper
-aqb BlockFlowing
-aqc BlockEnchantmentTable
-aqd BlockEndGateway
-aqe BlockEnderPortal
-aqf BlockEnderPortalFrame
-aqg BlockEndRod
-aqh BlockEnderChest
-aqi ITileEntity
-aqj BlockFalling
-aqk BlockSoil
-aql BlockFence
-aqm BlockFenceGate
-aqn BlockFire
-aqo BlockFlowers
-aqo$a BlockFlowers$EnumFlowerVarient
-aqo$b BlockFlowers$EnumFlowerType
-aqp BlockFlowerPot
-aqp$a BlockFlowerPot$EnumFlowerPotContents
-aqq BlockIceFrost
-aqr BlockDoubleStoneStep2
-aqs BlockDoubleStep
-aqt BlockDoubleWoodStep
-aqu BlockFurnace
-aqv BlockGlass
-aqw BlockGlazedTerracotta
-aqx BlockLightStone
-aqy BlockGrass
-aqz BlockGrassPath
+aqa BlockDragonEgg
+aqb BlockDropper
+aqc BlockFlowing
+aqd BlockEnchantmentTable
+aqe BlockEndGateway
+aqf BlockEnderPortal
+aqg BlockEnderPortalFrame
+aqh BlockEndRod
+aqi BlockEnderChest
+aqj ITileEntity
+aqk BlockFalling
+aql BlockSoil
+aqm BlockFence
+aqn BlockFenceGate
+aqo BlockFire
+aqp BlockFlowers
+aqp$a BlockFlowers$EnumFlowerVarient
+aqp$b BlockFlowers$EnumFlowerType
+aqq BlockFlowerPot
+aqq$a BlockFlowerPot$EnumFlowerPotContents
+aqr BlockIceFrost
+aqs BlockDoubleStoneStep2
+aqt BlockDoubleStep
+aqu BlockDoubleWoodStep
+aqv BlockFurnace
+aqw BlockGlass
+aqx BlockGlazedTerracotta
+aqy BlockLightStone
+aqz BlockGrass
 ar CriterionTriggerLocation
-ara BlockGravel
-arb BlockStoneStep2
-arc BlockStepAbstract
-arc$a BlockStepAbstract$EnumSlabHalf
-ard BlockStep
-are BlockHalfTransparent
-arf BlockWoodStep
-arg BlockHardenedClay
-arh BlockHay
-ari BlockHopper
-arj BlockFacingHorizontal
-ark BlockHugeMushroom
-ark$a BlockHugeMushroom$EnumHugeMushroomVariant
-arl BlockIce
-arm BlockJukeBox
-arm$a BlockJukeBox$TileEntityRecordPlayer
-arn BlockLadder
-aro BlockLeaves
-arq BlockLever
-arq$a BlockLever$EnumLeverPosition
-arr BlockFluids
-ars BlockLogAbstract
-ars$a BlockLogAbstract$EnumLogRotation
-art BlockMagma
-aru BlockMelon
-arv EnumBlockMirror
-arw BlockMobSpawner
-arx BlockMonsterEggs
-arx$a BlockMonsterEggs$EnumMonsterEggVarient
-ary BlockMushroom
-arz BlockMycel
+ara BlockGrassPath
+arb BlockGravel
+arc BlockStoneStep2
+ard BlockStepAbstract
+ard$a BlockStepAbstract$EnumSlabHalf
+are BlockStep
+arf BlockHalfTransparent
+arg BlockWoodStep
+arh BlockHardenedClay
+ari BlockHay
+arj BlockHopper
+ark BlockFacingHorizontal
+arl BlockHugeMushroom
+arl$a BlockHugeMushroom$EnumHugeMushroomVariant
+arm BlockIce
+arn BlockJukeBox
+arn$a BlockJukeBox$TileEntityRecordPlayer
+aro BlockLadder
+arp BlockLeaves
+arr BlockLever
+arr$a BlockLever$EnumLeverPosition
+ars BlockFluids
+art BlockLogAbstract
+art$a BlockLogAbstract$EnumLogRotation
+aru BlockMagma
+arv BlockMelon
+arw EnumBlockMirror
+arx BlockMobSpawner
+ary BlockMonsterEggs
+ary$a BlockMonsterEggs$EnumMonsterEggVarient
+arz BlockMushroom
 as CriterionConditionValue
-asa BlockNetherbrick
-asb BlockNetherWart
-asc BlockBloodStone
-asd BlockLeaves2
-ase BlockLog2
-asf BlockDoubleStoneStepAbstract
-asf$a BlockDoubleStoneStepAbstract$EnumStoneSlab2Variant
-asg BlockNoDrop
-ash BlockNote
-asi BlockObserver
-asj BlockObsidian
-ask BlockLeaves1
-asl BlockLog1
-asm BlockOre
-asn BlockPackedIce
-aso BlockWood
-aso$a BlockWood$EnumLogVariant
-asp BlockPortal
-asp$a BlockPortal$Shape
-asq BlockPotatoes
-asr BlockPowered
-ass BlockPoweredRail
-ast BlockPressurePlateBinary
-ast$a BlockPressurePlateBinary$EnumMobType
-asu BlockPrismarine
-asu$a BlockPrismarine$EnumPrismarineVariant
-asv BlockPumpkin
-asw BlockPurpurSlab
-asw$a BlockPurpurSlab$Default
-asw$b BlockPurpurSlab$Half
-asw$c BlockPurpurSlab$Type
-asx BlockQuartz
-asx$a BlockQuartz$EnumQuartzVariant
-asy BlockMinecartTrack
-asz BlockRedFlowers
+asa BlockMycel
+asb BlockNetherbrick
+asc BlockNetherWart
+asd BlockBloodStone
+ase BlockLeaves2
+asf BlockLog2
+asg BlockDoubleStoneStepAbstract
+asg$a BlockDoubleStoneStepAbstract$EnumStoneSlab2Variant
+ash BlockNoDrop
+asi BlockNote
+asj BlockObserver
+ask BlockObsidian
+asl BlockLeaves1
+asm BlockLog1
+asn BlockOre
+aso BlockPackedIce
+asp BlockWood
+asp$a BlockWood$EnumLogVariant
+asq BlockPortal
+asq$a BlockPortal$Shape
+asr BlockPotatoes
+ass BlockPowered
+ast BlockPoweredRail
+asu BlockPressurePlateBinary
+asu$a BlockPressurePlateBinary$EnumMobType
+asv BlockPrismarine
+asv$a BlockPrismarine$EnumPrismarineVariant
+asw BlockPumpkin
+asx BlockPurpurSlab
+asx$a BlockPurpurSlab$Default
+asx$b BlockPurpurSlab$Half
+asx$c BlockPurpurSlab$Type
+asy BlockQuartz
+asy$a BlockQuartz$EnumQuartzVariant
+asz BlockMinecartTrack
 at CriterionConditionMobEffect
-ata BlockRedSandstone
-ata$a BlockRedSandstone$EnumRedSandstoneVariant
-atb BlockRedstoneOre
-atc BlockRedstoneWire
-atc$a BlockRedstoneWire$EnumRedstoneWireConnection
-atd BlockRedstoneLamp
-ate BlockRedstoneTorch
-ate$a BlockRedstoneTorch$RedstoneUpdateInfo
-atf BlockReed
-atg EnumRenderType
-ath BlockRepeater
-ati BlockRotatable
-atj EnumBlockRotation
-atk BlockSand
-atk$a BlockSand$EnumSandVariant
-atl BlockSandStone
-atl$a BlockSandStone$EnumSandstoneVariant
-atm BlockSapling
-atn BlockSeaLantern
-ato BlockShulkerBox
-atp BlockSign
-atq BlockSkull
-atr BlockSlime
-ats BlockSnowBlock
-att BlockSnow
-atu BlockSlowSand
-atv SoundEffectType
-atw BlockSponge
-atx BlockStainedGlass
-aty BlockStainedGlassPane
-atz BlockStainedHardenedClay
+ata BlockRedFlowers
+atb BlockRedSandstone
+atb$a BlockRedSandstone$EnumRedSandstoneVariant
+atc BlockRedstoneOre
+atd BlockRedstoneWire
+atd$a BlockRedstoneWire$EnumRedstoneWireConnection
+ate BlockRedstoneLamp
+atf BlockRedstoneTorch
+atf$a BlockRedstoneTorch$RedstoneUpdateInfo
+atg BlockReed
+ath EnumRenderType
+ati BlockRepeater
+atj BlockRotatable
+atk EnumBlockRotation
+atl BlockSand
+atl$a BlockSand$EnumSandVariant
+atm BlockSandStone
+atm$a BlockSandStone$EnumSandstoneVariant
+atn BlockSapling
+ato BlockSeaLantern
+atp BlockShulkerBox
+atq BlockSign
+atr BlockSkull
+ats BlockSlime
+att BlockSnowBlock
+atu BlockSnow
+atv BlockSlowSand
+atw SoundEffectType
+atx BlockSponge
+aty BlockStainedGlass
+atz BlockStainedGlassPane
 au CriterionConditionNBT
-aua BlockStairs
-aua$a BlockStairs$EnumHalf
-aua$b BlockStairs$EnumStairShape
-aub BlockFloorSign
-auc BlockStationary
-aud BlockStem
-aue BlockStone
-aue$a BlockStone$EnumStoneVariant
-auf BlockSmoothBrick
-auf$a BlockSmoothBrick$EnumStonebrickType
-aug BlockStoneButton
-auh BlockDoubleStepAbstract
-auh$a BlockDoubleStepAbstract$EnumStoneSlabVariant
-aui BlockStructure
-auj BlockStructureVoid
-auk BlockLongGrass
-auk$a BlockLongGrass$EnumTallGrassType
-aul BlockThin
-aum BlockTNT
-aun BlockTorch
-auo BlockTrapdoor
-auo$a BlockTrapdoor$EnumTrapdoorHalf
-aup BlockTripwire
-auq BlockTripwireHook
-aur BlockVine
-aus BlockCobbleWall
-aus$a BlockCobbleWall$EnumCobbleVariant
-aut BlockWallSign
-auu BlockWaterLily
-auv BlockWeb
-auw BlockPressurePlateWeighted
-auy BlockWoodButton
-auz BlockWoodenStep
+aua BlockStainedHardenedClay
+aub BlockStairs
+aub$a BlockStairs$EnumHalf
+aub$b BlockStairs$EnumStairShape
+auc BlockFloorSign
+aud BlockStationary
+aue BlockStem
+auf BlockStone
+auf$a BlockStone$EnumStoneVariant
+aug BlockSmoothBrick
+aug$a BlockSmoothBrick$EnumStonebrickType
+auh BlockStoneButton
+aui BlockDoubleStepAbstract
+aui$a BlockDoubleStepAbstract$EnumStoneSlabVariant
+auj BlockStructure
+auk BlockStructureVoid
+aul BlockLongGrass
+aul$a BlockLongGrass$EnumTallGrassType
+aum BlockThin
+aun BlockTNT
+auo BlockTorch
+aup BlockTrapdoor
+aup$a BlockTrapdoor$EnumTrapdoorHalf
+auq BlockTripwire
+aur BlockTripwireHook
+aus BlockVine
+aut BlockCobbleWall
+aut$a BlockCobbleWall$EnumCobbleVariant
+auu BlockWallSign
+auv BlockWaterLily
+auw BlockWeb
+auy BlockPressurePlateWeighted
+auz BlockWoodButton
 av CriterionTriggerNetherTravel
-ava BlockCarpet
-avb BlockYellowFlowers
-avc TileEntityBanner
-avd EnumBannerPatternType
-ave TileEntityBeacon
-ave$a TileEntityBeacon$BeaconColorTracker
-avf TileEntityBed
-avg TileEntity
-avh TileEntityBrewingStand
-avi TileEntityChest
-avj TileEntityCommand
-avj$a TileEntityCommand$Type
-avk TileEntityComparator
-avl TileEntityLightDetector
-avm TileEntityDispenser
-avn TileEntityDropper
-avo TileEntityEnchantTable
-avp TileEntityEnderChest
-avq TileEntityFlowerPot
-avr TileEntityFurnace
-avs IHopper
-avt TileEntityHopper
-avu TileEntityContainer
-avv TileEntityMobSpawner
-avw TileEntityNote
-avx TileEntityLootable
-avy TileEntityShulkerBox
-avy$a TileEntityShulkerBox$AnimationPhase
-avz TileEntitySign
+ava BlockWoodenStep
+avb BlockCarpet
+avc BlockYellowFlowers
+avd TileEntityBanner
+ave EnumBannerPatternType
+avf TileEntityBeacon
+avf$a TileEntityBeacon$BeaconColorTracker
+avg TileEntityBed
+avh TileEntity
+avi TileEntityBrewingStand
+avj TileEntityChest
+avk TileEntityCommand
+avk$a TileEntityCommand$Type
+avl TileEntityComparator
+avm TileEntityLightDetector
+avn TileEntityDispenser
+avo TileEntityDropper
+avp TileEntityEnchantTable
+avq TileEntityEnderChest
+avr TileEntityFlowerPot
+avs TileEntityFurnace
+avt IHopper
+avu TileEntityHopper
+avv TileEntityContainer
+avw TileEntityMobSpawner
+avx TileEntityNote
+avy TileEntityLootable
+avz TileEntityShulkerBox
+avz$a TileEntityShulkerBox$AnimationPhase
 aw CriterionTriggerPlacedBlock
-awa TileEntitySkull
-awb TileEntityStructure
-awb$a TileEntityStructure$UsageMode
-awc TileEntityEndGateway
-awd TileEntityEnderPortal
-awg BlockPiston
-awh BlockPistonExtension
-awh$a BlockPistonExtension$EnumPistonType
-awi BlockPistonMoving
-awj TileEntityPiston
-awk PistonExtendsChecker
-awm BlockDataAbstract
-awn IBlockPhysics
-awo EnumBlockFaceShape
-awp IBlockProperties
-awq IBlockData
-awr BlockStateList
-awr$a BlockStateList$BlockData
-awt ShapeDetectorBlock
-awu ShapeDetector
-awu$a ShapeDetector$BlockLoader
-awu$b ShapeDetector$ShapeDetectorCollection
-awv ShapeDetectorBuilder
-awx MaterialPredicate
-awy BlockPredicate
-awz BlockStatePredicate
+awa TileEntitySign
+awb TileEntitySkull
+awc TileEntityStructure
+awc$a TileEntityStructure$UsageMode
+awd TileEntityEndGateway
+awe TileEntityEnderPortal
+awh BlockPiston
+awi BlockPistonExtension
+awi$a BlockPistonExtension$EnumPistonType
+awj BlockPistonMoving
+awk TileEntityPiston
+awl PistonExtendsChecker
+awn BlockDataAbstract
+awo IBlockPhysics
+awp EnumBlockFaceShape
+awq IBlockProperties
+awr IBlockData
+aws BlockStateList
+aws$a BlockStateList$BlockData
+awu ShapeDetectorBlock
+awv ShapeDetector
+awv$a ShapeDetector$BlockLoader
+awv$b ShapeDetector$ShapeDetectorCollection
+aww ShapeDetectorBuilder
+awy MaterialPredicate
+awz BlockPredicate
 ax CriterionTriggerPlayerHurtEntity
-axb BlockState
-axc BlockStateBoolean
-axd BlockStateDirection
-axe BlockStateEnum
-axf BlockStateInteger
-axg IBlockState
-axi IWorldBorderListener
-axj EnumWorldBorderState
-axk WorldBorder
-axm DataPaletteBlock
-axn ChunkGenerator
-axo IChunkProvider
-axp NibbleArray
-axr DataPaletteGlobal
-axs DataPaletteHash
-axt Chunk
-axt$a Chunk$EnumTileEntityState
-axu ChunkSection
-axv DataPaletteLinear
-axw OldNibbleArray
-axx DataPalette
-axy DataPaletteExpandable
+axa BlockStatePredicate
+axc BlockState
+axd BlockStateBoolean
+axe BlockStateDirection
+axf BlockStateEnum
+axg BlockStateInteger
+axh IBlockState
+axj IWorldBorderListener
+axk EnumWorldBorderState
+axl WorldBorder
+axn DataPaletteBlock
+axo ChunkGenerator
+axp IChunkProvider
+axq NibbleArray
+axs DataPaletteGlobal
+axt DataPaletteHash
+axu Chunk
+axu$a Chunk$EnumTileEntityState
+axv ChunkSection
+axw DataPaletteLinear
+axx OldNibbleArray
+axy DataPalette
+axz DataPaletteExpandable
 ay CriterionTriggerRecipeUnlocked
-ayb ChunkRegionLoader
-ayc IChunkLoader
-ayf OldChunkLoader
-ayf$a OldChunkLoader$OldChunk
-ayg RegionFile
-ayg$a RegionFile$ChunkBuffer
-ayh RegionFileCache
-ayj WorldProvider
-ayk DimensionManager
-ayl WorldProviderHell
-aym WorldProviderNormal
-ayn EnumDragonRespawn
-ayo EnderDragonBattle
-ayp WorldProviderTheEnd
-ays WorldGenCanyon
-ayt ChunkSnapshot
-ayu CustomWorldSettingsFinal
-ayu$a CustomWorldSettingsFinal$CustomWorldSettings
-ayu$b CustomWorldSettingsFinal$CustomWorldSettingsSerializer
-ayv ChunkProviderDebug
-ayw ChunkProviderFlat
-ayx WorldGenCaves
-ayy WorldGenBase
-ayz WorldGenCavesHell
+ayc ChunkRegionLoader
+ayd IChunkLoader
+ayg OldChunkLoader
+ayg$a OldChunkLoader$OldChunk
+ayh RegionFile
+ayh$a RegionFile$ChunkBuffer
+ayi RegionFileCache
+ayk WorldProvider
+ayl DimensionManager
+aym WorldProviderHell
+ayn WorldProviderNormal
+ayo EnumDragonRespawn
+ayp EnderDragonBattle
+ayq WorldProviderTheEnd
+ayt WorldGenCanyon
+ayu ChunkSnapshot
+ayv CustomWorldSettingsFinal
+ayv$a CustomWorldSettingsFinal$CustomWorldSettings
+ayv$b CustomWorldSettingsFinal$CustomWorldSettingsSerializer
+ayw ChunkProviderDebug
+ayx ChunkProviderFlat
+ayy WorldGenCaves
+ayz WorldGenBase
 az CriterionTriggerSummonedEntity
-aza ChunkProviderHell
-azb ChunkProviderGenerate
-azc ChunkProviderTheEnd
-azd WorldGenTreeAbstract
-aze WorldGenBigTree
-aze$a WorldGenBigTree$Position
-azf WorldGenForest
-azg WorldGenTaigaStructure
-azh WorldGenBonusChest
-azi WorldGenMushrooms
-azj WorldGenCactus
-azk WorldGenClay
-azl WorldGenDeadBush
-azm WorldGenDesertWell
-azn WorldGenTallPlant
-azo WorldGenEndGateway
-azp WorldGenEndIsland
-azq WorldGenEndTrophy
-azr WorldGenerator
-azs WorldGenFlowers
-azt WorldGenFossils
-azu WorldGenGroundBush
-azv WorldGenFire
-azw WorldGenLightStone2
-azx WorldGenHellLava
-azy WorldGenHugeMushroom
-azz WorldGenPackedIce1
+aza WorldGenCavesHell
+azb ChunkProviderHell
+azc ChunkProviderGenerate
+azd ChunkProviderTheEnd
+aze WorldGenTreeAbstract
+azf WorldGenBigTree
+azf$a WorldGenBigTree$Position
+azg WorldGenForest
+azh WorldGenTaigaStructure
+azi WorldGenBonusChest
+azj WorldGenMushrooms
+azk WorldGenCactus
+azl WorldGenClay
+azm WorldGenDeadBush
+azn WorldGenDesertWell
+azo WorldGenTallPlant
+azp WorldGenEndGateway
+azq WorldGenEndIsland
+azr WorldGenEndTrophy
+azs WorldGenerator
+azt WorldGenFlowers
+azu WorldGenFossils
+azv WorldGenGroundBush
+azw WorldGenFire
+azx WorldGenLightStone2
+azy WorldGenHellLava
+azz WorldGenHugeMushroom
 b CrashReport
 ba CriterionTriggerTamedAnimal
-baa WorldGenPackedIce2
-bab WorldGenLakes
-bac WorldGenLightStone1
-bad WorldGenJungleTree
-bae WorldGenMegaTree
-baf WorldGenMegaTreeAbstract
-bag WorldGenMelon
-bah WorldGenDungeons
-bai WorldGenMinable
-baj WorldGenTaiga1
-bak WorldGenPumpkin
-bal WorldGenReed
-bam WorldGenForestTree
-ban WorldGenSand
-bao WorldGenAcaciaTree
-bap WorldGenEnder
-bap$a WorldGenEnder$Spike
-baq WorldGenLiquids
-bar WorldGenTaiga2
-bas WorldGenSwampTree
-bat WorldGenGrass
-bau WorldGenTrees
-bav WorldGenVines
-baw WorldGenWaterLily
-bay WorldGenFlatInfo
-baz WorldGenFlatLayerInfo
+baa WorldGenPackedIce1
+bab WorldGenPackedIce2
+bac WorldGenLakes
+bad WorldGenLightStone1
+bae WorldGenJungleTree
+baf WorldGenMegaTree
+bag WorldGenMegaTreeAbstract
+bah WorldGenMelon
+bai WorldGenDungeons
+baj WorldGenMinable
+bak WorldGenTaiga1
+bal WorldGenPumpkin
+bam WorldGenReed
+ban WorldGenForestTree
+bao WorldGenSand
+bap WorldGenAcaciaTree
+baq WorldGenEnder
+baq$a WorldGenEnder$Spike
+bar WorldGenLiquids
+bas WorldGenTaiga2
+bat WorldGenSwampTree
+bau WorldGenGrass
+bav WorldGenTrees
+baw WorldGenVines
+bax WorldGenWaterLily
+baz WorldGenFlatInfo
 bb CriterionTriggerTick
-bbd StructureBoundingBox
-bbe WorldGenEndCity
-bbe$a WorldGenEndCity$Start
-bbf WorldGenEndCityPieces
-bbf$a WorldGenEndCityPieces$Piece
-bbf$b WorldGenEndCityPieces$PieceGenerator
-bbg WorldGenMineshaft
-bbg$a WorldGenMineshaft$Type
-bbh WorldGenMineshaftPieces
-bbh$a WorldGenMineshaftPieces$WorldGenMineshaftCorridor
-bbh$b WorldGenMineshaftPieces$WorldGenMineshaftCross
-bbh$d WorldGenMineshaftPieces$WorldGenMineshaftRoom
-bbh$e WorldGenMineshaftPieces$WorldGenMineshaftStairs
-bbi WorldGenMineshaftStart
-bbj WorldGenNether
-bbj$a WorldGenNether$WorldGenNetherStart
-bbk WorldGenNetherPieces
-bbk$a WorldGenNetherPieces$WorldGenNetherPiece1
-bbk$b WorldGenNetherPieces$WorldGenNetherPiece2
-bbk$c WorldGenNetherPieces$WorldGenNetherPiece3
-bbk$d WorldGenNetherPieces$WorldGenNetherPiece4
-bbk$e WorldGenNetherPieces$WorldGenNetherPiece5
-bbk$f WorldGenNetherPieces$WorldGenNetherPiece6
-bbk$g WorldGenNetherPieces$WorldGenNetherPiece7
-bbk$h WorldGenNetherPieces$WorldGenNetherPiece8
-bbk$i WorldGenNetherPieces$WorldGenNetherPiece9
-bbk$j WorldGenNetherPieces$WorldGenNetherPiece10
-bbk$k WorldGenNetherPieces$WorldGenNetherPiece11
-bbk$l WorldGenNetherPieces$WorldGenNetherPiece12
-bbk$m WorldGenNetherPieces$WorldGenNetherPiece
-bbk$n WorldGenNetherPieces$WorldGenNetherPieceWeight
-bbk$o WorldGenNetherPieces$WorldGenNetherPiece13
-bbk$p WorldGenNetherPieces$WorldGenNetherPiece14
-bbk$q WorldGenNetherPieces$WorldGenNetherPiece15
-bbl WorldGenMonument
-bbl$a WorldGenMonument$WorldGenMonumentStart
-bbm WorldGenMonumentPieces
-bbm$a WorldGenMonumentPieces$WorldGenMonumentPieceSelector7
-bbm$b WorldGenMonumentPieces$WorldGenMonumentPieceSelector6
-bbm$c WorldGenMonumentPieces$WorldGenMonumentPieceSelector5
-bbm$d WorldGenMonumentPieces$WorldGenMonumentPieceSelector4
-bbm$e WorldGenMonumentPieces$WorldGenMonumentPieceSelector3
-bbm$f WorldGenMonumentPieces$WorldGenMonumentPieceSelector2
-bbm$g WorldGenMonumentPieces$WorldGenMonumentPieceSelector1
-bbm$h WorldGenMonumentPieces$WorldGenMonumentPiece1
-bbm$i WorldGenMonumentPieces$IWorldGenMonumentPieceSelector
-bbm$j WorldGenMonumentPieces$WorldGenMonumentPiece2
-bbm$k WorldGenMonumentPieces$WorldGenMonumentPiece3
-bbm$l WorldGenMonumentPieces$WorldGenMonumentPiece4
-bbm$m WorldGenMonumentPieces$WorldGenMonumentPiece5
-bbm$n WorldGenMonumentPieces$WorldGenMonumentPiece6
-bbm$o WorldGenMonumentPieces$WorldGenMonumentPiece7
-bbm$p WorldGenMonumentPieces$WorldGenMonumentPieceEntry
-bbm$q WorldGenMonumentPieces$WorldGenMonumentPiecePenthouse
-bbm$r WorldGenMonumentPieces$WorldGenMonumentPiece
-bbm$s WorldGenMonumentPieces$WorldGenMonumentPieceSimple
-bbm$t WorldGenMonumentPieces$WorldGenMonumentPieceSimpleT
-bbm$u WorldGenMonumentPieces$WorldGenMonumentPiece8
-bbm$v WorldGenMonumentPieces$WorldGenMonumentStateTracker
-bbn WorldGenLargeFeature
-bbn$a WorldGenLargeFeature$WorldGenLargeFeatureStart
-bbo WorldGenRegistration
-bbo$a WorldGenRegistration$WorldGenPyramidPiece
-bbo$c WorldGenRegistration$WorldGenJungleTemple
-bbo$c$a WorldGenRegistration$WorldGenJungleTemple$WorldGenJungleTemplePiece
-bbo$d WorldGenRegistration$WorldGenScatteredPiece
-bbo$e WorldGenRegistration$WorldGenWitchHut
-bbp WorldGenStronghold
-bbp$a WorldGenStronghold$WorldGenStronghold2Start
-bbq WorldGenStrongholdPieces
-bbq$a WorldGenStrongholdPieces$WorldGenStrongholdChestCorridor
-bbq$b WorldGenStrongholdPieces$WorldGenStrongholdCorridor
-bbq$c WorldGenStrongholdPieces$WorldGenStrongholdCrossing
-bbq$d WorldGenStrongholdPieces$WorldGenStrongholdLeftTurn
-bbq$e WorldGenStrongholdPieces$WorldGenStrongholdLibrary
-bbq$f WorldGenStrongholdPieces$WorldGenStrongholdPieceWeight
-bbq$g WorldGenStrongholdPieces$WorldGenStrongholdPortalRoom
-bbq$h WorldGenStrongholdPieces$WorldGenStrongholdPrison
-bbq$i WorldGenStrongholdPieces$WorldGenStrongholdRightTurn
-bbq$j WorldGenStrongholdPieces$WorldGenStrongholdRoomCrossing
-bbq$k WorldGenStrongholdPieces$WorldGenStrongholdStones
-bbq$l WorldGenStrongholdPieces$WorldGenStrongholdStairs2
-bbq$m WorldGenStrongholdPieces$WorldGenStrongholdStart
-bbq$n WorldGenStrongholdPieces$WorldGenStrongholdStairs
-bbq$o WorldGenStrongholdPieces$WorldGenStrongholdStairsStraight
-bbq$p WorldGenStrongholdPieces$WorldGenStrongholdPiece
-bbq$p$a WorldGenStrongholdPieces$WorldGenStrongholdPiece$WorldGenStrongholdDoorType
-bbr StructureGenerator
-bbs WorldGenFactory
-bbt PersistentStructure
-bbu StructurePiece
-bbu$a StructurePiece$StructurePieceBlockSelector
-bbv StructureStart
-bbw DefinedStructurePiece
-bbx WorldGenVillage
-bbx$a WorldGenVillage$WorldGenVillageStart
-bby WorldGenVillagePieces
-bby$a WorldGenVillagePieces$WorldGenVillageLibrary
-bby$b WorldGenVillagePieces$WorldGenVillageFarm2
-bby$c WorldGenVillagePieces$WorldGenVillageFarm
-bby$d WorldGenVillagePieces$WorldGenVillageLight
-bby$e WorldGenVillagePieces$WorldGenVillagePieceWeight
-bby$f WorldGenVillagePieces$WorldGenVillageButcher
-bby$g WorldGenVillagePieces$WorldGenVillageHouse
-bby$h WorldGenVillagePieces$WorldGenVillageHut
-bby$i WorldGenVillagePieces$WorldGenVillageTemple
-bby$j WorldGenVillagePieces$WorldGenVillageBlacksmith
-bby$k WorldGenVillagePieces$WorldGenVillageStartPiece
-bby$l WorldGenVillagePieces$WorldGenVillageRoad
-bby$m WorldGenVillagePieces$WorldGenVillageHouse2
-bby$n WorldGenVillagePieces$WorldGenVillagePiece
-bby$o WorldGenVillagePieces$WorldGenVillageRoadPiece
-bby$p WorldGenVillagePieces$WorldGenVillageWell
-bbz WorldGenWoodlandMansion
+bba WorldGenFlatLayerInfo
+bbe StructureBoundingBox
+bbf WorldGenEndCity
+bbf$a WorldGenEndCity$Start
+bbg WorldGenEndCityPieces
+bbg$a WorldGenEndCityPieces$Piece
+bbg$b WorldGenEndCityPieces$PieceGenerator
+bbh WorldGenMineshaft
+bbh$a WorldGenMineshaft$Type
+bbi WorldGenMineshaftPieces
+bbi$a WorldGenMineshaftPieces$WorldGenMineshaftCorridor
+bbi$b WorldGenMineshaftPieces$WorldGenMineshaftCross
+bbi$d WorldGenMineshaftPieces$WorldGenMineshaftRoom
+bbi$e WorldGenMineshaftPieces$WorldGenMineshaftStairs
+bbj WorldGenMineshaftStart
+bbk WorldGenNether
+bbk$a WorldGenNether$WorldGenNetherStart
+bbl WorldGenNetherPieces
+bbl$a WorldGenNetherPieces$WorldGenNetherPiece1
+bbl$b WorldGenNetherPieces$WorldGenNetherPiece2
+bbl$c WorldGenNetherPieces$WorldGenNetherPiece3
+bbl$d WorldGenNetherPieces$WorldGenNetherPiece4
+bbl$e WorldGenNetherPieces$WorldGenNetherPiece5
+bbl$f WorldGenNetherPieces$WorldGenNetherPiece6
+bbl$g WorldGenNetherPieces$WorldGenNetherPiece7
+bbl$h WorldGenNetherPieces$WorldGenNetherPiece8
+bbl$i WorldGenNetherPieces$WorldGenNetherPiece9
+bbl$j WorldGenNetherPieces$WorldGenNetherPiece10
+bbl$k WorldGenNetherPieces$WorldGenNetherPiece11
+bbl$l WorldGenNetherPieces$WorldGenNetherPiece12
+bbl$m WorldGenNetherPieces$WorldGenNetherPiece
+bbl$n WorldGenNetherPieces$WorldGenNetherPieceWeight
+bbl$o WorldGenNetherPieces$WorldGenNetherPiece13
+bbl$p WorldGenNetherPieces$WorldGenNetherPiece14
+bbl$q WorldGenNetherPieces$WorldGenNetherPiece15
+bbm WorldGenMonument
+bbm$a WorldGenMonument$WorldGenMonumentStart
+bbn WorldGenMonumentPieces
+bbn$a WorldGenMonumentPieces$WorldGenMonumentPieceSelector7
+bbn$b WorldGenMonumentPieces$WorldGenMonumentPieceSelector6
+bbn$c WorldGenMonumentPieces$WorldGenMonumentPieceSelector5
+bbn$d WorldGenMonumentPieces$WorldGenMonumentPieceSelector4
+bbn$e WorldGenMonumentPieces$WorldGenMonumentPieceSelector3
+bbn$f WorldGenMonumentPieces$WorldGenMonumentPieceSelector2
+bbn$g WorldGenMonumentPieces$WorldGenMonumentPieceSelector1
+bbn$h WorldGenMonumentPieces$WorldGenMonumentPiece1
+bbn$i WorldGenMonumentPieces$IWorldGenMonumentPieceSelector
+bbn$j WorldGenMonumentPieces$WorldGenMonumentPiece2
+bbn$k WorldGenMonumentPieces$WorldGenMonumentPiece3
+bbn$l WorldGenMonumentPieces$WorldGenMonumentPiece4
+bbn$m WorldGenMonumentPieces$WorldGenMonumentPiece5
+bbn$n WorldGenMonumentPieces$WorldGenMonumentPiece6
+bbn$o WorldGenMonumentPieces$WorldGenMonumentPiece7
+bbn$p WorldGenMonumentPieces$WorldGenMonumentPieceEntry
+bbn$q WorldGenMonumentPieces$WorldGenMonumentPiecePenthouse
+bbn$r WorldGenMonumentPieces$WorldGenMonumentPiece
+bbn$s WorldGenMonumentPieces$WorldGenMonumentPieceSimple
+bbn$t WorldGenMonumentPieces$WorldGenMonumentPieceSimpleT
+bbn$u WorldGenMonumentPieces$WorldGenMonumentPiece8
+bbn$v WorldGenMonumentPieces$WorldGenMonumentStateTracker
+bbo WorldGenLargeFeature
+bbo$a WorldGenLargeFeature$WorldGenLargeFeatureStart
+bbp WorldGenRegistration
+bbp$a WorldGenRegistration$WorldGenPyramidPiece
+bbp$c WorldGenRegistration$WorldGenJungleTemple
+bbp$c$a WorldGenRegistration$WorldGenJungleTemple$WorldGenJungleTemplePiece
+bbp$d WorldGenRegistration$WorldGenScatteredPiece
+bbp$e WorldGenRegistration$WorldGenWitchHut
+bbq WorldGenStronghold
+bbq$a WorldGenStronghold$WorldGenStronghold2Start
+bbr WorldGenStrongholdPieces
+bbr$a WorldGenStrongholdPieces$WorldGenStrongholdChestCorridor
+bbr$b WorldGenStrongholdPieces$WorldGenStrongholdCorridor
+bbr$c WorldGenStrongholdPieces$WorldGenStrongholdCrossing
+bbr$d WorldGenStrongholdPieces$WorldGenStrongholdLeftTurn
+bbr$e WorldGenStrongholdPieces$WorldGenStrongholdLibrary
+bbr$f WorldGenStrongholdPieces$WorldGenStrongholdPieceWeight
+bbr$g WorldGenStrongholdPieces$WorldGenStrongholdPortalRoom
+bbr$h WorldGenStrongholdPieces$WorldGenStrongholdPrison
+bbr$i WorldGenStrongholdPieces$WorldGenStrongholdRightTurn
+bbr$j WorldGenStrongholdPieces$WorldGenStrongholdRoomCrossing
+bbr$k WorldGenStrongholdPieces$WorldGenStrongholdStones
+bbr$l WorldGenStrongholdPieces$WorldGenStrongholdStairs2
+bbr$m WorldGenStrongholdPieces$WorldGenStrongholdStart
+bbr$n WorldGenStrongholdPieces$WorldGenStrongholdStairs
+bbr$o WorldGenStrongholdPieces$WorldGenStrongholdStairsStraight
+bbr$p WorldGenStrongholdPieces$WorldGenStrongholdPiece
+bbr$p$a WorldGenStrongholdPieces$WorldGenStrongholdPiece$WorldGenStrongholdDoorType
+bbs StructureGenerator
+bbt WorldGenFactory
+bbu PersistentStructure
+bbv StructurePiece
+bbv$a StructurePiece$StructurePieceBlockSelector
+bbw StructureStart
+bbx DefinedStructurePiece
+bby WorldGenVillage
+bby$a WorldGenVillage$WorldGenVillageStart
+bbz WorldGenVillagePieces
+bbz$a WorldGenVillagePieces$WorldGenVillageLibrary
+bbz$b WorldGenVillagePieces$WorldGenVillageFarm2
+bbz$c WorldGenVillagePieces$WorldGenVillageFarm
+bbz$d WorldGenVillagePieces$WorldGenVillageLight
+bbz$e WorldGenVillagePieces$WorldGenVillagePieceWeight
+bbz$f WorldGenVillagePieces$WorldGenVillageButcher
+bbz$g WorldGenVillagePieces$WorldGenVillageHouse
+bbz$h WorldGenVillagePieces$WorldGenVillageHut
+bbz$i WorldGenVillagePieces$WorldGenVillageTemple
+bbz$j WorldGenVillagePieces$WorldGenVillageBlacksmith
+bbz$k WorldGenVillagePieces$WorldGenVillageStartPiece
+bbz$l WorldGenVillagePieces$WorldGenVillageRoad
+bbz$m WorldGenVillagePieces$WorldGenVillageHouse2
+bbz$n WorldGenVillagePieces$WorldGenVillagePiece
+bbz$o WorldGenVillagePieces$WorldGenVillageRoadPiece
+bbz$p WorldGenVillagePieces$WorldGenVillageWell
 bc CriterionTriggerVillagerTrade
-bca WorldGenWoodlandMansionPieces
-bcc DefinedStructureProcessorRotation
-bcd DefinedStructureManager
-bce DefinedStructureInfo
-bcf DefinedStructureProcessor
-bcg DefinedStructure
-bcg$b DefinedStructure$BlockInfo
-bcg$c DefinedStructure$EntityInfo
-bcl NoiseGeneratorPerlin
-bcm NoiseGeneratorOctaves
-bcn NoiseGenerator3
-bcq NoiseGenerator3Handler
-bcr NoiseGenerator
-bct MaterialDecoration
-bcu MaterialGas
-bcv MaterialLiquid
-bcw Material
-bcx MaterialMapColor
-bcy MaterialPortal
-bcz EnumPistonReaction
+bca WorldGenWoodlandMansion
+bcb WorldGenWoodlandMansionPieces
+bcd DefinedStructureProcessorRotation
+bce DefinedStructureManager
+bcf DefinedStructureInfo
+bcg DefinedStructureProcessor
+bch DefinedStructure
+bch$b DefinedStructure$BlockInfo
+bch$c DefinedStructure$EntityInfo
+bcm NoiseGeneratorPerlin
+bcn NoiseGeneratorOctaves
+bco NoiseGenerator3
+bcr NoiseGenerator3Handler
+bcs NoiseGenerator
+bcu MaterialDecoration
+bcv MaterialGas
+bcw MaterialLiquid
+bcx Material
+bcy MaterialMapColor
+bcz MaterialPortal
 bd CriterionTriggerUsedEnderEye
-bdb GenLayerDeepOcean
-bdc GenLayerSpecial
-bdc$a GenLayerSpecial$EnumGenLayerSpecial
-bdd GenLayerIsland
-bde GenLayerMushroomIsland
-bdf GenLayerTopSoil
-bdg GenLayerDesert
-bdh GenLayerBiome
-bdj GenLayerZoomFuzzy
-bdl IntCache
-bdm LayerIsland
-bdn GenLayer
-bdo GenLayerPlains
-bdp GenLayerRegionHills
-bdq GenLayerIcePlains
-bdr GenLayerCleaner
-bds GenLayerRiver
-bdt GenLayerRiverMix
-bdu GenLayerMushroomShore
-bdv GenLayerSmooth
-bdz GenLayerZoomVoronoi
+bda EnumPistonReaction
+bdc GenLayerDeepOcean
+bdd GenLayerSpecial
+bdd$a GenLayerSpecial$EnumGenLayerSpecial
+bde GenLayerIsland
+bdf GenLayerMushroomIsland
+bdg GenLayerTopSoil
+bdh GenLayerDesert
+bdi GenLayerBiome
+bdk GenLayerZoomFuzzy
+bdm IntCache
+bdn LayerIsland
+bdo GenLayer
+bdp GenLayerPlains
+bdq GenLayerRegionHills
+bdr GenLayerIcePlains
+bds GenLayerCleaner
+bdt GenLayerRiver
+bdu GenLayerRiverMix
+bdv GenLayerMushroomShore
+bdw GenLayerSmooth
 be CriterionTriggerUsedTotem
-bea GenLayerZoom
-bed Path
-bee PathType
-bef PathfinderFlying
-beg PathPoint
-beh PathfinderAbstract
-bei PathEntity
-bej Pathfinder
-bek PathfinderWater
-bel PathfinderNormal
-bep RunnableSaveScoreboard
-beq PersistentBase
-ber MapIcon
-ber$a MapIcon$Type
-bes WorldMap
-bes$a WorldMap$WorldMapHumanTracker
-bev ServerNBTManager
-bew WorldLoaderServer
-bex SecondaryWorldData
-bey WorldNBTStorage
-bez WorldLoader
-bfa WorldData
-bfb IDataManager
-bfd Convertable
-bfh IPlayerFileData
-bfj PersistentCollection
-bfk LootTables
-bfl LootSelectorEmpty
-bfm LootItem
-bfn LootSelector
-bfo LotoSelectorEntry
-bfp LootTable
-bfq LootTableInfo
-bfq$b LootTableInfo$EntityTarget
-bfr LootSelectorLootTable
-bfs LootTableRegistry
-bft LootValueBounds
-bfu LootItemFunctionEnchant
-bfv LootEnchantLevel
-bfw LootItemFunction
-bfx LootItemFunctions
-bfy LootEnchantFunction
-bfz LootItemFunctionSetAttribute
-bga LootItemFunctionSetCount
-bgb LootItemFunctionSetDamage
-bgc LootItemFunctionSetData
-bgd LootItemFunctionSetTag
-bge LootItemFunctionSmelt
-bgh LootItemConditionEntityScore
-bgi LootItemCondition
-bgj LootItemConditions
-bgk LootItemConditionEntityProperty
-bgl LootItemConditionKilledByPlayer
-bgm LootItemConditionRandomChance
-bgn LootItemConditionRandomChanceWithLooting
-bgp LootEntityProperties
-bgq LootEntityProperty
-bgr LootEntityPropertyOnFire
-bgu FileIOThread
-bgv IAsyncChunkSaver
-bgy AxisAlignedBB
-bgz MovingObjectPosition
-bgz$a MovingObjectPosition$EnumMovingObjectType
+bea GenLayerZoomVoronoi
+beb GenLayerZoom
+bee Path
+bef PathType
+beg PathfinderFlying
+beh PathPoint
+bei PathfinderAbstract
+bej PathEntity
+bek Pathfinder
+bel PathfinderWater
+bem PathfinderNormal
+beq RunnableSaveScoreboard
+ber PersistentBase
+bes MapIcon
+bes$a MapIcon$Type
+bet WorldMap
+bet$a WorldMap$WorldMapHumanTracker
+bew ServerNBTManager
+bex WorldLoaderServer
+bey SecondaryWorldData
+bez WorldNBTStorage
+bfa WorldLoader
+bfb WorldData
+bfc IDataManager
+bfe Convertable
+bfi IPlayerFileData
+bfk PersistentCollection
+bfl LootTables
+bfm LootSelectorEmpty
+bfn LootItem
+bfo LootSelector
+bfp LotoSelectorEntry
+bfq LootTable
+bfr LootTableInfo
+bfr$b LootTableInfo$EntityTarget
+bfs LootSelectorLootTable
+bft LootTableRegistry
+bfu LootValueBounds
+bfv LootItemFunctionEnchant
+bfw LootEnchantLevel
+bfx LootItemFunction
+bfy LootItemFunctions
+bfz LootEnchantFunction
+bga LootItemFunctionSetAttribute
+bgb LootItemFunctionSetCount
+bgc LootItemFunctionSetDamage
+bgd LootItemFunctionSetData
+bge LootItemFunctionSetTag
+bgf LootItemFunctionSmelt
+bgi LootItemConditionEntityScore
+bgj LootItemCondition
+bgk LootItemConditions
+bgl LootItemConditionEntityProperty
+bgm LootItemConditionKilledByPlayer
+bgn LootItemConditionRandomChance
+bgo LootItemConditionRandomChanceWithLooting
+bgq LootEntityProperties
+bgr LootEntityProperty
+bgs LootEntityPropertyOnFire
+bgv FileIOThread
+bgw IAsyncChunkSaver
+bgz AxisAlignedBB
 bh ICommandDispatcher
-bhb Vec3D
-bhd ScoreboardObjective
-bhe ScoreboardTeam
-bhf ScoreboardScore
-bhh Scoreboard
-bhi PersistentScoreboard
-bhj ScoreboardTeamBase
-bhj$a ScoreboardTeamBase$EnumTeamPush
-bhj$b ScoreboardTeamBase$EnumNameTagVisibility
-bhk ScoreboardCriteriaInteger
-bhl ScoreboardBaseCriteria
-bhm ScoreboardHealthCriteria
-bhn IScoreboardCriteria
-bhn$a IScoreboardCriteria$EnumScoreboardHealthDisplay
-bho ScoreboardReadOnlyCriteria
-bhp ScoreboardStatisticCriteria
+bha MovingObjectPosition
+bha$a MovingObjectPosition$EnumMovingObjectType
+bhc Vec3D
+bhe ScoreboardObjective
+bhf ScoreboardTeam
+bhg ScoreboardScore
+bhi Scoreboard
+bhj PersistentScoreboard
+bhk ScoreboardTeamBase
+bhk$a ScoreboardTeamBase$EnumTeamPush
+bhk$b ScoreboardTeamBase$EnumNameTagVisibility
+bhl ScoreboardCriteriaInteger
+bhm ScoreboardBaseCriteria
+bhn ScoreboardHealthCriteria
+bho IScoreboardCriteria
+bho$a IScoreboardCriteria$EnumScoreboardHealthDisplay
+bhp ScoreboardReadOnlyCriteria
+bhq ScoreboardStatisticCriteria
 bi CommandAbstract
 bi$a CommandAbstract$CommandNumber
 bj CommandHandler
diff --git a/mappings/bukkit-1.12-pre5-members.csrg b/mappings/bukkit-1.12-pre6-members.csrg
index 73737b1..58ead87 100644
--- a/mappings/bukkit-1.12-pre5-members.csrg
+++ b/mappings/bukkit-1.12-pre6-members.csrg
@@ -93,8 +93,8 @@ Block s (LIBlockData;)Z isOccluding
 Block t ()LIBlockData; getBlockData
 Block u isTileEntity
 Block v ()LSoundEffectType; getStepSound
+Block v (LIBlockData;)Z isComplexRedstone
 Block v stepSound
-Block w (LIBlockData;)Z isComplexRedstone
 Block x material
 Block z frictionFactor
 Block$EnumRandomOffset a NONE
@@ -1036,7 +1036,7 @@ Entity a (LWorld;)V spawnIn
 Entity a (Ljava/lang/String;)Z addScoreboardTag
 Entity aA ()Z isAlive
 Entity aB ()Z inBlock
-Entity aC ()V leaveVehicle
+Entity aF ()V ejectPassengers
 Entity aF invulnerable
 Entity aN ()Ljava/lang/Iterable; getArmorItems
 Entity aP ()Z isBurning
@@ -1745,6 +1745,7 @@ EnumChatFormat s STRIKETHROUGH
 EnumChatFormat t UNDERLINE
 EnumChatFormat u ITALIC
 EnumChatFormat v RESET
+EnumChatFormat z character
 EnumColor a ()I getColorIndex
 EnumColor a (I)LEnumColor; fromInvColorIndex
 EnumColor a WHITE
@@ -2359,8 +2360,8 @@ JsonListEntry e ()Z hasExpired
 JsonListEntry f ()Ljava/lang/Object; getKey
 LazyInitVar b ()Ljava/lang/Object; init
 LocaleI18n a (Ljava/lang/String;)Ljava/lang/String; get
-LoginListener a (Ljava/lang/String;)V disconnect
 LoginListener a networkManager
+LoginListener b (LIChatBaseComponent;)V disconnect 
 LoginListener d random
 LoginListener f server
 LoginListener k loginKey
@@ -2740,11 +2741,11 @@ PlayerConnection F receivedMovePackets
 PlayerConnection G processedMovePackets
 PlayerConnection a (LPacket;)V sendPacket
 PlayerConnection a networkManager
+PlayerConnection b (LIChatBaseComponent;)V disconnect 
 PlayerConnection b player
 PlayerConnection c ()V syncPosition
-PlayerConnection c (Ljava/lang/String;)V disconnect
+PlayerConnection c (Ljava/lang/String;)V handleCommand
 PlayerConnection c LOGGER
-PlayerConnection d (Ljava/lang/String;)V handleCommand
 PlayerConnection d minecraftServer
 PlayerConnection i chatThrottle
 PlayerConnection y teleportPos
@@ -2762,12 +2763,12 @@ PlayerInteractManager e lastDigTick
 PlayerInteractManager g currentTick
 PlayerInventory a items
 PlayerInventory b armor
-PlayerInventory c (LItemStack;)I firstPartial
 PlayerInventory c extraSlots
-PlayerInventory d (LItemStack;)Z pickup
+PlayerInventory d (LItemStack;)I firstPartial
 PlayerInventory d itemInHandIndex
+PlayerInventory e (LItemStack;)Z pickup
 PlayerInventory e player
-PlayerInventory f (LItemStack;)V setCarried
+PlayerInventory g (LItemStack;)V setCarried
 PlayerInventory g carried
 PlayerInventory i ()LItemStack; getItemInHand
 PlayerInventory j ()I getHotbarSize
@@ -2908,6 +2909,7 @@ ScoreboardScore d playerName
 ScoreboardScore e ()Ljava/lang/String; getPlayerName
 ScoreboardScore e score
 ScoreboardServer d (LScoreboardObjective;)Ljava/util/List; getScoreboardScorePacketsForObjective
+ScoreboardTeam a (LEnumChatFormat;)V setColor
 ScoreboardTeam a (LScoreboardTeamBase$EnumNameTagVisibility;)V setNameTagVisibility
 ScoreboardTeam a (LScoreboardTeamBase$EnumTeamPush;)V setCollisionRule
 ScoreboardTeam a (LScoreboardTeamBase;Ljava/lang/String;)Ljava/lang/String; getPlayerDisplayName
@@ -2930,6 +2932,7 @@ ScoreboardTeamBase d (Ljava/lang/String;)Ljava/lang/String; getFormattedName
 ScoreboardTeamBase g ()Z allowFriendlyFire
 ScoreboardTeamBase j ()LScoreboardTeamBase$EnumNameTagVisibility; getDeathMessageVisibility
 ScoreboardTeamBase k ()LScoreboardTeamBase$EnumTeamPush; getCollisionRule
+ScoreboardTeamBase m ()LEnumChatFormat; getColor
 ScoreboardTeamBase$EnumNameTagVisibility a ALWAYS
 ScoreboardTeamBase$EnumNameTagVisibility b NEVER
 ScoreboardTeamBase$EnumNameTagVisibility c HIDE_FOR_OTHER_TEAMS
@@ -2952,12 +2955,12 @@ ServerPing c ()LServerPing$ServerData; getServerData
 ServerPing$ServerData b ()I getProtocolVersion
 ShapeDetector$ShapeDetectorCollection b ()LEnumDirection; getFacing
 ShapeDetectorBlock d ()LBlockPosition; getPosition
-ShapedRecipes b width
-ShapedRecipes c height
-ShapedRecipes d items
-ShapedRecipes e result
-ShapelessRecipes b result
-ShapelessRecipes c ingredients
+ShapedRecipes a width
+ShapedRecipes b height
+ShapedRecipes c items
+ShapedRecipes d result
+ShapelessRecipes a result
+ShapelessRecipes b ingredients
 SharedConstants a (C)Z isAllowedChatCharacter
 SharedConstants c allowedCharacters
 Slot a ()I getMaxStackSize
diff --git a/mappings/bukkit-1.12-pre5.at b/mappings/bukkit-1.12-pre6.at
index 990ec7c..87e0cf2 100644
--- a/mappings/bukkit-1.12-pre5.at
+++ b/mappings/bukkit-1.12-pre6.at
@@ -97,6 +97,7 @@ public net/minecraft/server/EntityMinecartCommandBlock/COMMAND
 public net/minecraft/server/EntityPigZombie/angerLevel
 public net/minecraft/server/EntityPlayer/invulnerableTicks
 public net/minecraft/server/EntityPlayer/lastSentExp
+public net/minecraft/server/EntityPlayer/locale
 public net/minecraft/server/EntityPlayer/nextContainerCounter()V
 public net/minecraft/server/EntityPlayer/removeQueue
 public net/minecraft/server/EntityPlayer/worldChangeInvuln
@@ -113,6 +114,7 @@ public net/minecraft/server/EntityTrackerEntry/trackedPlayers
 public net/minecraft/server/EntityVillager/inventory
 public net/minecraft/server/EntityVillager/riches
 public net/minecraft/server/EntityZombie/setSize(FF)V
+public net/minecraft/server/EnumChatFormat/character
 public net/minecraft/server/Explosion/source
 public net/minecraft/server/FoodMetaData/exhaustionLevel
 public net/minecraft/server/FoodMetaData/foodLevel