Update to Minecraft 1.9.2

3 files changed, 302 insertions, 302 deletions

diff --git a/mappings/bukkit-1.9-cl.csrg b/mappings/bukkit-1.9.2-cl.csrg
index f13cc80..f4af802 100644
--- a/mappings/bukkit-1.9-cl.csrg
+++ b/mappings/bukkit-1.9.2-cl.csrg
@@ -564,313 +564,313 @@ asq RegionFile
 asq$a RegionFile$ChunkBuffer
 asr RegionFileCache
 ass ChunkRegionLoader
-asv WorldProvider
-asw DimensionManager
-asx WorldProviderHell
-asy WorldProviderNormal
-asz EnumDragonRespawn
+asu WorldProvider
+asv DimensionManager
+asw WorldProviderHell
+asx WorldProviderNormal
+asy EnumDragonRespawn
+asz EnderDragonBattle
 at CommandParticle
-ata EnderDragonBattle
-atb WorldProviderTheEnd
-ate WorldGenCanyon
-atf ChunkSnapshot
-atg CustomWorldSettingsFinal
-atg$a CustomWorldSettingsFinal$CustomWorldSettings
-atg$b CustomWorldSettingsFinal$CustomWorldSettingsSerializer
-ath ChunkProviderDebug
-ati ChunkProviderFlat
-atj WorldGenCaves
-atk WorldGenBase
-atl WorldGenCavesHell
-atm ChunkProviderHell
-atn ChunkProviderGenerate
-ato ChunkProviderTheEnd
-atp WorldGenTreeAbstract
-atq WorldGenBigTree
-atq$a WorldGenBigTree$Position
-atr WorldGenForest
-ats WorldGenTaigaStructure
-att WorldGenBonusChest
-atu WorldGenMushrooms
-atv WorldGenCactus
-atw WorldGenClay
-atx WorldGenDeadBush
-aty WorldGenDesertWell
-atz WorldGenTallPlant
+ata WorldProviderTheEnd
+atd WorldGenCanyon
+ate ChunkSnapshot
+atf CustomWorldSettingsFinal
+atf$a CustomWorldSettingsFinal$CustomWorldSettings
+atf$b CustomWorldSettingsFinal$CustomWorldSettingsSerializer
+atg ChunkProviderDebug
+ath ChunkProviderFlat
+ati WorldGenCaves
+atj WorldGenBase
+atk WorldGenCavesHell
+atl ChunkProviderHell
+atm ChunkProviderGenerate
+atn ChunkProviderTheEnd
+ato WorldGenTreeAbstract
+atp WorldGenBigTree
+atp$a WorldGenBigTree$Position
+atq WorldGenForest
+atr WorldGenTaigaStructure
+ats WorldGenBonusChest
+att WorldGenMushrooms
+atu WorldGenCactus
+atv WorldGenClay
+atw WorldGenDeadBush
+atx WorldGenDesertWell
+aty WorldGenTallPlant
+atz WorldGenEndGateway
 au CommandPlaySound
-aua WorldGenEndGateway
-aub WorldGenEndIsland
-auc WorldGenEndTrophy
-aud WorldGenerator
-aue WorldGenFlowers
-auf WorldGenGroundBush
-aug WorldGenFire
-auh WorldGenLightStone2
-aui WorldGenHellLava
-auj WorldGenHugeMushroom
-auk WorldGenPackedIce1
-aul WorldGenPackedIce2
-aum WorldGenLakes
-aun WorldGenLightStone1
-auo WorldGenJungleTree
-aup WorldGenMegaTree
-auq WorldGenMegaTreeAbstract
-aur WorldGenMelon
-aus WorldGenDungeons
-aut WorldGenMinable
-auu WorldGenTaiga1
-auv WorldGenPumpkin
-auw WorldGenReed
-auy WorldGenForestTree
-auz WorldGenSand
+aua WorldGenEndIsland
+aub WorldGenEndTrophy
+auc WorldGenerator
+aud WorldGenFlowers
+aue WorldGenGroundBush
+auf WorldGenFire
+aug WorldGenLightStone2
+auh WorldGenHellLava
+aui WorldGenHugeMushroom
+auj WorldGenPackedIce1
+auk WorldGenPackedIce2
+aul WorldGenLakes
+aum WorldGenLightStone1
+aun WorldGenJungleTree
+auo WorldGenMegaTree
+aup WorldGenMegaTreeAbstract
+auq WorldGenMelon
+aur WorldGenDungeons
+aus WorldGenMinable
+aut WorldGenTaiga1
+auu WorldGenPumpkin
+auv WorldGenReed
+auw WorldGenForestTree
+auy WorldGenSand
+auz WorldGenAcaciaTree
 av CommandPublish
