update to 19w03b

build.gradle

@@ -22,7 +22,7 @@ plugins {
 	id 'maven-publish'
 }
 
-def minecraft_version = "19w03a"
+def minecraft_version = "19w03b"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins

mappings/afo.mapping

@@ -1,2 +1,2 @@
 CLASS afo
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V

mappings/com/mojang/blaze3d/platform/GlStateManager.mapping

@@ -97,8 +97,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		FIELD c y I
 		FIELD d width I
 		FIELD e height I
-	CLASS com/mojang/blaze3d/platform/GlStateManager$DestFactor
-	CLASS com/mojang/blaze3d/platform/GlStateManager$SourceFactor
 	METHOD alphaFunc (IF)V
 		ARG 0 func
 		ARG 1 ref

mappings/cyb.mapping

@@ -1,4 +1,4 @@
 CLASS cyb
 	METHOD a renderIcon (FI)V
 	METHOD a selectElement (Lcyd;)V
-	METHOD aj_ enabled ()Z
+	METHOD ak_ enabled ()Z

mappings/drd.mapping

@@ -1,5 +1,5 @@
 CLASS drd
 	CLASS drd$a
-		METHOD aa_ tick ()V
+		METHOD ab_ tick ()V
 	CLASS drd$b
-		METHOD aa_ tick ()V
+		METHOD ab_ tick ()V

mappings/net/minecraft/block/BambooBlock.mapping

@@ -1,7 +1,6 @@
 CLASS bgu net/minecraft/block/BambooBlock
 	METHOD <init> (Lbhl$c;)V
 		ARG 1 settings
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a getPlacementState (Lavh;)Lbqi;
 		ARG 1 ctx
 	METHOD a isFertilizable (Lbbt;Let;Lbqi;Z)Z