-ava WorldGenAcaciaTree
-avb WorldGenEnder
-avb$a WorldGenEnder$Spike
-avc WorldGenLiquids
-avd WorldGenTaiga2
-ave WorldGenSwampTree
-avf WorldGenGrass
-avg WorldGenTrees
-avh WorldGenVines
-avi WorldGenWaterLily
-avk WorldGenFlatInfo
-avl WorldGenFlatLayerInfo
-avp StructureBoundingBox
-avq WorldGenEndCity
-avq$a WorldGenEndCity$Start
-avr WorldGenEndCityPieces
-avr$a WorldGenEndCityPieces$Piece
-avr$b WorldGenEndCityPieces$PieceGenerator
-avs WorldGenMineshaft
-avt WorldGenMineshaftPieces
-avt$a WorldGenMineshaftPieces$WorldGenMineshaftCorridor
-avt$b WorldGenMineshaftPieces$WorldGenMineshaftCross
-avt$c WorldGenMineshaftPieces$WorldGenMineshaftRoom
-avt$d WorldGenMineshaftPieces$WorldGenMineshaftStairs
-avu WorldGenMineshaftStart
-avv WorldGenNether
-avv$a WorldGenNether$WorldGenNetherStart
-avw WorldGenNetherPieces
-avw$a WorldGenNetherPieces$WorldGenNetherPiece1
-avw$b WorldGenNetherPieces$WorldGenNetherPiece2
-avw$c WorldGenNetherPieces$WorldGenNetherPiece3
-avw$d WorldGenNetherPieces$WorldGenNetherPiece4
-avw$e WorldGenNetherPieces$WorldGenNetherPiece5
-avw$f WorldGenNetherPieces$WorldGenNetherPiece6
-avw$g WorldGenNetherPieces$WorldGenNetherPiece7
-avw$h WorldGenNetherPieces$WorldGenNetherPiece8
-avw$i WorldGenNetherPieces$WorldGenNetherPiece9
-avw$j WorldGenNetherPieces$WorldGenNetherPiece10
-avw$k WorldGenNetherPieces$WorldGenNetherPiece11
-avw$l WorldGenNetherPieces$WorldGenNetherPiece12
-avw$m WorldGenNetherPieces$WorldGenNetherPiece
-avw$n WorldGenNetherPieces$WorldGenNetherPieceWeight
-avw$o WorldGenNetherPieces$WorldGenNetherPiece13
-avw$p WorldGenNetherPieces$WorldGenNetherPiece14
-avw$q WorldGenNetherPieces$WorldGenNetherPiece15
-avx WorldGenMonument
-avx$a WorldGenMonument$WorldGenMonumentStart
-avy WorldGenMonumentPieces
-avy$a WorldGenMonumentPieces$WorldGenMonumentPieceSelector7
-avy$b WorldGenMonumentPieces$WorldGenMonumentPieceSelector6
-avy$c WorldGenMonumentPieces$WorldGenMonumentPieceSelector5
-avy$d WorldGenMonumentPieces$WorldGenMonumentPieceSelector4
-avy$e WorldGenMonumentPieces$WorldGenMonumentPieceSelector3
-avy$f WorldGenMonumentPieces$WorldGenMonumentPieceSelector2
-avy$g WorldGenMonumentPieces$WorldGenMonumentPieceSelector1
-avy$h WorldGenMonumentPieces$WorldGenMonumentPiece1
-avy$i WorldGenMonumentPieces$IWorldGenMonumentPieceSelector
-avy$j WorldGenMonumentPieces$WorldGenMonumentPiece2
-avy$k WorldGenMonumentPieces$WorldGenMonumentPiece3
-avy$l WorldGenMonumentPieces$WorldGenMonumentPiece4
-avy$m WorldGenMonumentPieces$WorldGenMonumentPiece5
-avy$n WorldGenMonumentPieces$WorldGenMonumentPiece6
-avy$o WorldGenMonumentPieces$WorldGenMonumentPiece7
-avy$p WorldGenMonumentPieces$WorldGenMonumentPieceEntry
-avy$q WorldGenMonumentPieces$WorldGenMonumentPiecePenthouse
-avy$r WorldGenMonumentPieces$WorldGenMonumentPiece
-avy$s WorldGenMonumentPieces$WorldGenMonumentPieceSimple
-avy$t WorldGenMonumentPieces$WorldGenMonumentPieceSimpleT
-avy$u WorldGenMonumentPieces$WorldGenMonumentPiece8
-avy$v WorldGenMonumentPieces$WorldGenMonumentStateTracker
-avz WorldGenLargeFeature
-avz$a WorldGenLargeFeature$WorldGenLargeFeatureStart
+ava WorldGenEnder
+ava$a WorldGenEnder$Spike
+avb WorldGenLiquids
+avc WorldGenTaiga2
+avd WorldGenSwampTree
+ave WorldGenGrass
+avf WorldGenTrees
+avg WorldGenVines
+avh WorldGenWaterLily
+avj WorldGenFlatInfo
+avk WorldGenFlatLayerInfo
+avo StructureBoundingBox
+avp WorldGenEndCity
+avp$a WorldGenEndCity$Start
+avq WorldGenEndCityPieces
+avq$a WorldGenEndCityPieces$Piece
+avq$b WorldGenEndCityPieces$PieceGenerator
+avr WorldGenMineshaft
+avs WorldGenMineshaftPieces
+avs$a WorldGenMineshaftPieces$WorldGenMineshaftCorridor
+avs$b WorldGenMineshaftPieces$WorldGenMineshaftCross
+avs$c WorldGenMineshaftPieces$WorldGenMineshaftRoom
+avs$d WorldGenMineshaftPieces$WorldGenMineshaftStairs
+avt WorldGenMineshaftStart
+avu WorldGenNether
+avu$a WorldGenNether$WorldGenNetherStart
+avv WorldGenNetherPieces
+avv$a WorldGenNetherPieces$WorldGenNetherPiece1
+avv$b WorldGenNetherPieces$WorldGenNetherPiece2
+avv$c WorldGenNetherPieces$WorldGenNetherPiece3
+avv$d WorldGenNetherPieces$WorldGenNetherPiece4
+avv$e WorldGenNetherPieces$WorldGenNetherPiece5
+avv$f WorldGenNetherPieces$WorldGenNetherPiece6
+avv$g WorldGenNetherPieces$WorldGenNetherPiece7
+avv$h WorldGenNetherPieces$WorldGenNetherPiece8
+avv$i WorldGenNetherPieces$WorldGenNetherPiece9
+avv$j WorldGenNetherPieces$WorldGenNetherPiece10
+avv$k WorldGenNetherPieces$WorldGenNetherPiece11
+avv$l WorldGenNetherPieces$WorldGenNetherPiece12
+avv$m WorldGenNetherPieces$WorldGenNetherPiece
+avv$n WorldGenNetherPieces$WorldGenNetherPieceWeight
+avv$o WorldGenNetherPieces$WorldGenNetherPiece13
+avv$p WorldGenNetherPieces$WorldGenNetherPiece14
+avv$q WorldGenNetherPieces$WorldGenNetherPiece15
+avw WorldGenMonument
+avw$a WorldGenMonument$WorldGenMonumentStart
+avx WorldGenMonumentPieces
+avx$a WorldGenMonumentPieces$WorldGenMonumentPieceSelector7
+avx$b WorldGenMonumentPieces$WorldGenMonumentPieceSelector6
+avx$c WorldGenMonumentPieces$WorldGenMonumentPieceSelector5
+avx$d WorldGenMonumentPieces$WorldGenMonumentPieceSelector4
+avx$e WorldGenMonumentPieces$WorldGenMonumentPieceSelector3
+avx$f WorldGenMonumentPieces$WorldGenMonumentPieceSelector2
+avx$g WorldGenMonumentPieces$WorldGenMonumentPieceSelector1
+avx$h WorldGenMonumentPieces$WorldGenMonumentPiece1
+avx$i WorldGenMonumentPieces$IWorldGenMonumentPieceSelector
+avx$j WorldGenMonumentPieces$WorldGenMonumentPiece2
+avx$k WorldGenMonumentPieces$WorldGenMonumentPiece3
+avx$l WorldGenMonumentPieces$WorldGenMonumentPiece4
+avx$m WorldGenMonumentPieces$WorldGenMonumentPiece5
+avx$n WorldGenMonumentPieces$WorldGenMonumentPiece6
+avx$o WorldGenMonumentPieces$WorldGenMonumentPiece7
+avx$p WorldGenMonumentPieces$WorldGenMonumentPieceEntry
+avx$q WorldGenMonumentPieces$WorldGenMonumentPiecePenthouse
+avx$r WorldGenMonumentPieces$WorldGenMonumentPiece
+avx$s WorldGenMonumentPieces$WorldGenMonumentPieceSimple
+avx$t WorldGenMonumentPieces$WorldGenMonumentPieceSimpleT
+avx$u WorldGenMonumentPieces$WorldGenMonumentPiece8
+avx$v WorldGenMonumentPieces$WorldGenMonumentStateTracker
+avy WorldGenLargeFeature
+avy$a WorldGenLargeFeature$WorldGenLargeFeatureStart
+avz WorldGenRegistration
+avz$a WorldGenRegistration$WorldGenPyramidPiece
+avz$c WorldGenRegistration$WorldGenJungleTemple
+avz$c$a WorldGenRegistration$WorldGenJungleTemple$WorldGenJungleTemplePiece
+avz$d WorldGenRegistration$WorldGenScatteredPiece
+avz$e WorldGenRegistration$WorldGenWitchHut
 aw CommandReplaceItem
-awa WorldGenRegistration
-awa$a WorldGenRegistration$WorldGenPyramidPiece
-awa$c WorldGenRegistration$WorldGenJungleTemple
-awa$c$a WorldGenRegistration$WorldGenJungleTemple$WorldGenJungleTemplePiece
-awa$d WorldGenRegistration$WorldGenScatteredPiece
-awa$e WorldGenRegistration$WorldGenWitchHut
-awb WorldGenStronghold
-awb$a WorldGenStronghold$WorldGenStronghold2Start
-awc WorldGenStrongholdPieces
-awc$a WorldGenStrongholdPieces$WorldGenStrongholdChestCorridor
-awc$b WorldGenStrongholdPieces$WorldGenStrongholdCorridor
-awc$c WorldGenStrongholdPieces$WorldGenStrongholdCrossing
-awc$d WorldGenStrongholdPieces$WorldGenStrongholdLeftTurn
-awc$e WorldGenStrongholdPieces$WorldGenStrongholdLibrary
-awc$f WorldGenStrongholdPieces$WorldGenStrongholdPieceWeight
-awc$g WorldGenStrongholdPieces$WorldGenStrongholdPortalRoom
-awc$h WorldGenStrongholdPieces$WorldGenStrongholdPrison
-awc$i WorldGenStrongholdPieces$WorldGenStrongholdRightTurn
-awc$j WorldGenStrongholdPieces$WorldGenStrongholdRoomCrossing
-awc$k WorldGenStrongholdPieces$WorldGenStrongholdStones
-awc$l WorldGenStrongholdPieces$WorldGenStrongholdStairs2
-awc$m WorldGenStrongholdPieces$WorldGenStrongholdStart
-awc$n WorldGenStrongholdPieces$WorldGenStrongholdStairs
-awc$o WorldGenStrongholdPieces$WorldGenStrongholdStairsStraight
-awc$p WorldGenStrongholdPieces$WorldGenStrongholdPiece
-awc$p$a WorldGenStrongholdPieces$WorldGenStrongholdPiece$WorldGenStrongholdDoorType
-awd StructureGenerator
-awe WorldGenFactory
-awf PersistentStructure
-awg StructurePiece
-awg$a StructurePiece$StructurePieceBlockSelector
-awh StructureStart
-awi DefinedStructurePiece
-awj WorldGenVillage
-awj$a WorldGenVillage$WorldGenVillageStart
-awk WorldGenVillagePieces
-awk$a WorldGenVillagePieces$WorldGenVillageLibrary
-awk$b WorldGenVillagePieces$WorldGenVillageFarm2
-awk$c WorldGenVillagePieces$WorldGenVillageFarm
-awk$d WorldGenVillagePieces$WorldGenVillageLight
-awk$e WorldGenVillagePieces$WorldGenVillagePieceWeight
-awk$f WorldGenVillagePieces$WorldGenVillageButcher
-awk$g WorldGenVillagePieces$WorldGenVillageHouse
-awk$h WorldGenVillagePieces$WorldGenVillageHut
-awk$i WorldGenVillagePieces$WorldGenVillageTemple
-awk$j WorldGenVillagePieces$WorldGenVillageBlacksmith
-awk$k WorldGenVillagePieces$WorldGenVillageStartPiece
-awk$l WorldGenVillagePieces$WorldGenVillageRoad
-awk$m WorldGenVillagePieces$WorldGenVillageHouse2
-awk$n WorldGenVillagePieces$WorldGenVillagePiece
-awk$o WorldGenVillagePieces$WorldGenVillageRoadPiece
-awk$p WorldGenVillagePieces$WorldGenVillageWell
-awm DefinedStructureManager
-awn DefinedStructureInfo
-awo DefinedStructure
-awo$a DefinedStructure$BlockInfo
-awo$b DefinedStructure$EntityInfo
-awt NoiseGeneratorPerlin
-awu NoiseGeneratorOctaves
-awv NoiseGenerator3
-awy NoiseGenerator3Handler
-awz NoiseGenerator
+awa WorldGenStronghold
+awa$a WorldGenStronghold$WorldGenStronghold2Start
+awb WorldGenStrongholdPieces
+awb$a WorldGenStrongholdPieces$WorldGenStrongholdChestCorridor
+awb$b WorldGenStrongholdPieces$WorldGenStrongholdCorridor
+awb$c WorldGenStrongholdPieces$WorldGenStrongholdCrossing
+awb$d WorldGenStrongholdPieces$WorldGenStrongholdLeftTurn
+awb$e WorldGenStrongholdPieces$WorldGenStrongholdLibrary
+awb$f WorldGenStrongholdPieces$WorldGenStrongholdPieceWeight
+awb$g WorldGenStrongholdPieces$WorldGenStrongholdPortalRoom
+awb$h WorldGenStrongholdPieces$WorldGenStrongholdPrison
+awb$i WorldGenStrongholdPieces$WorldGenStrongholdRightTurn
+awb$j WorldGenStrongholdPieces$WorldGenStrongholdRoomCrossing
+awb$k WorldGenStrongholdPieces$WorldGenStrongholdStones
+awb$l WorldGenStrongholdPieces$WorldGenStrongholdStairs2
+awb$m WorldGenStrongholdPieces$WorldGenStrongholdStart
+awb$n WorldGenStrongholdPieces$WorldGenStrongholdStairs
+awb$o WorldGenStrongholdPieces$WorldGenStrongholdStairsStraight
+awb$p WorldGenStrongholdPieces$WorldGenStrongholdPiece
+awb$p$a WorldGenStrongholdPieces$WorldGenStrongholdPiece$WorldGenStrongholdDoorType
+awc StructureGenerator
+awd WorldGenFactory
+awe PersistentStructure
+awf StructurePiece
+awf$a StructurePiece$StructurePieceBlockSelector
+awg StructureStart
+awh DefinedStructurePiece
+awi WorldGenVillage
+awi$a WorldGenVillage$WorldGenVillageStart
+awj WorldGenVillagePieces
+awj$a WorldGenVillagePieces$WorldGenVillageLibrary
+awj$b WorldGenVillagePieces$WorldGenVillageFarm2
+awj$c WorldGenVillagePieces$WorldGenVillageFarm
+awj$d WorldGenVillagePieces$WorldGenVillageLight
+awj$e WorldGenVillagePieces$WorldGenVillagePieceWeight
+awj$f WorldGenVillagePieces$WorldGenVillageButcher
+awj$g WorldGenVillagePieces$WorldGenVillageHouse
+awj$h WorldGenVillagePieces$WorldGenVillageHut
+awj$i WorldGenVillagePieces$WorldGenVillageTemple
+awj$j WorldGenVillagePieces$WorldGenVillageBlacksmith
+awj$k WorldGenVillagePieces$WorldGenVillageStartPiece
+awj$l WorldGenVillagePieces$WorldGenVillageRoad
+awj$m WorldGenVillagePieces$WorldGenVillageHouse2
+awj$n WorldGenVillagePieces$WorldGenVillagePiece
+awj$o WorldGenVillagePieces$WorldGenVillageRoadPiece
+awj$p WorldGenVillagePieces$WorldGenVillageWell
+awl DefinedStructureManager
+awm DefinedStructureInfo
+awn DefinedStructure
+awn$a DefinedStructure$BlockInfo
+awn$b DefinedStructure$EntityInfo
+aws NoiseGeneratorPerlin
+awt NoiseGeneratorOctaves
+awu NoiseGenerator3
+awx NoiseGenerator3Handler
+awy NoiseGenerator
 ax CommandSaveAll