@@ -39,6 +38,7 @@ CLASS bgu net/minecraft/block/BambooBlock
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+	METHOD aa_ getOffsetType ()Lbhl$b;
 	METHOD b grow (Lbci;Ljava/util/Random;Let;Lbqi;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/Block.mapping

@@ -76,7 +76,6 @@ CLASS bhl net/minecraft/block/Block
 	FIELD v collidable Z
 	METHOD <init> (Lbhl$c;)V
 		ARG 1 settings
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createCubeShape (DDDDDD)Lcnr;
 		ARG 0 xMin
@@ -316,6 +315,7 @@ CLASS bhl net/minecraft/block/Block
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+	METHOD aa_ getOffsetType ()Lbhl$b;
 	METHOD b (Lbhl;)Z
 		ARG 0 block
 	METHOD b hasComparatorOutput (Lbqi;)Z

mappings/net/minecraft/block/ComposterBlock.mapping

@@ -8,7 +8,7 @@ CLASS big net/minecraft/block/ComposterBlock
 			ARG 1 state
 			ARG 2 world
 			ARG 3 pos
-		METHOD R_ getInvMaxStackAmount ()I
+		METHOD S_ getInvMaxStackAmount ()I
 		METHOD a canInsertInvStack (ILaxc;Ley;)Z
 			ARG 1 slot
 			ARG 2 stack
@@ -27,7 +27,7 @@ CLASS big net/minecraft/block/ComposterBlock
 			ARG 2 world
 			ARG 3 pos
 			ARG 4 outputItem
-		METHOD R_ getInvMaxStackAmount ()I
+		METHOD S_ getInvMaxStackAmount ()I
 		METHOD a canInsertInvStack (ILaxc;Ley;)Z
 			ARG 1 slot
 			ARG 2 stack
@@ -89,8 +89,6 @@ CLASS big net/minecraft/block/ComposterBlock
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
-	METHOD i getPistonBehavior (Lbqi;)Lcgc;
-		ARG 1 state
 	METHOD l getRayTraceShape (Lbqi;Lbbt;Let;)Lcnr;
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/FernBlock.mapping

@@ -1,7 +1,6 @@
 CLASS bnf net/minecraft/block/FernBlock
 	METHOD <init> (Lbhl$c;)V
 		ARG 1 settings
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a isFertilizable (Lbbt;Let;Lbqi;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -15,6 +14,7 @@ CLASS bnf net/minecraft/block/FernBlock
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+	METHOD aa_ getOffsetType ()Lbhl$b;
 	METHOD b grow (Lbci;Ljava/util/Random;Let;Lbqi;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/FlowerBlock.mapping

@@ -1,6 +1,6 @@
 CLASS bjo net/minecraft/block/FlowerBlock
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a getOutlineShape (Lbqi;Lbbt;Let;Lcnc;)Lcnr;
 		ARG 1 state
 		ARG 2 view
 		ARG 3 pos
+	METHOD aa_ getOffsetType ()Lbhl$b;

mappings/net/minecraft/block/SaplingBambooBlock.mapping

@@ -1,7 +1,6 @@
 CLASS bgv net/minecraft/block/SaplingBambooBlock
 	METHOD <init> (Lbhl$c;)V
 		ARG 1 settings
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a getPickStack (Lbbt;Let;Lbqi;)Laxc;
 		ARG 1 world
 		ARG 2 pos
@@ -35,6 +34,7 @@ CLASS bgv net/minecraft/block/SaplingBambooBlock
 		ARG 4 world
 		ARG 5 pos
 		ARG 6 neighborPos
+	METHOD aa_ getOffsetType ()Lbhl$b;
 	METHOD b grow (Lbci;Ljava/util/Random;Let;Lbqi;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/TallPlantBlock.mapping

@@ -2,7 +2,6 @@ CLASS bix net/minecraft/block/TallPlantBlock
 	FIELD a PROPERTY_HALF Lbrg;
 	METHOD <init> (Lbhl$c;)V
 		ARG 1 settings
-	METHOD Z_ getOffsetType ()Lbhl$b;
 	METHOD a getPlacementState (Lavh;)Lbqi;
 		ARG 1 ctx
 	METHOD a afterBreak (Lbci;Larj;Let;Lbqi;Lbom;Laxc;)V
@@ -39,3 +38,4 @@ CLASS bix net/minecraft/block/TallPlantBlock
 		ARG 6 neighborPos
 	METHOD a appendProperties (Lbqj$a;)V
 		ARG 1 builder
+	METHOD aa_ getOffsetType ()Lbhl$b;

mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping

@@ -16,8 +16,8 @@ CLASS bod net/minecraft/block/entity/AbstractFurnaceBlockEntity
 	FIELD l cookTime I
 	FIELD m cookTimeTotal I
 	FIELD n recipesUsed Ljava/util/Map;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;
@@ -38,9 +38,9 @@ CLASS bod net/minecraft/block/entity/AbstractFurnaceBlockEntity
 	METHOD a fromTag (Lhq;)V
 	METHOD a addBurnable (Ljava/util/Map;Lbch;I)V
 	METHOD a addBurnable (Ljava/util/Map;Lyj;I)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
-	METHOD ab_ getCookTime ()I
+	METHOD ac_ getCookTime ()I
-	METHOD ac_ getLastRecipe ()Lazm;
+	METHOD ad_ getLastRecipe ()Lazm;
 	METHOD b removeInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD b isValidInvStack (ILaxc;)Z

mappings/net/minecraft/block/entity/BarrelBlockEntity.mapping

@@ -1,7 +1,7 @@
 CLASS bog net/minecraft/block/entity/BarrelBlockEntity
 	FIELD c inventory Lfh;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;
@@ -13,7 +13,7 @@ CLASS bog net/minecraft/block/entity/BarrelBlockEntity
 	METHOD a setInvStackList (Lfh;)V
 		ARG 1 list
 	METHOD a fromTag (Lhq;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b removeInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD b toTag (Lhq;)Lhq;
@@ -21,4 +21,3 @@ CLASS bog net/minecraft/block/entity/BarrelBlockEntity
 	METHOD c isInvEmpty ()Z
 	METHOD c_ onInvClose (Larj;)V
 	METHOD f getInvStackList ()Lfh;
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping

@@ -19,7 +19,7 @@ CLASS boi net/minecraft/block/entity/BeaconBlockEntity
 	METHOD a setCustomName (Ljb;)V
 	METHOD a playSound (Lxr;)V
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD c getPotionEffectById (I)Lagu;

mappings/net/minecraft/block/entity/BellBlockEntity.mapping

@@ -5,4 +5,4 @@ CLASS bok net/minecraft/block/entity/BellBlockEntity
 	METHOD a activate (Ley;)V
 		ARG 1 direction
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/block/entity/BlastFurnaceBlockEntity.mapping

@@ -1,4 +1,3 @@
 CLASS bol net/minecraft/block/entity/BlastFurnaceBlockEntity
 	METHOD a createContainer (ILari;)Late;
 	METHOD a getItemBurnTime (Laxc;)I
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/BrewingStandBlockEntity.mapping

@@ -13,8 +13,8 @@ CLASS boo net/minecraft/block/entity/BrewingStandBlockEntity
 	FIELD h inventory Lfh;
 	FIELD i brewTime I
 	FIELD l fuel I
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;
@@ -30,7 +30,7 @@ CLASS boo net/minecraft/block/entity/BrewingStandBlockEntity
 		ARG 1 playerEntity
 	METHOD a getInvAvailableSlots (Ley;)[I
 	METHOD a fromTag (Lhq;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b removeInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD b isValidInvStack (ILaxc;)Z
@@ -40,6 +40,5 @@ CLASS boo net/minecraft/block/entity/BrewingStandBlockEntity
 		ARG 2 stack
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD c isInvEmpty ()Z
-	METHOD g ()Ljb;
 	METHOD h canCraft ()Z
 	METHOD s craft ()V

mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping

@@ -2,7 +2,7 @@ CLASS bop net/minecraft/block/entity/CampfireBlockEntity
 	FIELD a itemsBeingCooked Lfh;
 	FIELD b cookingTimes [I
 	FIELD c cookingTotalTimes [I
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
 	METHOD a toUpdatePacket ()Lkc;
 	METHOD a getRecipeFor (Laxc;)Ljava/util/Optional;
 		ARG 1 item
@@ -10,7 +10,7 @@ CLASS bop net/minecraft/block/entity/CampfireBlockEntity
 		ARG 1 item
 		ARG 2 integer
 	METHOD a fromTag (Lhq;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b toTag (Lhq;)Lhq;
 		ARG 1 tag

mappings/net/minecraft/block/entity/ChestBlockEntity.mapping

@@ -2,7 +2,7 @@ CLASS boq net/minecraft/block/entity/ChestBlockEntity
 	FIELD a animationAngle F
 	FIELD b lastAnimationAngle F
 	FIELD i inventory Lfh;
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getAnimationProgress (F)F
 	METHOD a createContainer (ILari;)Late;
 	METHOD a setInvStackList (Lfh;)V
@@ -10,10 +10,9 @@ CLASS boq net/minecraft/block/entity/ChestBlockEntity
 	METHOD a fromTag (Lhq;)V
 	METHOD a playSound (Lxr;)V
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD b_ onInvOpen (Larj;)V
 	METHOD c isInvEmpty ()Z
 	METHOD c_ onInvClose (Larj;)V
 	METHOD f getInvStackList ()Lfh;
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/ConduitBlockEntity.mapping

@@ -5,7 +5,7 @@ CLASS bot net/minecraft/block/entity/ConduitBlockEntity
 	METHOD a toUpdatePacket ()Lkc;
 	METHOD a fromTag (Lhq;)V
 	METHOD a playSound (Lxr;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD b setEyeOpenClient (Z)V

mappings/net/minecraft/block/entity/DaylightDetectorBlockEntity.mapping

@@ -1,2 +1,2 @@
 CLASS bou net/minecraft/block/entity/DaylightDetectorBlockEntity
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping

@@ -1,7 +1,7 @@
 CLASS bov net/minecraft/block/entity/DispenserBlockEntity
 	FIELD a RANDOM Ljava/util/Random;
 	FIELD b inventory Lfh;
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a createContainer (ILari;)Late;
 	METHOD a setInvStackList (Lfh;)V
 		ARG 1 list
@@ -9,4 +9,3 @@ CLASS bov net/minecraft/block/entity/DispenserBlockEntity
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD c isInvEmpty ()Z
 	METHOD f getInvStackList ()Lfh;
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/DropperBlockEntity.mapping

@@ -1,2 +1 @@
 CLASS bow net/minecraft/block/entity/DropperBlockEntity
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping

@@ -7,5 +7,5 @@ CLASS box net/minecraft/block/entity/EnchantingTableBlockEntity
 	METHOD a fromTag (Lhq;)V
 	METHOD a setCustomName (Ljb;)V
 		ARG 1 value
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toTag (Lhq;)Lhq;

mappings/net/minecraft/block/entity/EndGatewayBlockEntity.mapping

@@ -9,7 +9,7 @@ CLASS bpn net/minecraft/block/entity/EndGatewayBlockEntity
 		ARG 1 pos
 	METHOD a fromTag (Lhq;)V
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD c generatePortal (Let;)V

mappings/net/minecraft/block/entity/EnderChestBlockEntity.mapping

@@ -6,7 +6,7 @@ CLASS boy net/minecraft/block/entity/EnderChestBlockEntity
 	METHOD a getAnimationProgress (F)F
 	METHOD a canPlayerUse (Larj;)Z
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD c onOpen ()V
 	METHOD d onClose ()V
 	METHOD n invalidate ()V

mappings/net/minecraft/block/entity/FurnaceBlockEntity.mapping

@@ -1,3 +1,2 @@
 CLASS boz net/minecraft/block/entity/FurnaceBlockEntity
 	METHOD a createContainer (ILari;)Late;
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/HopperBlockEntity.mapping

@@ -2,7 +2,7 @@ CLASS bpb net/minecraft/block/entity/HopperBlockEntity
 	FIELD i inventory Lfh;
 	FIELD j transferCooldown I
 	METHOD A getHopperZ ()D
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a takeInvStack (II)Laxc;
 		ARG 1 slot
 	METHOD a createContainer (ILari;)Late;
@@ -29,7 +29,7 @@ CLASS bpb net/minecraft/block/entity/HopperBlockEntity
 	METHOD a setInvStackList (Lfh;)V
 		ARG 1 list
 	METHOD a fromTag (Lhq;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b canExtract (Lafq;Laxc;ILey;)Z
 		ARG 0 inv
 		ARG 1 stack
@@ -48,7 +48,6 @@ CLASS bpb net/minecraft/block/entity/HopperBlockEntity
 		ARG 1 facing
 	METHOD c getInputItemEntities (Lbpa;)Ljava/util/List;
 	METHOD f getInvStackList ()Lfh;
-	METHOD g ()Ljb;
 	METHOD h isEmpty ()Z
 	METHOD s isFull ()Z
 	METHOD t tryInsert ()Z

mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping

@@ -14,4 +14,3 @@ CLASS bpc net/minecraft/block/entity/JigsawBlockEntity
 		ARG 1 value
 	METHOD c getAttachmentType ()Lqc;
 	METHOD d getTargetPool ()Lqc;
-	METHOD f ()Ljava/lang/String;

mappings/net/minecraft/block/entity/JukeboxBlockEntity.mapping

@@ -1,6 +1,6 @@
 CLASS bpd net/minecraft/block/entity/JukeboxBlockEntity
 	FIELD a record Laxc;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
 	METHOD a setRecord (Laxc;)V
 	METHOD a fromTag (Lhq;)V
 	METHOD b toTag (Lhq;)Lhq;

mappings/net/minecraft/block/entity/LecternBlockEntity.mapping

@@ -1,8 +1,8 @@
 CLASS bpe net/minecraft/block/entity/LecternBlockEntity
 	CLASS bpe$1
-		METHOD R_ getInvMaxStackAmount ()I
+		METHOD S_ getInvMaxStackAmount ()I
-		METHOD T_ clearInv ()V
+		METHOD U_ clearInv ()V
-		METHOD U_ getInvSize ()I
+		METHOD V_ getInvSize ()I
 		METHOD a getInvStack (I)Laxc;
 			ARG 1 slot
 		METHOD a takeInvStack (II)Laxc;
@@ -26,7 +26,7 @@ CLASS bpe net/minecraft/block/entity/LecternBlockEntity
 			ARG 1 key
 			ARG 2 value
 	FIELD b propertyDelegate Latn;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
 	METHOD a fromTag (Lhq;)V
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD d getDisplayName ()Ljb;

mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping

@@ -8,4 +8,3 @@ CLASS boh net/minecraft/block/entity/LockableContainerBlockEntity
 	METHOD a setCustomName (Ljb;)V
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD d getDisplayName ()Ljb;
-	METHOD g ()Ljb;

mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping

@@ -1,7 +1,7 @@
 CLASS bpg net/minecraft/block/entity/LootableContainerBlockEntity
 	FIELD g lootTableId Lqc;
 	FIELD h lootTableSeed J
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/block/entity/MobSpawnerBlockEntity.mapping

@@ -7,7 +7,7 @@ CLASS bpl net/minecraft/block/entity/MobSpawnerBlockEntity
 	METHOD a toUpdatePacket ()Lkc;
 	METHOD a fromTag (Lhq;)V
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b toTag (Lhq;)Lhq;
 	METHOD c getLogic ()Lbbq;

mappings/net/minecraft/block/entity/PistonBlockEntity.mapping

@@ -11,7 +11,7 @@ CLASS bqe net/minecraft/block/entity/PistonBlockEntity
 		ARG 3 extending
 	METHOD a getProgress (F)F
 	METHOD a fromTag (Lhq;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b getRenderOffsetX (F)F
 	METHOD b toTag (Lhq;)Lhq;

mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping

@@ -7,7 +7,7 @@ CLASS bph net/minecraft/block/entity/ShulkerBoxBlockEntity
 	FIELD j animationProgress F
 	FIELD k prevAnimationProgress F
 	FIELD l color Lavz;
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getAnimationProgress (F)F
 	METHOD a createContainer (ILari;)Late;
 	METHOD a canInsertInvStack (ILaxc;Ley;)Z
@@ -18,7 +18,7 @@ CLASS bph net/minecraft/block/entity/ShulkerBoxBlockEntity
 		ARG 1 list
 	METHOD a fromTag (Lhq;)V
 	METHOD a_ onBlockAction (II)Z
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b canExtractInvStack (ILaxc;Ley;)Z
 		ARG 1 slot
 		ARG 2 stack
@@ -27,7 +27,6 @@ CLASS bph net/minecraft/block/entity/ShulkerBoxBlockEntity
 	METHOD c isInvEmpty ()Z
 	METHOD c_ onInvClose (Larj;)V
 	METHOD f getInvStackList ()Lfh;
-	METHOD g ()Ljb;
 	METHOD h updateAnimation ()V
 	METHOD s getAnimationStage ()Lbph$a;
 	METHOD t getColor ()Lavz;

mappings/net/minecraft/block/entity/SkullBlockEntity.mapping

@@ -9,7 +9,7 @@ CLASS bpj net/minecraft/block/entity/SkullBlockEntity
 	METHOD a fromTag (Lhq;)V
 	METHOD a setUserCache (Lwu;)V
 		ARG 0 value
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b toInitialChunkDataTag ()Lhq;
 	METHOD b loadProperties (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile;
 		ARG 0 profile

mappings/net/minecraft/block/entity/SmokerBlockEntity.mapping

@@ -1,4 +1,3 @@
 CLASS bpk net/minecraft/block/entity/SmokerBlockEntity
 	METHOD a createContainer (ILari;)Late;
 	METHOD a getItemBurnTime (Laxc;)I
-	METHOD g ()Ljb;

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -138,14 +138,12 @@ CLASS cqe net/minecraft/client/MinecraftClient
 	METHOD aC doItemUse ()V
 	METHOD aE doItemPick ()V
 	METHOD aF getCurrentAction ()Ljava/lang/String;
-	METHOD a_ updateDisplay (Z)V
-		ARG 1 respectFramerateLimit
 	METHOD aa isConnectedToRealms ()Z
 	METHOD ab getDataFixer ()Lcom/mojang/datafixers/DataFixer;
 	METHOD ac getTickDelta ()F
 	METHOD ae getBlockColorMap ()Lcqn;
-	METHOD af_ openPauseMenu ()V
 	METHOD ag hasReducedDebugInfo ()Z
+	METHOD ag_ openPauseMenu ()V
 	METHOD ah getToastManager ()Lcsj;
 	METHOD ai getTutorialManager ()Ldsg;
 	METHOD aj isWindowFocused ()Z
@@ -166,6 +164,8 @@ CLASS cqe net/minecraft/client/MinecraftClient
 	METHOD b start ()V
 	METHOD b populateCrashReport (Lb;)Lb;
 		ARG 1 report
+	METHOD b_ updateDisplay (Z)V
+		ARG 1 respectFramerateLimit
 	METHOD c getFramebuffer ()Lcol;
 	METHOD c printCrashReport (Lb;)V
 	METHOD c setConnectedToRealms (Z)V

mappings/net/minecraft/client/WindowEventHandler.mapping

@@ -2,5 +2,5 @@ CLASS cpc net/minecraft/client/WindowEventHandler
 	METHOD a onResolutionChanged ()V
 	METHOD a onWindowFocusChanged (Z)V
 		ARG 1 focused
-	METHOD a_ updateDisplay (Z)V
+	METHOD b_ updateDisplay (Z)V
 		ARG 1 respectFramerateLimit

mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping

@@ -1,4 +1,4 @@
 CLASS dqr net/minecraft/client/audio/ElytraSoundInstance
 	FIELD n player Ldeo;
 	FIELD o tickCount I
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping

@@ -1,3 +1,3 @@
 CLASS dqs net/minecraft/client/audio/EntityTrackingSoundInstance
 	FIELD n entity Lahc;
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping

@@ -1,3 +1,3 @@
 CLASS dqt net/minecraft/client/audio/GuardianAttackSoundInstance
 	FIELD n guardian Lapx;
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping

@@ -3,4 +3,4 @@ CLASS dqv net/minecraft/client/audio/MinecartSoundInstance
 	FIELD o minecart Lasq;
 	METHOD <init> (Larj;Lasq;)V
 		ARG 1 player
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/MusicTracker.mapping

@@ -18,4 +18,4 @@ CLASS drt net/minecraft/client/audio/MusicTracker
 	FIELD c current Ldra;
 	FIELD d timeUntilNextSong I
 	METHOD a play (Ldrt$a;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping

@@ -1,4 +1,4 @@
 CLASS dqu net/minecraft/client/audio/RidingMinecartSoundInstance
 	FIELD n minecart Lasq;
 	FIELD o distance F
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/client/audio/SoundLoader.mapping

@@ -25,7 +25,7 @@ CLASS drw net/minecraft/client/audio/SoundLoader
 		ARG 1 manager
 	METHOD a updateSoundVolume (Lxt;F)V
 		ARG 1 category
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b pause ()V
 	METHOD b stop (Ldra;)V
 	METHOD b unregisterListener (Ldrv;)V

mappings/net/minecraft/client/gui/CloseWorldGui.mapping

@@ -6,4 +6,4 @@ CLASS ctz net/minecraft/client/gui/CloseWorldGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z

mappings/net/minecraft/client/gui/ContainerGui.mapping

@@ -56,7 +56,7 @@ CLASS cvg net/minecraft/client/gui/ContainerGui
 		ARG 1 stack
 		ARG 2 xPosition
 		ARG 3 yPosition
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD b mouseReleased (DDI)Z
 		ARG 1 mouseX
 		ARG 3 mouseY

mappings/net/minecraft/client/gui/Gui.mapping

@@ -42,7 +42,7 @@ CLASS cul net/minecraft/client/gui/Gui
 		ARG 1 component
 		ARG 2 x
 		ARG 3 y
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD b getEntries ()Ljava/util/List;
 	METHOD b onScaleChanged (Lcqe;II)V
 		ARG 1 client

mappings/net/minecraft/client/gui/MainMenuGui.mapping

@@ -57,7 +57,7 @@ CLASS cuq net/minecraft/client/gui/MainMenuGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD b initWidgetsNormal (II)V
 	METHOD c onInitialized ()V
 	METHOD c initWidgetsDemo (II)V

mappings/net/minecraft/client/gui/WorldGenerationProgressGui.mapping

@@ -12,4 +12,4 @@ CLASS cuc net/minecraft/client/gui/WorldGenerationProgressGui
 		ARG 1 centerX
 		ARG 2 centerY
 		ARG 3 chunkSize
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z

mappings/net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui.mapping

@@ -4,7 +4,6 @@ CLASS cwx net/minecraft/client/gui/container/AbstractFurnaceRecipeBookGui
 	METHOD a drawGhostSlots (IIZF)V
 	METHOD a slotClicked (Laur;)V
 	METHOD a showGhostRecipe (Lazm;Ljava/util/List;)V
-	METHOD a (Z)V
 	METHOD b isFilteringCraftable ()Z
 	METHOD c isOpen ()Z
 	METHOD c setOpen (Z)V

mappings/net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui.mapping

@@ -1,5 +1,4 @@
 CLASS cwy net/minecraft/client/gui/container/BlastFurnaceRecipeBookGui
-	METHOD a (Z)V
 	METHOD b isFilteringCraftable ()Z
 	METHOD d isGuiOpen ()Z
 	METHOD d setGuiOpen (Z)V

mappings/net/minecraft/client/gui/container/FurnaceRecipeBookGui.mapping

@@ -1,5 +1,4 @@
 CLASS cxi net/minecraft/client/gui/container/FurnaceRecipeBookGui
-	METHOD a (Z)V
 	METHOD b isFilteringCraftable ()Z
 	METHOD d isGuiOpen ()Z
 	METHOD d setGuiOpen (Z)V

mappings/net/minecraft/client/gui/container/SmokerRecipeBookGui.mapping

@@ -1,5 +1,4 @@
 CLASS cxj net/minecraft/client/gui/container/SmokerRecipeBookGui
-	METHOD a (Z)V
 	METHOD b isFilteringCraftable ()Z
 	METHOD d isGuiOpen ()Z
 	METHOD d setGuiOpen (Z)V

mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuElement.mapping

@@ -1,4 +1,4 @@
 CLASS cyf net/minecraft/client/gui/hud/spectator/SpectatorMenuElement
 	METHOD a renderIcon (FI)V
 	METHOD a selectElement (Lcyd;)V
-	METHOD aj_ enabled ()Z
+	METHOD ak_ enabled ()Z

mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl.mapping

@@ -2,13 +2,13 @@ CLASS cyd net/minecraft/client/gui/hud/spectator/SpectatorMenuImpl
 	CLASS cyd$1
 		METHOD a renderIcon (FI)V
 		METHOD a selectElement (Lcyd;)V
-		METHOD aj_ enabled ()Z
+		METHOD ak_ enabled ()Z
 	CLASS cyd$a
 		METHOD a renderIcon (FI)V
 		METHOD a selectElement (Lcyd;)V
-		METHOD aj_ enabled ()Z
+		METHOD ak_ enabled ()Z
 	CLASS cyd$b
 		METHOD a renderIcon (FI)V
 		METHOD a selectElement (Lcyd;)V
-		METHOD aj_ enabled ()Z
+		METHOD ak_ enabled ()Z
 	METHOD a selectElement (Lcye;)V

mappings/net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu.mapping

@@ -3,5 +3,5 @@ CLASS cyi net/minecraft/client/gui/hud/spectator/SpectatorTeleportMenu
 	METHOD a getElements ()Ljava/util/List;
 	METHOD a renderIcon (FI)V
 	METHOD a selectElement (Lcyd;)V
-	METHOD aj_ enabled ()Z
+	METHOD ak_ enabled ()Z
 	METHOD b getMessage ()Ljb;

mappings/net/minecraft/client/gui/hud/spectator/SpectatorTeleportTeamMenu.mapping

@@ -2,9 +2,9 @@ CLASS cyj net/minecraft/client/gui/hud/spectator/SpectatorTeleportTeamMenu
 	CLASS cyj$a
 		METHOD a renderIcon (FI)V
 		METHOD a selectElement (Lcyd;)V
-		METHOD aj_ enabled ()Z
+		METHOD ak_ enabled ()Z
 	METHOD a getElements ()Ljava/util/List;
 	METHOD a renderIcon (FI)V
 	METHOD a selectElement (Lcyd;)V
-	METHOD aj_ enabled ()Z
+	METHOD ak_ enabled ()Z
 	METHOD b getMessage ()Ljb;

mappings/net/minecraft/client/gui/ingame/ChatSleepingGui.mapping

@@ -9,4 +9,3 @@ CLASS cua net/minecraft/client/gui/ingame/ChatSleepingGui
 		ARG 3 modifiers
 	METHOD c onInitialized ()V
 	METHOD g close ()V
-	METHOD i ()V

mappings/net/minecraft/client/gui/ingame/DeathGui.mapping

@@ -17,7 +17,7 @@ CLASS ctt net/minecraft/client/gui/ingame/DeathGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
 	METHOD confirmResult handle (ZI)V
 		ARG 1 result

mappings/net/minecraft/client/gui/menu/BackupPromptGui.mapping

@@ -32,5 +32,5 @@ CLASS ctk net/minecraft/client/gui/menu/BackupPromptGui
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V

mappings/net/minecraft/client/gui/menu/DisconnectedGui.mapping

@@ -15,5 +15,5 @@ CLASS ctw net/minecraft/client/gui/menu/DisconnectedGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V

mappings/net/minecraft/client/gui/menu/DownloadingTerrainGui.mapping

@@ -3,5 +3,5 @@ CLASS cuk net/minecraft/client/gui/menu/DownloadingTerrainGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD e isPauseScreen ()Z

mappings/net/minecraft/client/gui/menu/ErrorGui.mapping

@@ -11,5 +11,5 @@ CLASS cty net/minecraft/client/gui/menu/ErrorGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V

mappings/net/minecraft/client/gui/menu/OutOfMemoryGui.mapping

@@ -11,5 +11,5 @@ CLASS cug net/minecraft/client/gui/menu/OutOfMemoryGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V

mappings/net/minecraft/client/gui/menu/ServerConnectingGui.mapping

@@ -13,6 +13,6 @@ CLASS ctq net/minecraft/client/gui/menu/ServerConnectingGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD c onInitialized ()V
 	METHOD f update ()V

mappings/net/minecraft/client/gui/menu/WorkingGui.mapping

@@ -9,4 +9,4 @@ CLASS cuj net/minecraft/client/gui/menu/WorkingGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 delta
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z

mappings/net/minecraft/client/gui/menu/YesNoGui.mapping

@@ -33,7 +33,7 @@ CLASS ctp net/minecraft/client/gui/menu/YesNoGui
 		ARG 1 keyCode
 		ARG 2 scanCode
 		ARG 3 modifiers
-	METHOD ah_ doesEscapeKeyClose ()Z
+	METHOD ai_ doesEscapeKeyClose ()Z
 	METHOD b disableButtons (I)V
 	METHOD c onInitialized ()V
 	METHOD f update ()V

mappings/net/minecraft/client/network/ClientPlayerEntity.mapping

@@ -39,16 +39,15 @@ CLASS deo net/minecraft/client/network/ClientPlayerEntity
 	METHOD a playSound (Lxr;FF)V
 		ARG 1 sound
 		ARG 2 volume
-	METHOD a dropSelectedItem (Z)Lapg;
+	METHOD b heal (F)V
 	METHOD b addEnchantedHitParticles (Lahc;)V
 	METHOD bc isSneaking ()Z
-	METHOD c heal (F)V
 	METHOD c setCurrentHand (Lafw;)V
 	METHOD c removePotionEffect (Lagu;)Lagv;
 	METHOD d applyDamage (Lagl;F)V
 		ARG 1 damageSource
-	METHOD db getActiveHand ()Lafw;
+	METHOD dc getActiveHand ()Lafw;
-	METHOD dt requestRespawn ()V
+	METHOD du requestRespawn ()V
 	METHOD f sendChatMessage (Ljava/lang/String;)V
 	METHOD f setSprinting (Z)V
 	METHOD g getPitch (F)F
@@ -58,6 +57,7 @@ CLASS deo net/minecraft/client/network/ClientPlayerEntity
 	METHOD h getYaw (F)F
 	METHOD j stopRiding ()V
 	METHOD k updateMovement ()V
+	METHOD o dropSelectedItem (Z)Lapg;
 	METHOD s updateHealth (F)V
 	METHOD v_ closeGui ()V
 	METHOD y getPermissionLevel ()I

mappings/net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer.mapping

@@ -1,4 +1,2 @@
 CLASS dnh net/minecraft/client/render/entity/feature/ArmorBipedFeatureRenderer
 	METHOD a hideModel (Lczt;)V
-	METHOD a handleModelAdjustments (Lczt;Lahh;)V
-		ARG 1 model

mappings/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.mapping

@@ -1,7 +1,7 @@
 CLASS dmt net/minecraft/client/render/entity/feature/ArmorFeatureRenderer
 	FIELD a SKIN Lqc;
-	FIELD b modelLeggings Lczm;
+	FIELD b modelLeggings Lczt;
-	FIELD c modelBody Lczm;
+	FIELD c modelBody Lczt;
 	FIELD d alpha F
 	FIELD e red F
 	FIELD f green F
@@ -9,7 +9,7 @@ CLASS dmt net/minecraft/client/render/entity/feature/ArmorFeatureRenderer
 	FIELD h ignoreGlint Z
 	FIELD i ARMOR_TEXTURE_CACHE Ljava/util/Map;
 	METHOD a render (Lahc;FFFFFFF)V
-	METHOD a getArmor (Lahh;)Lczm;
+	METHOD a getArmor (Lahh;)Lczt;
 	METHOD a renderArmor (Lahl;FFFFFFFLahh;)V
 	METHOD a getArmorTexture (Lauw;Z)Lqc;
 		ARG 1 armor

mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping

@@ -27,4 +27,4 @@ CLASS czt net/minecraft/client/render/entity/model/BipedEntityModel
 		ARG 4 age
 		ARG 5 headYaw
 		ARG 6 headPitch
-	METHOD b_ setVisible (Z)V
+	METHOD c_ setVisible (Z)V

mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping

@@ -17,4 +17,4 @@ CLASS dak net/minecraft/client/render/entity/model/PlayerEntityModel
 		ARG 4 age
 		ARG 5 headYaw
 		ARG 6 headPitch
-	METHOD b_ setVisible (Z)V
+	METHOD c_ setVisible (Z)V

mappings/net/minecraft/container/BeaconContainer.mapping

@@ -1,6 +1,6 @@
 CLASS ath net/minecraft/container/BeaconContainer
 	CLASS ath$1
-		METHOD R_ getInvMaxStackAmount ()I
+		METHOD S_ getInvMaxStackAmount ()I
 		METHOD b isValidInvStack (ILaxc;)Z
 			ARG 1 slot
 	CLASS ath$a SlotPayment

mappings/net/minecraft/container/DoubleLockableContainer.mapping

@@ -1,9 +1,9 @@
 CLASS afp net/minecraft/container/DoubleLockableContainer
 	FIELD a first Lafq;
 	FIELD b second Lafq;
-	METHOD R_ getInvMaxStackAmount ()I
+	METHOD S_ getInvMaxStackAmount ()I
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping

@@ -36,7 +36,6 @@ CLASS aha net/minecraft/entity/AreaEffectCloudEntity
 	METHOD f getColor ()I
 	METHOD h update ()V
 	METHOD i getParticleType ()Lft;
-	METHOD k ()Z
 	METHOD l getDuration ()I
 	METHOD s getOwner ()Lahl;
 	METHOD w updateColor ()V

mappings/net/minecraft/entity/FireworkEntity.mapping

@@ -4,7 +4,6 @@ CLASS aru net/minecraft/entity/FireworkEntity
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD e getItem ()Laxc;
-	METHOD f ()Z
 	METHOD g shouldRenderFrom (DDD)Z
 		ARG 1 x
 		ARG 3 y

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -60,7 +60,9 @@ CLASS ahl net/minecraft/entity/LivingEntity
 	METHOD aF isPushable ()Z
 	METHOD aI isValid ()Z
 	METHOD aW getItemsArmor ()Ljava/lang/Iterable;
+	METHOD a_ doJump (Z)V
 	METHOD ad destroy ()V
+	METHOD b heal (F)V
 	METHOD b getStackInHand (Lafw;)Laxc;
 	METHOD b getPotionEffect (Lagu;)Lagv;
 	METHOD b getEquippedStack (Lahh;)Laxc;
@@ -68,7 +70,7 @@ CLASS ahl net/minecraft/entity/LivingEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bB shouldRenderName ()Z
 	METHOD bl getHeadYaw ()F
-	METHOD c heal (F)V
+	METHOD c setHealth (F)V
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD c setCurrentHand (Lafw;)V
@@ -76,42 +78,42 @@ CLASS ahl net/minecraft/entity/LivingEntity
 	METHOD c addPotionEffect (Lagv;)Z
 	METHOD c containsOnlyAmbientEffects (Ljava/util/Collection;)Z
 		ARG 0 effects
-	METHOD cB getDamageTracker ()Lagk;
+	METHOD cC getDamageTracker ()Lagk;
-	METHOD cD getHealthMaximum ()F
+	METHOD cE getHealthMaximum ()F
-	METHOD cE getStuckArrows ()I
+	METHOD cF getStuckArrows ()I
-	METHOD cG getAttributeContainer ()Laid;
+	METHOD cH getAttributeContainer ()Laid;
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
-	METHOD cI getMainHandStack ()Laxc;
+	METHOD cJ getMainHandStack ()Laxc;
-	METHOD cJ getOffHandStack ()Laxc;
+	METHOD cK getOffHandStack ()Laxc;
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
-	METHOD cL getSoundPitch ()F
+	METHOD cM getSoundPitch ()F
-	METHOD cS isSleeping ()Z
+	METHOD cT isSleeping ()Z
-	METHOD cU doPushLogic ()V
+	METHOD cV doPushLogic ()V
-	METHOD cV isUsingRiptide ()Z
+	METHOD cW isUsingRiptide ()Z
-	METHOD cX getAbsorptionAmount ()F
+	METHOD cY getAbsorptionAmount ()F
-	METHOD cZ getMainHand ()Lahk;
 	METHOD cd initAttributes ()V
-	METHOD cf updatePostDeath ()V
+	METHOD cg updatePostDeath ()V
-	METHOD cg canDropLootAndXp ()Z
+	METHOD ch canDropLootAndXp ()Z
-	METHOD ci getRand ()Ljava/util/Random;
+	METHOD cj getRand ()Ljava/util/Random;
-	METHOD cj getAttacker ()Lahl;
+	METHOD ck getAttacker ()Lahl;
-	METHOD ck getLastAttackedTime ()I
+	METHOD cl getLastAttackedTime ()I
-	METHOD cn getDespawnCounter ()I
+	METHOD co getDespawnCounter ()I
-	METHOD cp clearPotionSwirls ()V
+	METHOD cq clearPotionSwirls ()V
-	METHOD cq clearPotionEffects ()Z
+	METHOD cr clearPotionEffects ()Z
-	METHOD cr getPotionEffects ()Ljava/util/Collection;
+	METHOD cs getPotionEffects ()Ljava/util/Collection;
-	METHOD ct isUndead ()Z
+	METHOD cu isUndead ()Z
-	METHOD cu getHealth ()F
+	METHOD cv getHealth ()F
-	METHOD cw dropInventory ()V
+	METHOD cx dropInventory ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d applyDamage (Lagl;F)V
 		ARG 1 damageSource
 	METHOD d removeStatusEffect (Lagu;)Z
 	METHOD d isPotionEffective (Lagv;)Z
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD db getActiveHand ()Lafw;
+	METHOD da getMainHand ()Lahk;
-	METHOD dd getActiveItem ()Laxc;
+	METHOD dc getActiveHand ()Lafw;
-	METHOD dj isFallFlying ()Z
+	METHOD de getActiveItem ()Laxc;
+	METHOD dk isFallFlying ()Z
 	METHOD e (FF)F
 		ARG 1 yaw
 	METHOD e getHurtSound (Lagl;)Lxr;
@@ -122,13 +124,11 @@ CLASS ahl net/minecraft/entity/LivingEntity
 	METHOD j setHeadYaw (F)V
 	METHOD k updateMovement ()V
 	METHOD k setYaw (F)V
-	METHOD l setHealth (F)V
 	METHOD m setDespawnCounter (I)V
-	METHOD n initAi ()V
 	METHOD n getFallSound (I)Lxr;
+	METHOD o initAi ()V
 	METHOD o setStuckArrows (I)V
-	METHOD o doJump (Z)V
+	METHOD p setAbsorptionAmount (F)V
-	METHOD q setAbsorptionAmount (F)V
 	METHOD w_ initDataTracker ()V
 	METHOD x_ isChild ()Z
 	METHOD y_ canClimb ()Z

mappings/net/minecraft/entity/WaterCreatureEntity.mapping

@@ -6,5 +6,5 @@ CLASS anf net/minecraft/entity/WaterCreatureEntity
 	METHOD by canFly ()Z
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD d getCurrentExperience (Larj;)I

mappings/net/minecraft/entity/ai/RangedAttacker.mapping

@@ -1,5 +1,5 @@
 CLASS aqh net/minecraft/entity/ai/RangedAttacker
 	METHOD a attack (Lahl;F)V
 		ARG 1 target
-	METHOD dC hasArmsRaised ()Z
+	METHOD n hasArmsRaised ()Z
 	METHOD s setArmsRaised (Z)V

mappings/net/minecraft/entity/boss/CommandBossBar.mapping

@@ -16,4 +16,3 @@ CLASS qu net/minecraft/entity/boss/CommandBossBar
 	METHOD d getMaxValue ()I
 	METHOD e getTextComponent ()Ljb;
 	METHOD f toTag ()Lhq;
-		ARG 1 tag

mappings/net/minecraft/entity/boss/EntityWither.mapping

@@ -5,9 +5,9 @@ CLASS aor net/minecraft/entity/boss/EntityWither
 	FIELD b TRACKED_ENTITY_ID_1 Lpr;
 	FIELD c TRACKED_ENTITY_ID_2 Lpr;
 	FIELD d TRACKED_ENTITY_ID_3 Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD H checkDespawn ()V
+	METHOD I checkDespawn ()V
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a setTrackedEntityId (II)V
 		ARG 1 headIndex
 	METHOD a damage (Lagl;F)Z
@@ -30,17 +30,16 @@ CLASS aor net/minecraft/entity/boss/EntityWither
 		ARG 1 fallDistance
 	METHOD c addPotionEffect (Lagv;)Z
 	METHOD c onStoppedTrackingBy (Lut;)V
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d setInvulTimer (I)V
 	METHOD d isPotionEffective (Lagv;)Z
-	METHOD dC hasArmsRaised ()Z
 	METHOD dD getInvulTimer ()I
 	METHOD dE isAtHalfHealth ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD n canStartRiding (Lahc;)Z
 	METHOD q getTrackedEntityId (I)I
 	METHOD s setArmsRaised (Z)V

mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping

@@ -12,9 +12,9 @@ CLASS anx net/minecraft/entity/boss/dragon/EnderDragonEntity
 	FIELD bQ LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD bR fight Lbtg;
 	FIELD bS phaseManager Laoo;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD H checkDespawn ()V
+	METHOD I checkDespawn ()V
-	METHOD J_ getPartDamageWorld ()Lbci;
+	METHOD K_ getPartDamageWorld ()Lbci;
 	METHOD V kill ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
@@ -35,12 +35,12 @@ CLASS anx net/minecraft/entity/boss/dragon/EnderDragonEntity
 	METHOD bk getParts ()[Lahc;
 	METHOD bo canUsePortals ()Z
 	METHOD c addPotionEffect (Lagv;)Z
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cf updatePostDeath ()V
+	METHOD cg updatePostDeath ()V
-	METHOD dv getPhaseManager ()Laoo;
 	METHOD dw getFight ()Lbtg;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
+	METHOD n getPhaseManager ()Laoo;
 	METHOD n canStartRiding (Lahc;)Z
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping

@@ -31,7 +31,6 @@ CLASS btg net/minecraft/entity/boss/dragon/EnderDragonFight
 	METHOD a generateEndPortal (Z)V
 		ARG 1 previouslyKilled
 	METHOD b tick ()V
-		ARG 1 chunksLoaded
 	METHOD b updateFight (Lanx;)V
 		ARG 1 dragon
 	METHOD c getAliveEndCrystals ()I
@@ -39,14 +38,11 @@ CLASS btg net/minecraft/entity/boss/dragon/EnderDragonFight
 	METHOD e respawnDragon ()V
 	METHOD f resetEndCrystals ()V
 	METHOD g convertFromLegacy ()V
-		ARG 1 containsPortal
 	METHOD h checkDragonSeen ()V
 	METHOD i worldContainsEndPortal ()Z
 	METHOD j findEndPortal ()Lbqn$b;
 	METHOD k loadChunks ()Z
 	METHOD l updatePlayers ()V
-		ARG 1 validPlayers
-		ARG 2 invalidPlayers
 	METHOD m countAliveCrystals ()V
 	METHOD n generateNewEndGateway ()V
 	METHOD o createDragon ()Lanx;

mappings/net/minecraft/entity/decoration/AbstractDecorationEntity.mapping

@@ -30,7 +30,6 @@ CLASS aou net/minecraft/entity/decoration/AbstractDecorationEntity
 		ARG 5 z
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bC getHorizontalFacing ()Ley;
-	METHOD f ()Z
 	METHOD f addVelocity (DDD)V
 		ARG 1 deltaX
 	METHOD h update ()V

mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping

@@ -45,7 +45,6 @@ CLASS aot net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD a setHeadRotation (Lfl;)V
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD a onTrackedDataSet (Lpr;)V
-	METHOD a onMarkerValueChange (Z)V
 	METHOD aE doesCollide ()Z
 	METHOD aF isPushable ()Z
 	METHOD aL getHeightOffset ()D
@@ -57,10 +56,10 @@ CLASS aot net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bN isImmuneToExplosion ()Z
 	METHOD c setLeftArmRotation (Lfl;)V
-	METHOD cU doPushLogic ()V
+	METHOD cV doPushLogic ()V
-	METHOD cZ getMainHand ()Lahk;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD cy getDeathSound ()Lxr;
 	METHOD d setRightArmRotation (Lfl;)V
+	METHOD da getMainHand ()Lahk;
 	METHOD e (FF)F
 		ARG 1 yaw
 	METHOD e getHurtSound (Lagl;)Lxr;
@@ -75,6 +74,7 @@ CLASS aot net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD n shouldShowArms ()Z
 	METHOD n getFallSound (I)Lxr;
 	METHOD o shouldHideBasePlate ()Z
+	METHOD o onMarkerValueChange (Z)V
 	METHOD p isMarker ()Z
 	METHOD p setSmall (Z)V
 	METHOD q setShowArms (Z)V

mappings/net/minecraft/entity/decoration/EnderCrystalEntity.mapping

@@ -14,6 +14,5 @@ CLASS anw net/minecraft/entity/decoration/EnderCrystalEntity
 	METHOD aE doesCollide ()Z
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD e getBeamTarget ()Let;
-	METHOD f ()Z
 	METHOD h update ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping

@@ -21,7 +21,6 @@ CLASS aov net/minecraft/entity/decoration/ItemFrameEntity
 	METHOD b setHeldItemStack (Laxc;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD f ()Z
 	METHOD i getWidthPixels ()I
 	METHOD k getHeightPixels ()I
 	METHOD n getHeldItemStack ()Laxc;

mappings/net/minecraft/entity/decoration/LeadKnotEntity.mapping

@@ -11,6 +11,5 @@ CLASS aow net/minecraft/entity/decoration/LeadKnotEntity
 		ARG 1 player
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD f ()Z
 	METHOD i getWidthPixels ()I
 	METHOD k getHeightPixels ()I

mappings/net/minecraft/entity/mob/AbstractSkeletonEntity.mapping

@@ -17,10 +17,9 @@ CLASS apk net/minecraft/entity/mob/AbstractSkeletonEntity
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD aL getHeightOffset ()D
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD dC hasArmsRaised ()Z
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD s setArmsRaised (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/BlazeEntity.mapping

@@ -5,18 +5,17 @@ CLASS apl net/minecraft/entity/mob/BlazeEntity
 		METHOD d onRemove ()V
 		METHOD e tick ()V
 	FIELD d BLAZE_FLAGS Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
-	METHOD a setFireActive (Z)V
 	METHOD aB getLightmapCoordinates ()I
 	METHOD aY isOnFire ()Z
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
 	METHOD l isFireActive ()Z
-	METHOD n ()V
+	METHOD r setFireActive (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/CreeperEntity.mapping

@@ -15,12 +15,11 @@ CLASS apn net/minecraft/entity/mob/CreeperEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dD getFuseSpeed ()I
 	METHOD dE getIgnited ()Z
 	METHOD dF setIgnited ()V
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD l isCharged ()Z
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/DrownedEntity.mapping

@@ -25,7 +25,7 @@ CLASS app net/minecraft/entity/mob/DrownedEntity
 		METHOD a canStart ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a initEquipment (Lafv;)V
 	METHOD a attack (Lahl;F)V
 		ARG 1 target
@@ -35,7 +35,7 @@ CLASS app net/minecraft/entity/mob/DrownedEntity
 	METHOD ag getSoundSwim ()Lxr;
 	METHOD b createNavigation (Lbci;)Lalo;
 	METHOD by canFly ()Z
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dE getSoundStep ()Lxr;
 	METHOD dF getSkull ()Laxc;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping

@@ -1,6 +1,6 @@
 CLASS apq net/minecraft/entity/mob/ElderGuardianEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/EndermanEntity.mapping

@@ -16,8 +16,8 @@ CLASS apr net/minecraft/entity/mob/EndermanEntity
 	FIELD bC ANGRY Lpr;
 	FIELD bE ageWhenTargetSet I
 	FIELD d CARRIED_BLOCK Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -28,11 +28,10 @@ CLASS apr net/minecraft/entity/mob/EndermanEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dE getCarriedBlock ()Lbqi;
 	METHOD dF isAngry ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f setTarget (Lahl;)V
 	METHOD k updateMovement ()V
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/EndermiteEntity.mapping

@@ -1,8 +1,8 @@
 CLASS aps net/minecraft/entity/mob/EndermiteEntity
 	FIELD b lifeTime I
 	FIELD c playerSpawned Z
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
@@ -10,11 +10,10 @@ CLASS aps net/minecraft/entity/mob/EndermiteEntity
 	METHOD aL getHeightOffset ()D
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k updateMovement ()V
 	METHOD k setYaw (F)V
-	METHOD n ()V

mappings/net/minecraft/entity/mob/EvokerEntity.mapping

@@ -29,18 +29,17 @@ CLASS apu net/minecraft/entity/mob/EvokerEntity
 		METHOD k getSoundPrepare ()Lxr;
 		METHOD m getInitialCooldown ()I
 	FIELD bC wololoTarget Lamz;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a setWololoTarget (Lamz;)V
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
 	METHOD dV getWololoTarget ()Lamz;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
-	METHOD n ()V
 	METHOD r isTeammate (Lahc;)Z
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/GhastEntity.mapping

@@ -18,23 +18,22 @@ CLASS apv net/minecraft/entity/mob/GhastEntity
 		METHOD c start ()V
 	FIELD b SHOOTING Lpr;
 	FIELD c fireballStrength I
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD M getLimitPerChunk ()I
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setShooting (Z)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxt;
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dv getFireballStrength ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD l isShooting ()Z
-	METHOD n ()V
+	METHOD n getFireballStrength ()I
+	METHOD r setShooting (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/GuardianEntity.mapping

@@ -10,8 +10,8 @@ CLASS apx net/minecraft/entity/mob/GuardianEntity
 		METHOD a tick ()V
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -19,10 +19,9 @@ CLASS apx net/minecraft/entity/mob/GuardianEntity
 	METHOD a onTrackedDataSet (Lpr;)V
 	METHOD b createNavigation (Lbci;)Lalo;
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/HostileEntity.mapping

@@ -1,7 +1,7 @@
 CLASS aqc net/minecraft/entity/mob/HostileEntity
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -10,8 +10,8 @@ CLASS aqc net/minecraft/entity/mob/HostileEntity
 	METHOD ah getSoundSplash ()Lxr;
 	METHOD bX getSoundCategory ()Lxt;
 	METHOD cd initAttributes ()V
-	METHOD cg canDropLootAndXp ()Z
+	METHOD ch canDropLootAndXp ()Z
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k updateMovement ()V

mappings/net/minecraft/entity/mob/HuskEntity.mapping

@@ -1,7 +1,7 @@
 CLASS apy net/minecraft/entity/mob/HuskEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a canSpawn (Lbcj;Laho;)Z
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dE getSoundStep ()Lxr;
 	METHOD dF getSkull ()Laxc;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping

@@ -6,8 +6,8 @@ CLASS apz net/minecraft/entity/mob/IllagerBeastEntity
 	FIELD bC stunTick I
 	FIELD bD roarTick I
 	FIELD c attackTick I
-	METHOD D getAmbientSound ()Lxr;
 	METHOD D canSee (Lahc;)Z
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
 	METHOD a readCustomDataFromTag (Lhq;)V
@@ -16,10 +16,9 @@ CLASS apz net/minecraft/entity/mob/IllagerBeastEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bQ getPrimaryPassenger ()Lahc;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
 	METHOD dF canLead ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V

mappings/net/minecraft/entity/mob/IllagerEntity.mapping

@@ -2,5 +2,5 @@ CLASS apj net/minecraft/entity/mob/IllagerEntity
 	CLASS apj$a State
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/IllusionerEntity.mapping

@@ -13,19 +13,18 @@ CLASS aqa net/minecraft/entity/mob/IllusionerEntity
 		METHOD i startTimeDelay ()I
 		METHOD j castSpell ()V
 		METHOD k getSoundPrepare ()Lxr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a attack (Lahl;F)V
 		ARG 1 target
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
-	METHOD dC hasArmsRaised ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD r isTeammate (Lahc;)Z
 	METHOD s setArmsRaised (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping

@@ -1,10 +1,10 @@
 CLASS aqb net/minecraft/entity/mob/MagmaCubeEntity
-	METHOD F getLootTableId ()Lqc;
+	METHOD G getLootTableId ()Lqc;
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD aB getLightmapCoordinates ()I
 	METHOD aY isOnFire ()Z
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/MobEntity.mapping

@@ -24,12 +24,12 @@ CLASS ahm net/minecraft/entity/mob/MobEntity
 	FIELD g lookControl Lain;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD A playAmbientSound ()V
+	METHOD B playAmbientSound ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD F getLootTableId ()Lqc;
+	METHOD G getLootTableId ()Lqc;
-	METHOD G cannotDespawn ()Z
+	METHOD H cannotDespawn ()Z
-	METHOD H checkDespawn ()V
+	METHOD I checkDespawn ()V
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD M getLimitPerChunk ()I
 	METHOD O setPersistent ()V
 	METHOD Z updateLogic ()V
@@ -69,16 +69,16 @@ CLASS ahm net/minecraft/entity/mob/MobEntity
 		ARG 1 distanceSquared
 	METHOD c spawnsTooManyForEachTry (I)Z
 		ARG 1 count
-	METHOD cZ getMainHand ()Lahk;
 	METHOD cd initAttributes ()V
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD dn canPickUpLoot ()Z
+	METHOD da getMainHand ()Lahk;
-	METHOD do isPersistent ()Z
+	METHOD do canPickUpLoot ()Z
-	METHOD dq isLeashed ()Z
+	METHOD dp isPersistent ()Z
-	METHOD dr getHoldingEntity ()Lahc;
+	METHOD dr isLeashed ()Z
-	METHOD ds isAiDisabled ()Z
+	METHOD ds getHoldingEntity ()Lahc;
-	METHOD dt isLeftHanded ()Z
+	METHOD dt isAiDisabled ()Z
-	METHOD dv deserializeLeashTag ()V
+	METHOD du isLeftHanded ()Z
+	METHOD dw deserializeLeashTag ()V
 	METHOD e (FF)F
 		ARG 1 yaw
 	METHOD e getPreferredEquipmentSlot (Laxc;)Lahh;
@@ -86,15 +86,14 @@ CLASS ahm net/minecraft/entity/mob/MobEntity
 	METHOD f setTarget (Lahl;)V
 	METHOD h update ()V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD o setCanPickUpLoot (Z)V
-	METHOD o createBodyControl ()Laii;
+	METHOD p createBodyControl ()Laii;
-	METHOD p getLookControl ()Lain;
+	METHOD p setAiDisabled (Z)V
-	METHOD p setCanPickUpLoot (Z)V
+	METHOD q setLeftHanded (Z)V
-	METHOD q setAiDisabled (Z)V
+	METHOD r getLookControl ()Lain;
-	METHOD r getMoveControl ()Laio;
+	METHOD s getMoveControl ()Laio;
-	METHOD r setLeftHanded (Z)V
+	METHOD t getJumpControl ()Laim;
-	METHOD s getJumpControl ()Laim;
+	METHOD u getNavigation ()Lalo;
-	METHOD t getNavigation ()Lalo;
+	METHOD w getVisibilityCache ()Lalt;
-	METHOD u getVisibilityCache ()Lalt;
-	METHOD w getTarget ()Lahl;
 	METHOD w_ initDataTracker ()V
+	METHOD x getTarget ()Lahl;

mappings/net/minecraft/entity/mob/MobEntityWithAi.mapping

@@ -6,9 +6,9 @@ CLASS ahs net/minecraft/entity/mob/MobEntityWithAi
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a setAiHome (Let;I)V
 		ARG 1 home
-	METHOD dA hasLimitedAiRange ()Z
+	METHOD dA setAiRangeUnlimited ()V
-	METHOD dw isInAiRange ()Z
+	METHOD dB hasLimitedAiRange ()Z
-	METHOD dx getAiHome ()Let;
+	METHOD dx isInAiRange ()Z
-	METHOD dy getAiRadius ()F
+	METHOD dy getAiHome ()Let;
-	METHOD dz setAiRangeUnlimited ()V
+	METHOD dz getAiRadius ()F
 	METHOD f isInAiRange (Let;)Z

mappings/net/minecraft/entity/mob/PatrolEntity.mapping

@@ -24,5 +24,4 @@ CLASS aqd net/minecraft/entity/mob/PatrolEntity
 	METHOD dL setRandomRaidCenter ()V
 	METHOD dM isRaidCenterSet ()Z
 	METHOD g setRaidCenter (Let;)V
-	METHOD n ()V
+	METHOD r setPatrolLeader (Z)V
-	METHOD t setPatrolLeader (Z)V

mappings/net/minecraft/entity/mob/PhantomEntity.mapping

@@ -22,8 +22,8 @@ CLASS aqe net/minecraft/entity/mob/PhantomEntity
 		METHOD d onRemove ()V
 		METHOD e tick ()V
 	FIELD b SIZE Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a shouldRenderAtDistance (D)Z
 	METHOD a setSize (I)V
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
@@ -34,14 +34,13 @@ CLASS aqe net/minecraft/entity/mob/PhantomEntity
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxt;
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dv getSize ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n getSize ()I
-	METHOD o createBodyControl ()Laii;
+	METHOD p createBodyControl ()Laii;
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/PigZombieEntity.mapping

@@ -3,8 +3,8 @@ CLASS aqf net/minecraft/entity/mob/PigZombieEntity
 		METHOD a canStart ()Z
 	FIELD bC anger I
 	FIELD bE angerTarget Ljava/util/UUID;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a initEquipment (Lafv;)V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
@@ -17,6 +17,6 @@ CLASS aqf net/minecraft/entity/mob/PigZombieEntity
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dF getSkull ()Laxc;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/PillagerEntity.mapping

@@ -1,8 +1,8 @@
 CLASS aqg net/minecraft/entity/mob/PillagerEntity
 	FIELD bC inventory Lagc;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD G cannotDespawn ()Z
+	METHOD H cannotDespawn ()Z
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
 	METHOD M getLimitPerChunk ()I
 	METHOD a initEquipment (Lafv;)V
 	METHOD a attack (Lahl;F)V
@@ -16,12 +16,11 @@ CLASS aqg net/minecraft/entity/mob/PillagerEntity
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
-	METHOD dC hasArmsRaised ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD r isTeammate (Lahc;)Z
 	METHOD s setArmsRaised (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/ShulkerEntity.mapping

@@ -27,8 +27,8 @@ CLASS aqj net/minecraft/entity/mob/ShulkerEntity
 	FIELD b ATTACHED_FACE Lpr;
 	FIELD c ATTACHED_BLOCK Lpr;
 	FIELD d PEEK_AMOUNT Lpr;
-	METHOD A playAmbientSound ()V
+	METHOD B playAmbientSound ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a setPositionAndRotations (DDDFFIZ)V
 		ARG 1 x
 		ARG 3 y
@@ -55,8 +55,7 @@ CLASS aqj net/minecraft/entity/mob/ShulkerEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxt;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC getAttachedFace ()Ley;
 	METHOD dD getAttachedBlock ()Let;
 	METHOD dE getPeekAmount ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
@@ -64,6 +63,6 @@ CLASS aqj net/minecraft/entity/mob/ShulkerEntity
 	METHOD h update ()V
 	METHOD i pushAwayFrom (Lahc;)V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n getAttachedFace ()Ley;
-	METHOD o createBodyControl ()Laii;
+	METHOD p createBodyControl ()Laii;
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/SilverfishEntity.mapping

@@ -6,8 +6,8 @@ CLASS aqk net/minecraft/entity/mob/SilverfishEntity
 	CLASS aqk$b
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD K_ checkLightLevelForSpawn ()Z
+	METHOD L_ checkLightLevelForSpawn ()Z
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -16,10 +16,9 @@ CLASS aqk net/minecraft/entity/mob/SilverfishEntity
 		ARG 1 pos
 	METHOD aL getHeightOffset ()D
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k setYaw (F)V
-	METHOD n ()V

mappings/net/minecraft/entity/mob/SkeletonEntity.mapping

@@ -1,5 +1,5 @@
 CLASS aql net/minecraft/entity/mob/SkeletonEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a dropEquipment (Lagl;IZ)V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping

@@ -1,5 +1,5 @@
 CLASS ano net/minecraft/entity/mob/SkeletonHorseEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
@@ -7,8 +7,8 @@ CLASS ano net/minecraft/entity/mob/SkeletonHorseEntity
 	METHOD aM getMountedHeightOffset ()D
 	METHOD ag getSoundSwim ()Lxr;
 	METHOD b writeCustomDataToTag (Lhq;)V
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V

mappings/net/minecraft/entity/mob/SlimeEntity.mapping

@@ -20,7 +20,7 @@ CLASS aqm net/minecraft/entity/mob/SlimeEntity
 	FIELD bD onGroundLastTick Z
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD F getLootTableId ()Lqc;
+	METHOD G getLootTableId ()Lqc;
 	METHOD S getType ()Lahg;
 	METHOD Y invalidate ()V
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
@@ -31,11 +31,10 @@ CLASS aqm net/minecraft/entity/mob/SlimeEntity
 	METHOD b onPlayerCollision (Larj;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dB getSize ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD i pushAwayFrom (Lahc;)V
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/SpellcastingIllagerEntity.mapping

@@ -19,7 +19,7 @@ CLASS aqn net/minecraft/entity/mob/SpellcastingIllagerEntity
 	FIELD c spellTicks I
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD h update ()V

mappings/net/minecraft/entity/mob/SpiderEntity.mapping

@@ -7,24 +7,23 @@ CLASS aqo net/minecraft/entity/mob/SpiderEntity
 	FIELD b SPIDER_FLAGS Lpr;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
 	METHOD a slowMovement (Lbqi;Lcmx;)V
 		ARG 1 state
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
-	METHOD a setCanClimb (Z)V
 	METHOD aM getMountedHeightOffset ()D
 	METHOD b createNavigation (Lbci;)Lalo;
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d isPotionEffective (Lagv;)Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD l getCanClimb ()Z
-	METHOD n ()V
+	METHOD r setCanClimb (Z)V
 	METHOD w_ initDataTracker ()V
 	METHOD y_ canClimb ()Z

mappings/net/minecraft/entity/mob/StrayEntity.mapping

@@ -1,5 +1,5 @@
 CLASS aqp net/minecraft/entity/mob/StrayEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a canSpawn (Lbcj;Laho;)Z
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/VexEntity.mapping

@@ -18,7 +18,7 @@ CLASS aqq net/minecraft/entity/mob/VexEntity
 	FIELD bD lifeTicks I
 	FIELD c owner Lahm;
 	FIELD d bounds Let;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a setLifeTicks (I)V
 	METHOD a initEquipment (Lafv;)V
 	METHOD a setOwner (Lahm;)V
@@ -33,11 +33,10 @@ CLASS aqq net/minecraft/entity/mob/VexEntity
 	METHOD aB getLightmapCoordinates ()I
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dD getBounds ()Let;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD g setBounds (Let;)V
 	METHOD h update ()V
 	METHOD l getOwner ()Lahm;
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/VindicatorEntity.mapping

@@ -11,8 +11,8 @@ CLASS aqr net/minecraft/entity/mob/VindicatorEntity
 		METHOD c start ()V
 		METHOD d onRemove ()V
 	FIELD c isJohnny Z
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a initEquipment (Lafv;)V
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
@@ -20,9 +20,8 @@ CLASS aqr net/minecraft/entity/mob/VindicatorEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD b setCustomName (Ljb;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
 	METHOD e getHurtSound (Lagl;)Lxr;
-	METHOD n ()V
 	METHOD r isTeammate (Lahc;)Z

mappings/net/minecraft/entity/mob/WitchEntity.mapping

@@ -1,19 +1,18 @@
 CLASS aqs net/minecraft/entity/mob/WitchEntity
 	FIELD bC DRINKING Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a attack (Lahl;F)V
 		ARG 1 target
-	METHOD a setDrinking (Z)V
 	METHOD bH getEyeHeight ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d addBonusForWave (IZ)V
 		ARG 1 wave
-	METHOD dC hasArmsRaised ()Z
 	METHOD dF canLead ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
 	METHOD l isDrinking ()Z
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD s setArmsRaised (Z)V
+	METHOD t setDrinking (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping

@@ -1,10 +1,10 @@
 CLASS aqt net/minecraft/entity/mob/WitherSkeletonEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a initEquipment (Lafv;)V
 	METHOD a dropEquipment (Lagl;IZ)V
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
 	METHOD bH getEyeHeight ()F
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d isPotionEffective (Lagv;)Z
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/ZombieEntity.mapping

@@ -10,10 +10,7 @@ CLASS aqu net/minecraft/entity/mob/ZombieEntity
 	FIELD d SPAWN_REINFORCEMENTS Lahz;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD a setSize (FF)V
-		ARG 1 width
-		ARG 2 height
 	METHOD a initEquipment (Lafv;)V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
@@ -28,11 +25,10 @@ CLASS aqu net/minecraft/entity/mob/ZombieEntity
 	METHOD aL getHeightOffset ()D
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD dC hasArmsRaised ()Z
 	METHOD dE getSoundStep ()Lxr;
 	METHOD dF getSkull ()Laxc;
 	METHOD dL isDrowning ()Z
@@ -40,7 +36,7 @@ CLASS aqu net/minecraft/entity/mob/ZombieEntity
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD s setArmsRaised (Z)V
 	METHOD t setBreakDoors (Z)V
 	METHOD u setChild (Z)V

mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping

@@ -1,9 +1,9 @@
 CLASS anq net/minecraft/entity/mob/ZombieHorseEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping

@@ -4,7 +4,7 @@ CLASS aqv net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD bE offerData Lhq;
 	FIELD b CONVERTING Lpr;
 	FIELD c VILLAGER_DATA Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a setVillagerData (Lara;)V
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
@@ -13,8 +13,8 @@ CLASS aqv net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
-	METHOD cL getSoundPitch ()F
+	METHOD cM getSoundPitch ()F
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dE getSoundStep ()Lxr;
 	METHOD dF getSkull ()Laxc;
 	METHOD dK isConverting ()Z

mappings/net/minecraft/entity/parts/IEntityPartDamageDelegate.mapping

@@ -1,5 +1,5 @@
 CLASS anu net/minecraft/entity/parts/IEntityPartDamageDelegate
-	METHOD J_ getPartDamageWorld ()Lbci;
+	METHOD K_ getPartDamageWorld ()Lbci;
 	METHOD S getType ()Lahg;
 	METHOD a damage (Lanv;Lagl;F)Z
 		ARG 1 part

mappings/net/minecraft/entity/passive/AbstractDonkeyEntity.mapping

@@ -8,8 +8,8 @@ CLASS anh net/minecraft/entity/passive/AbstractDonkeyEntity
 	METHOD aM getMountedHeightOffset ()D
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cw dropInventory ()V
+	METHOD cx dropInventory ()V
 	METHOD dD hasChest ()Z
 	METHOD dE getInventorySize ()I
-	METHOD t setHasChest (Z)V
+	METHOD r setHasChest (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/AnimalEntity.mapping

@@ -4,7 +4,7 @@ CLASS ami net/minecraft/entity/passive/AnimalEntity
 	FIELD bF spawningGround Lbhl;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -21,8 +21,8 @@ CLASS ami net/minecraft/entity/passive/AnimalEntity
 	METHOD d setLoveTicks (I)V
 		ARG 1 loveTicks
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD dI getLovingPlayer ()Lut;
+	METHOD dJ getLovingPlayer ()Lut;
-	METHOD dJ isInLove ()Z
+	METHOD dK isInLove ()Z
-	METHOD dK resetLoveTicks ()V
+	METHOD dL resetLoveTicks ()V
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD k updateMovement ()V

mappings/net/minecraft/entity/passive/BatEntity.mapping

@@ -1,26 +1,26 @@
 CLASS amd net/minecraft/entity/passive/BatEntity
 	FIELD b BAT_FLAGS Lpr;
 	METHOD C pushAway (Lahc;)V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setRoosting (Z)V
 	METHOD aF isPushable ()Z
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
 	METHOD bt canAvoidTraps ()Z
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
-	METHOD cL getSoundPitch ()F
+	METHOD cM getSoundPitch ()F
-	METHOD cU doPushLogic ()V
+	METHOD cV doPushLogic ()V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD l isRoosting ()Z
+	METHOD r setRoosting (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/CatEntity.mapping

@@ -17,8 +17,8 @@ CLASS amj net/minecraft/entity/passive/CatEntity
 	FIELD bI CAT_TYPE Lpr;
 	FIELD bL COLLAR_COLOR Lpr;
 	FIELD bM fleeGoal Lamj$a;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a canBreedWith (Lami;)Z
 		ARG 1 other
@@ -36,13 +36,12 @@ CLASS amj net/minecraft/entity/passive/CatEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dD onTamedChanged ()V
+	METHOD dE onTamedChanged ()V
-	METHOD dM getOcelotType ()I
+	METHOD dN getOcelotType ()I
-	METHOD dP getCollarColor ()Lavz;
+	METHOD dQ getCollarColor ()Lavz;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD h update ()V
-	METHOD n ()V
 	METHOD q getOcelotType (I)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/ChickenEntity.mapping

@@ -2,7 +2,7 @@ CLASS amk net/minecraft/entity/passive/ChickenEntity
 	FIELD bI eggLayTime I
 	FIELD bJ jockey Z
 	FIELD bK BREEDING_INGREDIENT Lazj;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
@@ -15,12 +15,11 @@ CLASS amk net/minecraft/entity/passive/ChickenEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD dC hasJockey ()Z
+	METHOD dD hasJockey ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD r setHasJockey (Z)V
-	METHOD s setHasJockey (Z)V
 		ARG 1 hasJockey

mappings/net/minecraft/entity/passive/CodEntity.mapping

@@ -1,6 +1,6 @@
 CLASS aml net/minecraft/entity/passive/CodEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dD getFlopSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD l getFishBucketItem ()Laxc;

mappings/net/minecraft/entity/passive/CowEntity.mapping

@@ -1,7 +1,7 @@
 CLASS amm net/minecraft/entity/passive/CowEntity
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
@@ -9,8 +9,7 @@ CLASS amm net/minecraft/entity/passive/CowEntity
 		ARG 1 pos
 	METHOD b createChild (Lagz;)Lamm;
 	METHOD bH getEyeHeight ()F
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
-	METHOD n ()V

mappings/net/minecraft/entity/passive/DolphinEntity.mapping

@@ -20,7 +20,7 @@ CLASS amn net/minecraft/entity/passive/DolphinEntity
 		METHOD c start ()V
 		METHOD d onRemove ()V
 		METHOD e tick ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a pickupItem (Lapg;)V
 	METHOD a canBeLeashedBy (Larj;)Z
 	METHOD a interactMob (Larj;Lafw;)Z
@@ -36,9 +36,8 @@ CLASS amn net/minecraft/entity/passive/DolphinEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bi getMaxBreath ()I
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
-	METHOD n ()V
 	METHOD n canStartRiding (Lahc;)Z
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/DonkeyEntity.mapping

@@ -1,7 +1,7 @@
 CLASS anj net/minecraft/entity/passive/DonkeyEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a canBreedWith (Lami;)Z
 		ARG 1 other
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/passive/FishEntity.mapping

@@ -7,13 +7,12 @@ CLASS amf net/minecraft/entity/passive/FishEntity
 	FIELD b FROM_BUCKET Lpr;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD G cannotDespawn ()Z
+	METHOD H cannotDespawn ()Z
 	METHOD M getLimitPerChunk ()I
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setFromBucket (Z)V
 	METHOD ag getSoundSwim ()Lxr;
 	METHOD b createNavigation (Lbci;)Lalo;
 	METHOD b writeCustomDataToTag (Lhq;)V
@@ -21,11 +20,11 @@ CLASS amf net/minecraft/entity/passive/FishEntity
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD cd initAttributes ()V
-	METHOD dC hasSelfControl ()Z
 	METHOD dD getFlopSound ()Lxr;
 	METHOD dE isFromBucket ()Z
 	METHOD f copyDataToStack (Laxc;)V
 	METHOD k updateMovement ()V
 	METHOD l getFishBucketItem ()Laxc;
-	METHOD n ()V
+	METHOD n hasSelfControl ()Z
+	METHOD r setFromBucket (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/GolemEntity.mapping

@@ -1,10 +1,10 @@
 CLASS amg net/minecraft/entity/passive/GolemEntity
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping

@@ -5,7 +5,7 @@ CLASS ani net/minecraft/entity/passive/HorseBaseEntity
 	FIELD bO OWNER_UUID Lpr;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD G_ canJump ()Z
 	METHOD M getLimitPerChunk ()I
 	METHOD a onInvChange (Lafq;)V
@@ -21,8 +21,6 @@ CLASS ani net/minecraft/entity/passive/HorseBaseEntity
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setSize (Z)V
-		ARG 1 child
 	METHOD aF isPushable ()Z
 	METHOD a_ setJumpStrength (I)V
 	METHOD b startJumping (I)V
@@ -33,29 +31,28 @@ CLASS ani net/minecraft/entity/passive/HorseBaseEntity
 	METHOD c stopJumping ()V
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cw dropInventory ()V
+	METHOD cx dropInventory ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d setHorseFlag (IZ)V
 		ARG 1 index
 	METHOD dE getInventorySize ()I
 	METHOD dN isTame ()Z
 	METHOD dO getOwnerUuid ()Ljava/util/UUID;
-	METHOD dR isEating ()Z
+	METHOD dQ isEating ()Z
-	METHOD dT isBred ()Z
+	METHOD dS isBred ()Z
-	METHOD dU getTemper ()I
+	METHOD dT getTemper ()I
-	METHOD dZ isSaddled ()Z
+	METHOD dY isSaddled ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD h update ()V
 	METHOD k updateMovement ()V
-	METHOD n ()V
 	METHOD q getHorseFlag (I)Z
 	METHOD r setTemper (I)V
-	METHOD u setTame (Z)V
+	METHOD t setTame (Z)V
-	METHOD w setBred (Z)V
+	METHOD v setBred (Z)V
+	METHOD w setSaddled (Z)V
 	METHOD w_ initDataTracker ()V
-	METHOD x setSaddled (Z)V
+	METHOD x setEating (Z)V
-	METHOD y setEating (Z)V
 	METHOD y_ canClimb ()Z

mappings/net/minecraft/entity/passive/HorseEntity.mapping

@@ -7,7 +7,7 @@ CLASS ank net/minecraft/entity/passive/HorseEntity
 	FIELD bS HORSE_MARKING_TEX_ID [Ljava/lang/String;
 	FIELD bT textureLocation Ljava/lang/String;
 	FIELD bU textureLayers [Ljava/lang/String;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a onInvChange (Lafq;)V
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a canBreedWith (Lami;)Z
@@ -19,12 +19,12 @@ CLASS ank net/minecraft/entity/passive/HorseEntity
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC getVariant ()I
+	METHOD dD getVariant ()I
-	METHOD dD getTextureLocation ()Ljava/lang/String;
+	METHOD dG getTextureLocation ()Ljava/lang/String;
-	METHOD dG getTextureLayers ()[Ljava/lang/String;
+	METHOD dH getTextureLayers ()[Ljava/lang/String;
-	METHOD dL getArmorType ()Lanl;
 	METHOD e getHurtSound (Lagl;)Lxr;
+	METHOD ej getArmorType ()Lanl;
 	METHOD ek clearTextureInfo ()V
 	METHOD el initTextureInfo ()V
 	METHOD h update ()V

mappings/net/minecraft/entity/passive/IronGolemEntity.mapping

@@ -3,7 +3,7 @@ CLASS amp net/minecraft/entity/passive/IronGolemEntity
 	FIELD c findVillageDelay I
 	FIELD d villageProperties Laly;
 	METHOD C pushAway (Lahc;)V
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a onDeath (Lagl;)V
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
@@ -11,11 +11,10 @@ CLASS amp net/minecraft/entity/passive/IronGolemEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dE isPlayerCreated ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
 	METHOD l getVillageProperties ()Laly;
-	METHOD n ()V
 	METHOD s setPlayerCreated (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/LlamaEntity.mapping

@@ -6,7 +6,7 @@ CLASS anm net/minecraft/entity/passive/LlamaEntity
 		METHOD b shouldContinue ()Z
 	FIELD bM ATTR_STRENGTH Lpr;
 	FIELD bO ATTR_VARIANT Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a onInvChange (Lafq;)V
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a attack (Lahl;F)V
@@ -24,15 +24,14 @@ CLASS anm net/minecraft/entity/passive/LlamaEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC hasArmsRaised ()Z
 	METHOD dE getInventorySize ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
-	METHOD ek getStrength ()I
+	METHOD ej getStrength ()I
-	METHOD el getVariant ()I
+	METHOD ek getVariant ()I
-	METHOD eq isFollowing ()Z
+	METHOD ep isFollowing ()Z
-	METHOD er getFollowing ()Lanm;
+	METHOD eq getFollowing ()Lanm;
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
 	METHOD s setArmsRaised (Z)V
 	METHOD t setVariant (I)V
 	METHOD u setStrength (I)V

mappings/net/minecraft/entity/passive/MuleEntity.mapping

@@ -1,4 +1,4 @@
 CLASS ann net/minecraft/entity/passive/MuleEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/passive/OcelotEntity.mapping

@@ -3,8 +3,8 @@ CLASS amr net/minecraft/entity/passive/OcelotEntity
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
 	FIELD bC TAMING_INGREDIENT Lazj;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -21,8 +21,7 @@ CLASS amr net/minecraft/entity/passive/OcelotEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/PandaEntity.mapping

@@ -31,7 +31,7 @@ CLASS ams net/minecraft/entity/passive/PandaEntity
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -48,9 +48,8 @@ CLASS ams net/minecraft/entity/passive/PandaEntity
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD h update ()V
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/ParrotEntity.mapping

@@ -2,7 +2,7 @@ CLASS amt net/minecraft/entity/passive/ParrotEntity
 	FIELD bL ATTR_VARIANT Lpr;
 	FIELD bO TAMING_INGREDIENTS Ljava/util/Set;
 	METHOD C pushAway (Lahc;)V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -24,13 +24,12 @@ CLASS amt net/minecraft/entity/passive/ParrotEntity
 	METHOD bX getSoundCategory ()Lxt;
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
-	METHOD cL getSoundPitch ()F
+	METHOD cM getSoundPitch ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dM getVariant ()I
+	METHOD dN getVariant ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD k updateMovement ()V
-	METHOD n ()V
 	METHOD q setVariant (I)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/PassiveEntity.mapping

@@ -1,22 +1,13 @@
 CLASS agz net/minecraft/entity/passive/PassiveEntity
 	FIELD bC CHILD Lpr;
-	FIELD bD lastWidth F
-	FIELD bE lastHeight F
 	FIELD b breedingAge I
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD a setSize (F)V
-		ARG 1 multiplier
-	METHOD a setSize (FF)V
-		ARG 1 width
-		ARG 2 height
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD a onTrackedDataSet (Lpr;)V
-	METHOD a setSize (Z)V
-		ARG 1 child
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD b_ setBreedingAge (I)V
 	METHOD i getBreedingAge ()I

mappings/net/minecraft/entity/passive/PigEntity.mapping

@@ -1,7 +1,7 @@
 CLASS amu net/minecraft/entity/passive/PigEntity
 	FIELD bC SADDLED Lpr;
 	FIELD bE BREEDING_INGREDIENT Lazj;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a onStruckByLightning (Lapd;)V
 	METHOD a interactMob (Larj;Lafw;)Z
@@ -14,11 +14,10 @@ CLASS amu net/minecraft/entity/passive/PigEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bQ getPrimaryPassenger ()Lahc;
 	METHOD cd initAttributes ()V
-	METHOD cw dropInventory ()V
+	METHOD cx dropInventory ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC isSaddled ()Z
+	METHOD dD isSaddled ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
-	METHOD n ()V
+	METHOD r setSaddled (Z)V
-	METHOD s setSaddled (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/PolarBearEntity.mapping

@@ -8,7 +8,7 @@ CLASS amv net/minecraft/entity/passive/PolarBearEntity
 		METHOD d onRemove ()V
 	CLASS amv$e
 		METHOD a canStart ()Z
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
@@ -16,9 +16,8 @@ CLASS amv net/minecraft/entity/passive/PolarBearEntity
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD h update ()V
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/PufferfishEntity.mapping

@@ -4,19 +4,15 @@ CLASS amw net/minecraft/entity/passive/PufferfishEntity
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD a setSize (FF)V
-		ARG 1 width
-		ARG 2 height
 	METHOD a readCustomDataFromTag (Lhq;)V
 	METHOD a onTrackedDataSet (Lpr;)V
 	METHOD b onPlayerCollision (Larj;)V
 	METHOD b writeCustomDataToTag (Lhq;)V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dD getFlopSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD h update ()V
 	METHOD k updateMovement ()V
 	METHOD l getFishBucketItem ()Laxc;
-	METHOD n ()V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/RabbitEntity.mapping

@@ -17,8 +17,8 @@ CLASS amx net/minecraft/entity/passive/RabbitEntity
 		METHOD e tick ()V
 	FIELD bC RABBIT_TYPE Lpr;
 	FIELD bD KILLER_BUNNY Lqc;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
@@ -28,17 +28,16 @@ CLASS amx net/minecraft/entity/passive/RabbitEntity
 		ARG 3 difficulty
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD a readCustomDataFromTag (Lhq;)V
+	METHOD a_ doJump (Z)V
 	METHOD ay attemptSprintingParticles ()V
 	METHOD b createChild (Lagz;)Lamx;
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bX getSoundCategory ()Lxt;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dE getRabbitType ()I
+	METHOD dF getRabbitType ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD k updateMovement ()V
-	METHOD n ()V
-	METHOD o doJump (Z)V
 	METHOD q setRabbitType (I)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/SalmonEntity.mapping

@@ -1,6 +1,6 @@
 CLASS amy net/minecraft/entity/passive/SalmonEntity
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD dD getFlopSound ()Lxr;
 	METHOD dE getMaxGroupSize ()I
 	METHOD e getHurtSound (Lagl;)Lxr;

mappings/net/minecraft/entity/passive/SchoolingFishEntity.mapping

@@ -10,7 +10,6 @@ CLASS amh net/minecraft/entity/passive/SchoolingFishEntity
 	METHOD a prepareEntityData (Lbcj;Lafv;Laho;Lahw;Lhq;)Lahw;
 		ARG 3 difficulty
 	METHOD a pullInOtherFish (Ljava/util/stream/Stream;)V
-	METHOD dC hasSelfControl ()Z
 	METHOD dE getMaxGroupSize ()I
 	METHOD dF hasLeader ()Z
 	METHOD dG leaveGroup ()V
@@ -21,4 +20,4 @@ CLASS amh net/minecraft/entity/passive/SchoolingFishEntity
 	METHOD dL increaseGroupSize ()V
 	METHOD dM decreaseGroupSize ()V
 	METHOD h update ()V
-	METHOD n ()V
+	METHOD n hasSelfControl ()Z

mappings/net/minecraft/entity/passive/SheepEntity.mapping

@@ -4,9 +4,9 @@ CLASS amz net/minecraft/entity/passive/SheepEntity
 	FIELD bC COLOR Lpr;
 	FIELD bD DROPS Ljava/util/Map;
 	FIELD bE COLORS Ljava/util/Map;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD F getLootTableId ()Lqc;
+	METHOD G getLootTableId ()Lqc;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a getChildColor (Lami;Lami;)Lavz;
 	METHOD a interactMob (Larj;Lafw;)Z
@@ -24,12 +24,11 @@ CLASS amz net/minecraft/entity/passive/SheepEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC dropItems ()V
+	METHOD dD dropItems ()V
-	METHOD dD getColor ()Lavz;
+	METHOD dE getColor ()Lavz;
-	METHOD dE isSheared ()Z
+	METHOD dF isSheared ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD r setSheared (Z)V
-	METHOD s setSheared (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/SnowmanEntity.mapping

@@ -1,20 +1,19 @@
 CLASS anb net/minecraft/entity/passive/SnowmanEntity
 	FIELD b SNOWMAN_FLAGS Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a attack (Lahl;F)V
 		ARG 1 target
 	METHOD a interactMob (Larj;Lafw;)Z
 		ARG 1 player
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setHasPumpkin (Z)V
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC hasArmsRaised ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
 	METHOD l hasPumpkin ()Z
-	METHOD n ()V
+	METHOD n hasArmsRaised ()Z
+	METHOD r setHasPumpkin (Z)V
 	METHOD s setArmsRaised (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/SquidEntity.mapping

@@ -6,15 +6,14 @@ CLASS anc net/minecraft/entity/passive/SquidEntity
 	CLASS anc$b
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
 		ARG 2 amount
 	METHOD a canSpawn (Lbcj;Laho;)Z
 	METHOD bH getEyeHeight ()F
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD k updateMovement ()V
-	METHOD n ()V

mappings/net/minecraft/entity/passive/TameableEntity.mapping

@@ -11,12 +11,12 @@ CLASS ahy net/minecraft/entity/passive/TameableEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD b setOwnerUuid (Ljava/util/UUID;)V
 	METHOD bh getScoreboardTeam ()Lcnz;
-	METHOD dC isTamed ()Z
+	METHOD dD isTamed ()Z
-	METHOD dD onTamedChanged ()V
+	METHOD dE onTamedChanged ()V
-	METHOD dE isSitting ()Z
+	METHOD dF isSitting ()Z
-	METHOD dF getOwner ()Lahl;
+	METHOD dG getOwner ()Lahl;
 	METHOD g isOwner (Lahl;)Z
 	METHOD r isTeammate (Lahc;)Z
-	METHOD t setTamed (Z)V
+	METHOD s setTamed (Z)V
-	METHOD u setSitting (Z)V
+	METHOD t setSitting (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping

@@ -22,7 +22,7 @@ CLASS and net/minecraft/entity/passive/TropicalFishEntity
 	FIELD b COMMON_VARIANTS [I
 	FIELD c VARIANT Lpr;
 	FIELD d SHAPE_IDS [Lqc;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a toVariant (Land$a;Lavz;Lavz;)I
 		ARG 0 variety
 		ARG 1 baseColor
@@ -35,7 +35,7 @@ CLASS and net/minecraft/entity/passive/TropicalFishEntity
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD c spawnsTooManyForEachTry (I)Z
 		ARG 1 count
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d getBaseDyeColor (I)Lavz;
 		ARG 0 variant
 	METHOD dD getFlopSound ()Lxr;

mappings/net/minecraft/entity/passive/TurtleEntity.mapping

@@ -42,7 +42,7 @@ CLASS ane net/minecraft/entity/passive/TurtleEntity
 	FIELD bD HOME_POS Lpr;
 	FIELD bE HAS_EGG Lpr;
 	FIELD bH TRAVEL_POS Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a onStruckByLightning (Lapd;)V
 	METHOD a canBeLeashedBy (Larj;)Z
@@ -52,23 +52,20 @@ CLASS ane net/minecraft/entity/passive/TurtleEntity
 	METHOD a playStepSound (Let;Lbqi;)V
 		ARG 1 pos
 	METHOD a readCustomDataFromTag (Lhq;)V
-	METHOD a setSize (Z)V
-		ARG 1 child
 	METHOD ag getSoundSwim ()Lxr;
 	METHOD b createNavigation (Lbci;)Lalo;
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD by canFly ()Z
-	METHOD cH getGroup ()Lahp;
+	METHOD cI getGroup ()Lahp;
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dC getHasEgg ()Z
+	METHOD dD getHasEgg ()Z
-	METHOD dE getHomePos ()Let;
+	METHOD dF getHomePos ()Let;
-	METHOD dF getTravelPos ()Let;
+	METHOD dG getTravelPos ()Let;
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD g setHomePos (Let;)V
 	METHOD h setTravelPos (Let;)V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD r setHasEgg (Z)V
-	METHOD s setHasEgg (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/VillagerEntity.mapping

@@ -15,12 +15,12 @@ CLASS aqz net/minecraft/entity/passive/VillagerEntity
 	FIELD bP inventory Lagc;
 	METHOD <init> (Lbci;Lare;)V
 		ARG 1 world
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
-	METHOD M_ getVillage ()Laly;
+	METHOD N_ getVillage ()Laly;
-	METHOD N_ getCurrentCustomer ()Larj;
+	METHOD O_ getCurrentCustomer ()Larj;
-	METHOD O_ getVillagerWorld ()Lbci;
+	METHOD P_ getVillagerWorld ()Lbci;
-	METHOD P_ getRaid ()Lasn;
+	METHOD Q_ getRaid ()Lasn;
 	METHOD a onDeath (Lagl;)V
 	METHOD a createChild (Lagz;)Lagz;
 	METHOD a setAttacker (Lahl;)V
@@ -46,27 +46,26 @@ CLASS aqz net/minecraft/entity/passive/VillagerEntity
 	METHOD c canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d getDisplayName ()Ljb;
 	METHOD d hasEnoughFood (I)Z
-	METHOD dC isInMating ()Z
+	METHOD dD isInMating ()Z
-	METHOD dD isStaring ()Z
+	METHOD dE isStaring ()Z
-	METHOD dE isTrading ()Z
+	METHOD dF isTrading ()Z
-	METHOD dF setRecentlyRescued ()V
+	METHOD dG setRecentlyRescued ()V
-	METHOD dG getInventory ()Lagc;
+	METHOD dH getInventory ()Lagc;
-	METHOD dH hasFoodForWilling ()Z
+	METHOD dI hasFoodForWilling ()Z
-	METHOD dJ canBreed ()Z
+	METHOD dK canBreed ()Z
-	METHOD dK hasSeed ()Z
+	METHOD dL hasSeed ()Z
-	METHOD dL setSpecificGoals ()V
+	METHOD dM setSpecificGoals ()V
-	METHOD dM levelUp ()V
+	METHOD dN levelUp ()V
-	METHOD dN addTrades ()V
+	METHOD dO addTrades ()V
 	METHOD dP getVillagerData ()Lara;
 	METHOD e getVillagerPos ()Let;
 	METHOD e getHurtSound (Lagl;)Lxr;
-	METHOD n ()V
+	METHOD r setInMating (Z)V
-	METHOD s setInMating (Z)V
+	METHOD s setStaring (Z)V
-	METHOD t setStaring (Z)V
+	METHOD t isWillingToMate (Z)Z
-	METHOD u isWillingToMate (Z)Z
 		ARG 1 update
-	METHOD v setWillingToMate (Z)V
+	METHOD u setWillingToMate (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/passive/WolfEntity.mapping

@@ -5,8 +5,8 @@ CLASS ang net/minecraft/entity/passive/WolfEntity
 		METHOD e tick ()V
 	FIELD bG WOLF_HEALTH Lpr;
 	FIELD bI COLLAR_COLOR Lpr;
-	METHOD D getAmbientSound ()Lxr;
+	METHOD F getAmbientSound ()Lxr;
-	METHOD I mobTick ()V
+	METHOD J mobTick ()V
 	METHOD M getLimitPerChunk ()I
 	METHOD a damage (Lagl;F)Z
 		ARG 1 source
@@ -23,16 +23,15 @@ CLASS ang net/minecraft/entity/passive/WolfEntity
 	METHOD b createChild (Lagz;)Lang;
 	METHOD b writeCustomDataToTag (Lhq;)V
 	METHOD bH getEyeHeight ()F
-	METHOD cK getSoundVolume ()F
+	METHOD cL getSoundVolume ()F
 	METHOD cd initAttributes ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
-	METHOD dN isAngry ()Z
+	METHOD dO isAngry ()Z
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f setTarget (Lahl;)V
 	METHOD f isBreedingItem (Laxc;)Z
 	METHOD h update ()V
 	METHOD k updateMovement ()V
-	METHOD n ()V
+	METHOD s setTamed (Z)V
-	METHOD t setTamed (Z)V
+	METHOD u setAngry (Z)V
-	METHOD v setAngry (Z)V
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/player/PlayerEntity.mapping

@@ -43,7 +43,6 @@ CLASS arj net/minecraft/entity/player/PlayerEntity
 	FIELD g spawnForced Z
 	METHOD P getName ()Ljb;
 	METHOD Y invalidate ()V
-	METHOD a addExhaustion (F)V
 	METHOD a sendVillagerRecipes (ILbbn;)V
 		ARG 1 syncId
 	METHOD a openContainer (Laga;)Ljava/util/OptionalInt;
@@ -94,7 +93,6 @@ CLASS arj net/minecraft/entity/player/PlayerEntity
 	METHOD a resetStat (Lxy;)V
 	METHOD a incrementStat (Lxy;I)V
 		ARG 1 stat
-	METHOD a dropSelectedItem (Z)Lapg;
 	METHOD a unlockRecipes ([Lqc;)V
 		ARG 1 ids
 	METHOD aJ isInsideWall ()Z
@@ -127,35 +125,35 @@ CLASS arj net/minecraft/entity/player/PlayerEntity
 	METHOD c isUsingEffectiveTool (Lbqi;)Z
 	METHOD c getOfflinePlayerUuid (Ljava/lang/String;)Ljava/util/UUID;
 		ARG 0 nickname
-	METHOD cS isSleeping ()Z
+	METHOD cT isSleeping ()Z
-	METHOD cX getAbsorptionAmount ()F
+	METHOD cY getAbsorptionAmount ()F
-	METHOD cZ getMainHand ()Lahk;
 	METHOD cd initAttributes ()V
-	METHOD cw dropInventory ()V
+	METHOD cx dropInventory ()V
-	METHOD cy getDeathSound ()Lxr;
+	METHOD cz getDeathSound ()Lxr;
 	METHOD d getDisplayName ()Ljb;
 	METHOD d addExperience (I)V
 	METHOD d applyDamage (Lagl;F)V
 		ARG 1 damageSource
 	METHOD d getCurrentExperience (Larj;)I
-	METHOD dA isSpawnForced ()Z
+	METHOD dA getSpawnPosition ()Let;
-	METHOD dB getEnchantmentTableSeed ()I
+	METHOD dB isSpawnForced ()Z
-	METHOD dD getHungerManager ()Latc;
+	METHOD dC getEnchantmentTableSeed ()I
-	METHOD dE canFoodHeal ()Z
+	METHOD dE getHungerManager ()Latc;
-	METHOD dF canModifyWorld ()Z
+	METHOD dF canFoodHeal ()Z
-	METHOD dG getEnderChestInventory ()Lauj;
+	METHOD dG canModifyWorld ()Z
-	METHOD dI getScoreboard ()Lcnx;
+	METHOD dH getEnderChestInventory ()Lauj;
-	METHOD dK getReducedDebugInfo ()Z
+	METHOD dJ getScoreboard ()Lcnx;
-	METHOD dL getShoulderEntityLeft ()Lhq;
+	METHOD dL getReducedDebugInfo ()Z
-	METHOD dM getShoulderEntityRight ()Lhq;
+	METHOD dM getShoulderEntityLeft ()Lhq;
-	METHOD dP getItemCooldownManager ()Lawy;
+	METHOD dN getShoulderEntityRight ()Lhq;
-	METHOD dQ getLuck ()F
+	METHOD dQ getItemCooldownManager ()Lawy;
-	METHOD do updateSize ()V
+	METHOD dR getLuck ()F
-	METHOD dp getScore ()I
+	METHOD da getMainHand ()Lahk;
-	METHOD dt requestRespawn ()V
+	METHOD dp updateSize ()V
-	METHOD dv getGameProfile ()Lcom/mojang/authlib/GameProfile;
+	METHOD dq getScore ()I
-	METHOD dy getSleepTimer ()I
+	METHOD du requestRespawn ()V
-	METHOD dz getSpawnPosition ()Let;
+	METHOD dw getGameProfile ()Lcom/mojang/authlib/GameProfile;
+	METHOD dz getSleepTimer ()I
 	METHOD e getHurtSound (Lagl;)Lxr;
 	METHOD f attack (Lahc;)V
 	METHOD g createCooldownManager ()Lawy;
@@ -166,7 +164,9 @@ CLASS arj net/minecraft/entity/player/PlayerEntity
 	METHOD j stopRiding ()V
 	METHOD k updateMovement ()V
 	METHOD n getFallSound (I)Lxr;
-	METHOD q setAbsorptionAmount (F)V
+	METHOD o dropSelectedItem (Z)Lapg;
+	METHOD p setAbsorptionAmount (F)V
+	METHOD q addExhaustion (F)V
 	METHOD q setScore (I)V
 	METHOD q canConsume (Z)Z
 	METHOD r addScore (I)V

mappings/net/minecraft/entity/player/PlayerInventory.mapping

@@ -7,8 +7,8 @@ CLASS ari net/minecraft/entity/player/PlayerInventory
 	FIELD g cursorStack Laxc;
 	FIELD h changeCount I
 	METHOD P getName ()Ljb;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/entity/projectile/ExplodingWitherSkullEntity.mapping

@@ -12,5 +12,4 @@ CLASS asl net/minecraft/entity/projectile/ExplodingWitherSkullEntity
 	METHOD a setCharged (Z)V
 	METHOD aE doesCollide ()Z
 	METHOD aY isOnFire ()Z
-	METHOD k ()Z
 	METHOD w_ initDataTracker ()V

mappings/net/minecraft/entity/raid/RaidVictim.mapping

@@ -1,3 +1,3 @@
 CLASS ahv net/minecraft/entity/raid/RaidVictim
-	METHOD M_ getVillage ()Laly;
+	METHOD N_ getVillage ()Laly;
-	METHOD P_ getRaid ()Lasn;
+	METHOD Q_ getRaid ()Lasn;

mappings/net/minecraft/entity/raid/RaiderEntity.mapping

@@ -9,7 +9,7 @@ CLASS aso net/minecraft/entity/raid/RaiderEntity
 	FIELD d raid Lasn;
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD G cannotDespawn ()Z
+	METHOD H cannotDespawn ()Z
 	METHOD a onDeath (Lagl;)V
 	METHOD a pickupItem (Lapg;)V
 	METHOD a setRaid (Lasn;)V
@@ -29,5 +29,4 @@ CLASS aso net/minecraft/entity/raid/RaiderEntity
 	METHOD dT getOutOfRaidCounter ()I
 	METHOD k updateMovement ()V
 	METHOD l getOnGoingRaid ()Lasn;
-	METHOD n ()V
 	METHOD u setHasRaidGoal (Z)V

mappings/net/minecraft/entity/vehicle/ChestMinecartEntity.mapping

@@ -1,5 +1,5 @@
 CLASS asu net/minecraft/entity/vehicle/ChestMinecartEntity
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a dropItems (Lagl;)V
 	METHOD o getMinecartType ()Lasq$a;
 	METHOD q getDefaultContainedBlock ()Lbqi;

mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping

@@ -5,7 +5,7 @@ CLASS asx net/minecraft/entity/vehicle/HopperMinecartEntity
 	METHOD A getHopperZ ()D
 	METHOD B canOperate ()Z
 	METHOD C isCoolingDown ()Z
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a onActivatorRail (IIIZ)V
 		ARG 1 x
 		ARG 2 y

mappings/net/minecraft/entity/vehicle/StorageMinecartEntity.mapping

@@ -4,7 +4,7 @@ CLASS asr net/minecraft/entity/vehicle/StorageMinecartEntity
 	FIELD e lootSeed J
 	METHOD <init> (Lahg;Lbci;)V
 		ARG 1 type
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
 	METHOD Y invalidate ()V
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot

mappings/net/minecraft/inventory/BasicInventory.mapping

@@ -2,8 +2,8 @@ CLASS agc net/minecraft/inventory/BasicInventory
 	FIELD a size I
 	FIELD b stackList Lfh;
 	FIELD c listeners Ljava/util/List;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/inventory/CraftingInventory.mapping

@@ -7,8 +7,8 @@ CLASS atq net/minecraft/inventory/CraftingInventory
 		ARG 1 container
 		ARG 2 width
 		ARG 3 height
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/inventory/CraftingResultInventory.mapping

@@ -1,8 +1,8 @@
 CLASS aum net/minecraft/inventory/CraftingResultInventory
 	FIELD a stack Lfh;
 	FIELD b lastRecipe Lazm;
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;
@@ -14,7 +14,7 @@ CLASS aum net/minecraft/inventory/CraftingResultInventory
 		ARG 1 playerEntity
 	METHOD a setLastRecipe (Lazm;)V
 		ARG 1 recipe
-	METHOD ac_ getLastRecipe ()Lazm;
+	METHOD ad_ getLastRecipe ()Lazm;
 	METHOD b removeInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD c isInvEmpty ()Z

mappings/net/minecraft/inventory/Inventory.mapping

@@ -1,6 +1,6 @@
 CLASS afq net/minecraft/inventory/Inventory
-	METHOD R_ getInvMaxStackAmount ()I
+	METHOD S_ getInvMaxStackAmount ()I
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/item/Item.mapping

@@ -27,7 +27,7 @@ CLASS awx net/minecraft/item/Item
 	FIELD n durability I
 	FIELD o recipeRemainder Lawx;
 	FIELD p translationKey Ljava/lang/String;
-	METHOD W_ isMap ()Z
+	METHOD X_ isMap ()Z
 	METHOD a getTranslationKey ()Ljava/lang/String;
 	METHOD a getAttributeModifiers (Lahh;)Lcom/google/common/collect/Multimap;
 		ARG 1 equiptmentSlot

mappings/net/minecraft/item/MapItem.mapping

@@ -1,5 +1,5 @@
 CLASS avt net/minecraft/item/MapItem
-	METHOD W_ isMap ()Z
+	METHOD X_ isMap ()Z
 	METHOD a createMapPacket (Laxc;Lbci;Larj;)Ljp;
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/recipe/Recipe.mapping

@@ -1,6 +1,6 @@
 CLASS azm net/minecraft/recipe/Recipe
-	METHOD X_ isIgnoredInRecipeBook ()Z
+	METHOD Y_ isIgnoredInRecipeBook ()Z
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a getPreviewInputs ()Lfh;
 	METHOD a fits (II)Z
 		ARG 1 width

mappings/net/minecraft/recipe/RecipeType.mapping

@@ -9,4 +9,3 @@ CLASS azp net/minecraft/recipe/RecipeType
 		ARG 2 world
 		ARG 3 inventory
 	METHOD a register (Ljava/lang/String;)Lazp;
-		ARG 1 id

mappings/net/minecraft/recipe/RecipeUnlocker.mapping

@@ -5,6 +5,6 @@ CLASS aul net/minecraft/recipe/RecipeUnlocker
 		ARG 1 world
 		ARG 2 player
 		ARG 3 recipe
-	METHOD ac_ getLastRecipe ()Lazm;
+	METHOD ad_ getLastRecipe ()Lazm;
 	METHOD b unlockLastRecipe (Larj;)V
 		ARG 1 player

mappings/net/minecraft/recipe/cooking/BlastingRecipe.mapping

@@ -1,3 +1,3 @@
 CLASS azb net/minecraft/recipe/cooking/BlastingRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD h getRecipeKindIcon ()Laxc;

mappings/net/minecraft/recipe/cooking/CampfireCookingRecipe.mapping

@@ -1,3 +1,3 @@
 CLASS azd net/minecraft/recipe/cooking/CampfireCookingRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD h getRecipeKindIcon ()Laxc;

mappings/net/minecraft/recipe/cooking/SmeltingRecipe.mapping

@@ -1,3 +1,3 @@
 CLASS azw net/minecraft/recipe/cooking/SmeltingRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD h getRecipeKindIcon ()Laxc;

mappings/net/minecraft/recipe/cooking/SmokingRecipe.mapping

@@ -1,3 +1,3 @@
 CLASS azx net/minecraft/recipe/cooking/SmokingRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD h getRecipeKindIcon ()Laxc;

mappings/net/minecraft/recipe/crafting/ArmorDyeRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS ayz net/minecraft/recipe/crafting/ArmorDyeRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/BannerDuplicateRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS aza net/minecraft/recipe/crafting/BannerDuplicateRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/BookCloningRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azc net/minecraft/recipe/crafting/BookCloningRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/FireworkRocketRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azg net/minecraft/recipe/crafting/FireworkRocketRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/FireworkStarFadeRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azh net/minecraft/recipe/crafting/FireworkStarFadeRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/FireworkStarRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azi net/minecraft/recipe/crafting/FireworkStarRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/MapCloningRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azk net/minecraft/recipe/crafting/MapCloningRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/MapExtendingRecipe.mapping

@@ -1,6 +1,6 @@
 CLASS azl net/minecraft/recipe/crafting/MapExtendingRecipe
-	METHOD X_ isIgnoredInRecipeBook ()Z
+	METHOD Y_ isIgnoredInRecipeBook ()Z
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a craft (Lafq;)Laxc;
 	METHOD a matches (Lafq;Lbci;)Z
 		ARG 1 inv

mappings/net/minecraft/recipe/crafting/ShapedRecipe.mapping

@@ -15,7 +15,7 @@ CLASS azq net/minecraft/recipe/crafting/ShapedRecipe
 	FIELD d output Laxc;
 	FIELD e id Lqc;
 	FIELD f group Ljava/lang/String;
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a getPreviewInputs ()Lfh;
 	METHOD a fits (II)Z
 		ARG 1 width

mappings/net/minecraft/recipe/crafting/ShapelessRecipe.mapping

@@ -13,7 +13,7 @@ CLASS azr net/minecraft/recipe/crafting/ShapelessRecipe
 	FIELD b group Ljava/lang/String;
 	FIELD c output Laxc;
 	FIELD d input Lfh;
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a getPreviewInputs ()Lfh;
 	METHOD a fits (II)Z
 		ARG 1 width

mappings/net/minecraft/recipe/crafting/ShieldDecorationRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azs net/minecraft/recipe/crafting/ShieldDecorationRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/ShulkerBoxColoringRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azt net/minecraft/recipe/crafting/ShulkerBoxColoringRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/SpecialCraftingRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azf net/minecraft/recipe/crafting/SpecialCraftingRecipe
 	FIELD a id Lqc;
-	METHOD X_ isIgnoredInRecipeBook ()Z
+	METHOD Y_ isIgnoredInRecipeBook ()Z
 	METHOD c getOutput ()Laxc;
 	METHOD f getId ()Lqc;

mappings/net/minecraft/recipe/crafting/SuspiciousStewRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azy net/minecraft/recipe/crafting/SuspiciousStewRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/recipe/crafting/TippedArrowRecipe.mapping

@@ -1,5 +1,5 @@
 CLASS azz net/minecraft/recipe/crafting/TippedArrowRecipe
-	METHOD Y_ getSerializer ()Lazo;
+	METHOD Z_ getSerializer ()Lazo;
 	METHOD a fits (II)Z
 		ARG 1 width
 		ARG 2 height

mappings/net/minecraft/server/dedicated/gui/PlayerListGui.mapping

@@ -1,4 +1,4 @@
 CLASS tz net/minecraft/server/dedicated/gui/PlayerListGui
 	FIELD a server Lnet/minecraft/server/MinecraftServer;
 	FIELD b tick I
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/server/function/CommandFunctionManager.mapping

@@ -23,7 +23,7 @@ CLASS qp net/minecraft/server/function/CommandFunctionManager
 	METHOD a onResourceReload (Lwo;)V
 		ARG 1 manager
 	METHOD a readLines (Lwo;Lqc;)Ljava/util/List;
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b getMaxCommandChainLength ()I
 	METHOD c getFunctions ()Ljava/util/Map;
 	METHOD d getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher;

mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping

@@ -12,6 +12,6 @@ CLASS vn net/minecraft/server/network/ServerLoginNetworkHandler
 	METHOD a onConnectionLost (Ljb;)V
 		ARG 1 disconnectReason
 	METHOD a onHello (Lpf;)V
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b disconnect (Ljb;)V
 		ARG 1 reason

mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping

@@ -131,7 +131,7 @@ CLASS vl net/minecraft/server/network/ServerPlayNetworkHandler
 		ARG 1 packet
 	METHOD a onPlayerInteractItem (Los;)V
 		ARG 1 packet
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V
 	METHOD b syncWithPlayerPosition ()V
 	METHOD b disconnect (Ljb;)V
 	METHOD b validatePlayerMove (Lnt;)Z

mappings/net/minecraft/server/network/ServerPlayerEntity.mapping

@@ -78,13 +78,11 @@ CLASS ut net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 recipes
 	METHOD d addExperience (I)V
 	METHOD d onStartedTracking (Lahc;)V
-	METHOD dT incrementContainerSyncId ()V
+	METHOD dU incrementContainerSyncId ()V
 	METHOD f attack (Lahc;)V
 	METHOD g createCooldownManager ()Lawy;
 	METHOD h update ()V
 	METHOD j stopRiding ()V
-	METHOD m ()V
-	METHOD n ()V
 	METHOD s getServerWorld ()Lur;
 	METHOD t isSpectator ()Z
 	METHOD u isCreative ()Z

mappings/net/minecraft/sortme/Hopper.mapping

@@ -3,7 +3,7 @@ CLASS bpa net/minecraft/sortme/Hopper
 	FIELD b SHAPE_ABOVE Lcnr;
 	FIELD c SHAPE_INPUT Lcnr;
 	METHOD A getHopperZ ()D
-	METHOD V_ getInputAreaShape ()Lcnr;
+	METHOD W_ getInputAreaShape ()Lcnr;
 	METHOD w getWorld ()Lbci;
 	METHOD x getHopperX ()D
 	METHOD z getHopperY ()D

mappings/net/minecraft/util/Actor.mapping

@@ -4,6 +4,5 @@ CLASS aff net/minecraft/util/Actor
 		METHOD a (Ljava/lang/Object;)V
 			ARG 1 message
 	METHOD a getName ()Ljava/lang/String;
-	METHOD a (Ljava/lang/Object;)V
 	METHOD a createConsumerActor (Ljava/lang/String;Ljava/util/function/Consumer;)Laff;
 	METHOD a createAndSendFutureActor (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture;

mappings/net/minecraft/util/MailboxProcessor.mapping

@@ -9,7 +9,6 @@ CLASS afg net/minecraft/util/MailboxProcessor
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I
 		ARG 1 keepRunningProvider
-	METHOD a (Ljava/lang/Object;)V
 	METHOD a create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lafg;
 		ARG 0 executor
 		ARG 1 name

mappings/net/minecraft/util/Tickable.mapping

@@ -1,2 +1,2 @@
 CLASS qt net/minecraft/util/Tickable
-	METHOD aa_ tick ()V
+	METHOD ab_ tick ()V

mappings/net/minecraft/util/math/BoundingBox.mapping

@@ -27,7 +27,7 @@ CLASS cms net/minecraft/util/math/BoundingBox
 		ARG 1 x
 	METHOD b union (Lcms;)Lcms;
 	METHOD b contains (Lcmx;)Z
-	METHOD b rayTrace (Lcmx;Lcmx;)Lcmx;
+	METHOD b rayTrace (Lcmx;Lcmx;)Ljava/util/Optional;
 	METHOD c getCenter ()Lcmx;
 	METHOD c expand (DDD)Lcms;
 		ARG 1 x

mappings/net/minecraft/village/SimpleVillager.mapping

@@ -2,8 +2,8 @@ CLASS aqx net/minecraft/village/SimpleVillager
 	FIELD a villagerInventory Laug;
 	FIELD b player Larj;
 	FIELD c recipeList Lbbn;
-	METHOD N_ getCurrentCustomer ()Larj;
+	METHOD O_ getCurrentCustomer ()Larj;
-	METHOD O_ getVillagerWorld ()Lbci;
+	METHOD P_ getVillagerWorld ()Lbci;
 	METHOD a onSellingItem (Laxc;)V
 	METHOD a useRecipe (Lbbm;)V
 	METHOD a setServerRecipes (Lbbn;)V

mappings/net/minecraft/village/Villager.mapping

@@ -1,6 +1,6 @@
 CLASS bbl net/minecraft/village/Villager
-	METHOD N_ getCurrentCustomer ()Larj;
+	METHOD O_ getCurrentCustomer ()Larj;
-	METHOD O_ getVillagerWorld ()Lbci;
+	METHOD P_ getVillagerWorld ()Lbci;
 	METHOD a onSellingItem (Laxc;)V
 	METHOD a useRecipe (Lbbm;)V
 	METHOD a setServerRecipes (Lbbn;)V

mappings/net/minecraft/village/VillagerInventory.mapping

@@ -3,8 +3,8 @@ CLASS aug net/minecraft/village/VillagerInventory
 	FIELD b inventory Lfh;
 	FIELD c villagerRecipe Lbbm;
 	FIELD d recipeIndex I
-	METHOD T_ clearInv ()V
+	METHOD U_ clearInv ()V
-	METHOD U_ getInvSize ()I
+	METHOD V_ getInvSize ()I
 	METHOD a getInvStack (I)Laxc;
 		ARG 1 slot
 	METHOD a takeInvStack (II)Laxc;

mappings/net/minecraft/world/RayTraceContext.mapping

@@ -1,13 +1,11 @@
 CLASS bbw net/minecraft/world/RayTraceContext
 	CLASS bbw$a ShapeType
 		FIELD c provider Lbbw$c;
-		METHOD get (Lbqi;Lbbt;Let;Lcnc;)Lcnr;
 	CLASS bbw$b FluidHandling
 		FIELD a NONE Lbbw$b;
 		FIELD d predicate Ljava/util/function/Predicate;
 		METHOD a handled (Lcfw;)Z
 	CLASS bbw$c ShapeProvider
-		METHOD get (Lbqi;Lbbt;Let;Lcnc;)Lcnr;
 	FIELD a start Lcmx;
 	FIELD b end Lcmx;
 	FIELD c shapeType Lbbw$a;

mappings/net/minecraft/world/border/WorldBorderListener.mapping

@@ -3,7 +3,6 @@ CLASS brs net/minecraft/world/border/WorldBorderListener
 	METHOD a onCenterChanged (Lbru;DD)V
 		ARG 1 centerX
 		ARG 2 centerZ
-	METHOD a (Lbru;DDJ)V
 	METHOD a onWarningTimeChanged (Lbru;I)V
 		ARG 1 warningTime
 	METHOD b onDamagePerBlockChanged (Lbru;D)V