-axb MaterialDecoration
-axc MaterialGas
-axd MaterialLiquid
-axe Material
-axf MaterialMapColor
-axg MaterialPortal
-axh EnumPistonReaction
-axh EnumPistonReaction
-axj GenLayerDeepOcean
-axk GenLayerSpecial
-axk$a GenLayerSpecial$EnumGenLayerSpecial
-axl GenLayerIsland
-axm GenLayerMushroomIsland
-axn GenLayerTopSoil
-axo GenLayerDesert
-axp GenLayerBiome
-axr GenLayerZoomFuzzy
-axt IntCache
-axu LayerIsland
-axv GenLayer
-axw GenLayerPlains
-axx GenLayerRegionHills
-axy GenLayerIcePlains
-axz GenLayerCleaner
+axa MaterialDecoration
+axb MaterialGas
+axc MaterialLiquid
+axd Material
+axe MaterialMapColor
+axf MaterialPortal
+axg EnumPistonReaction
+axg EnumPistonReaction
+axi GenLayerDeepOcean
+axj GenLayerSpecial
+axj$a GenLayerSpecial$EnumGenLayerSpecial
+axk GenLayerIsland
+axl GenLayerMushroomIsland
+axm GenLayerTopSoil
+axn GenLayerDesert
+axo GenLayerBiome
+axq GenLayerZoomFuzzy
+axs IntCache
+axt LayerIsland
+axu GenLayer
+axv GenLayerPlains
+axw GenLayerRegionHills
+axx GenLayerIcePlains
+axy GenLayerCleaner
+axz GenLayerRiver
 ay CommandSaveOff
-aya GenLayerRiver
-ayb GenLayerRiverMix
-ayc GenLayerMushroomShore
-ayd GenLayerSmooth
-ayh GenLayerZoomVoronoi
-ayi GenLayerZoom
-ayl Path
-aym PathType
-ayn PathPoint
-ayo PathfinderAbstract
-ayp PathEntity
-ayq Pathfinder
-ayr PathfinderWater
-ays PathfinderNormal
-ayw RunnableSaveScoreboard
-ayx PersistentBase
-ayy MapIcon
-ayz WorldMap
-ayz$a WorldMap$WorldMapHumanTracker
+aya GenLayerRiverMix
+ayb GenLayerMushroomShore
+ayc GenLayerSmooth
+ayg GenLayerZoomVoronoi
+ayh GenLayerZoom
+ayk Path
+ayl PathType
+aym PathPoint
+ayn PathfinderAbstract
+ayo PathEntity
+ayp Pathfinder
+ayq PathfinderWater
+ayr PathfinderNormal
+ayv RunnableSaveScoreboard
+ayw PersistentBase
+ayx MapIcon
+ayy WorldMap
+ayy$a WorldMap$WorldMapHumanTracker
 az CommandSaveOn
-azc ServerNBTManager
-azd WorldLoaderServer
-aze SecondaryWorldData
-azf WorldNBTStorage
-azg WorldLoader
-azh WorldData
-azi IDataManager
-azk Convertable
-azq IPlayerFileData
-azs PersistentCollection
-azt LootTables
-azu LootSelectorEmpty
-azv LootItem
-azw LootSelector
-azx LotoSelectorEntry
-azy LootTable
-azz LootTableInfo
-azz$b LootTableInfo$EntityTarget
+azb ServerNBTManager
+azc WorldLoaderServer
+azd SecondaryWorldData
+aze WorldNBTStorage
+azf WorldLoader
+azg WorldData
+azh IDataManager
+azj Convertable
+azn IPlayerFileData
+azp PersistentCollection
+azq LootTables
+azr LootSelectorEmpty
+azs LootItem
+azt LootSelector
+azu LotoSelectorEntry
+azv LootTable
+azw LootTableInfo
+azw$b LootTableInfo$EntityTarget
+azx LootSelectorLootTable
+azy LootTableRegistry
+azz LootValueBounds
 b CrashReport
 ba CommandSay
-baa LootSelectorLootTable
-bab LootTableRegistry
-bac LootValueBounds
-bad LootItemFunctionEnchant
-bae LootEnchantLevel
-baf LootItemFunction
-bag LootItemFunctions
-bah LootEnchantFunction
-bai LootItemFunctionSetAttribute
-baj LootItemFunctionSetCount
-bak LootItemFunctionSetDamage
-bal LootItemFunctionSetData
-bam LootItemFunctionSetTag
-ban LootItemFunctionSmelt
-baq LootItemConditionEntityScore
-bar LootItemCondition
-bas LootItemConditions
-bat LootItemConditionEntityProperty
-bau LootItemConditionKilledByPlayer
-bav LootItemConditionRandomChance
-baw LootItemConditionRandomChanceWithLooting
-bay LootEntityProperties
-baz LootEntityProperty
+baa LootItemFunctionEnchant
+bab LootEnchantLevel
+bac LootItemFunction
+bad LootItemFunctions
+bae LootEnchantFunction
+baf LootItemFunctionSetAttribute
+bag LootItemFunctionSetCount
+bah LootItemFunctionSetDamage
+bai LootItemFunctionSetData
+baj LootItemFunctionSetTag
+bak LootItemFunctionSmelt
+ban LootItemConditionEntityScore
+bao LootItemCondition
+bap LootItemConditions
+baq LootItemConditionEntityProperty
+bar LootItemConditionKilledByPlayer
+bas LootItemConditionRandomChance
+bat LootItemConditionRandomChanceWithLooting
+bav LootEntityProperties
+baw LootEntityProperty
+bax LootEntityPropertyOnFire
 bb CommandScoreboard
-bba LootEntityPropertyOnFire
-bbd FileIOThread
-bbe IAsyncChunkSaver
-bbh AxisAlignedBB
-bbi MovingObjectPosition
-bbi$a MovingObjectPosition$EnumMovingObjectType
-bbj Vec3D
-bbl ScoreboardObjective
-bbm ScoreboardTeam
-bbn ScoreboardScore
-bbp Scoreboard
-bbq PersistentScoreboard
-bbr ScoreboardTeamBase
-bbr$a ScoreboardTeamBase$EnumTeamPush
-bbr$b ScoreboardTeamBase$EnumNameTagVisibility
-bbs ScoreboardCriteriaInteger
-bbt ScoreboardBaseCriteria
-bbu ScoreboardHealthCriteria
-bbv IScoreboardCriteria
-bbv$a IScoreboardCriteria$EnumScoreboardHealthDisplay
-bbw ScoreboardReadOnlyCriteria
-bbx ScoreboardStatisticCriteria
+bba FileIOThread
+bbb IAsyncChunkSaver
+bbe AxisAlignedBB
+bbf MovingObjectPosition
+bbf$a MovingObjectPosition$EnumMovingObjectType
+bbg Vec3D
+bbi ScoreboardObjective
+bbj ScoreboardTeam
+bbk ScoreboardScore
+bbm Scoreboard
+bbn PersistentScoreboard
+bbo ScoreboardTeamBase
+bbo$a ScoreboardTeamBase$EnumTeamPush
+bbo$b ScoreboardTeamBase$EnumNameTagVisibility
+bbp ScoreboardCriteriaInteger
+bbq ScoreboardBaseCriteria
+bbr ScoreboardHealthCriteria
+bbs IScoreboardCriteria
+bbs$a IScoreboardCriteria$EnumScoreboardHealthDisplay
+bbt ScoreboardReadOnlyCriteria
+bbu ScoreboardStatisticCriteria
 bc CommandDispatcher
 bd CommandSetBlock
 be CommandSetWorldSpawn
diff --git a/mappings/bukkit-1.9-members.csrg b/mappings/bukkit-1.9.2-members.csrg
index 7d9daac..7a0262a 100644
--- a/mappings/bukkit-1.9-members.csrg
+++ b/mappings/bukkit-1.9.2-members.csrg
@@ -1893,9 +1893,9 @@ Item a (LItem;)I getId
 Item a (LItemStack;LIBlockData;)F getDestroySpeed
 Item c (I)LItem; getById
 Item e (I)LItem; setMaxDurability
-Item f REGISTRY
+Item g REGISTRY
 Item j ()I getMaxStackSize
-Item j maxStackSize
+Item k maxStackSize
 Item l ()I getMaxDurability
 Item m ()Z usesDurability
 Item o durability
@@ -2758,9 +2758,9 @@ SoundCategory g NEUTRAL
 SoundCategory h PLAYERS
 SoundCategory i AMBIENT
 SoundCategory j VOICE
-SoundEffects dW ENTITY_PLAYER_ATTACK_CRIT
-SoundEffects dr BLOCK_METAL_PRESSUREPLATE_CLICK_OFF
-SoundEffects eg ENTITY_PLAYER_HURT
+SoundEffects dX ENTITY_PLAYER_ATTACK_CRIT
+SoundEffects ds BLOCK_METAL_PRESSUREPLATE_CLICK_OFF
+SoundEffects eh ENTITY_PLAYER_HURT
 SpawnerCreature a (LWorld;II)LBlockPosition; getRandomPosition
 Statistic e name
 StatisticList a (Ljava/lang/String;)LStatistic; getStatistic
diff --git a/mappings/bukkit-1.9.at b/mappings/bukkit-1.9.2.at
index f8157c1..f8157c1 100644
--- a/mappings/bukkit-1.9.at
+++ b/mappings/bukkit-1.9.2.at