update to 18w48b

README.md

@@ -3,7 +3,7 @@
 POMF is a set of open, unencumbered Minecraft mappings, free for everyone to use under the Creative Commons Zero license. The intention is to let 
 everyone mod Minecraft freely and openly, while also being able to innovate and process the mappings as they see fit.
 
-The current version targets Minecraft version **18w48a**.
+The current version targets Minecraft version **18w48b**.
 
 ## Contributing
 

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'de.undercouch.download'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
-def minecraft_version = "18w48a"
+def minecraft_version = "18w48b"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins

mappings/alm.mapping

@@ -1,7 +1,6 @@
 CLASS alm
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD M getLimitPerChunk ()I
 	METHOD U_ update ()V
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;

mappings/bkg.mapping

@@ -1,3 +0,0 @@
-CLASS bkg
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/cba.mapping

@@ -84,8 +84,6 @@ CLASS cba
 		ARG 2 x
 		ARG 3 z
 		ARG 4 y
-	METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-		ARG 3 random
 	METHOD a toNbt (Lhp;)V
 	METHOD b applyZTransform (II)I
 	METHOD b (Lbar;Lboj;IIILcag;)V

mappings/coq.mapping

@@ -1,5 +1,3 @@
 CLASS coq
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a onChatMessage (Liy;Lja;)V

mappings/cpq.mapping

@@ -2,16 +2,16 @@ CLASS cpq
 	FIELD a focused Lcpr;
 	FIELD f active Z
 	METHOD a isActive ()Z
+	METHOD a (DDI)Z
+		ARG 1 mouseX
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a setFocused (Lcpr;)V
 	METHOD a switchFocus (Lcpr;I)V
 	METHOD b getListeners ()Ljava/util/List;
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD b focusOn (Lcpr;)V
 	METHOD e setEnabled (Z)V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD t focusNext ()V

mappings/cps.mapping

@@ -1,13 +1,13 @@
 CLASS cps
-	METHOD charTyped (CI)Z
+	METHOD a (CI)Z
 		ARG 1 chr
-	METHOD keyPressed (III)Z
+	METHOD a (DDI)Z
+		ARG 1 mouseX
+	METHOD a (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD keyReleased (III)Z
+	METHOD b (DDI)Z
+		ARG 1 mouseX
+	METHOD c (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX

mappings/cqw.mapping

@@ -1,14 +1,14 @@
 CLASS cqw
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isSelected (I)Z
 	METHOD a drawEntries (IIIIF)V
 	METHOD a drawEntry (IIIIIIF)V
 		ARG 1 x
 		ARG 2 y
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c width ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n getContentHeight ()I

mappings/cqy.mapping

@@ -1,13 +1,13 @@
 CLASS cqy
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isSelected (I)Z
 	METHOD a drawEntry (IIIIIIF)V
 		ARG 1 x
 		ARG 2 y
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c getWidth ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n getContentHeight ()I

mappings/cqz.mapping

@@ -1,4 +1,6 @@
 CLASS cqz
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isSelected (I)Z
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
@@ -6,11 +8,9 @@ CLASS cqz
 	METHOD a drawEntry (IIIIIIF)V
 		ARG 1 x
 		ARG 2 y
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c getWidth ()I
 	METHOD d getEntryCount ()I
 	METHOD f getScrollbarPosition ()I
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n getContentHeight ()I

mappings/cug.mapping

@@ -4,5 +4,5 @@ CLASS cug
 			ARG 0 mouseX
 			ARG 1 mouseY
 			ARG 2 delta
-	METHOD mouseClicked (DDI)Z
+	METHOD a (DDI)Z
 		ARG 1 mouseX

mappings/cuk.mapping

@@ -1,7 +1,7 @@
 CLASS cuk
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
 	METHOD b getWidth ()I
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

mappings/cur.mapping

@@ -1,4 +1,4 @@
 CLASS cur
-	METHOD a drawEntry (IIIIZF)V
+	METHOD a (DDI)Z
-	METHOD mouseClicked (DDI)Z
 		ARG 1 mouseX
+	METHOD a drawEntry (IIIIZF)V

mappings/net/minecraft/Bootstrap.mapping

@@ -41,8 +41,8 @@ CLASS qb net/minecraft/Bootstrap
 			ARG 0 location
 			ARG 1 stack
 	CLASS qb$a DispenseBoat
-		FIELD a itemDropper Lew;
+		FIELD b itemDropper Lew;
-		FIELD b type Larp$b;
+		FIELD c type Larp$b;
 		METHOD <init> (Larp$b;)V
 			ARG 0 type
 		METHOD a playSound (Leu;)V
@@ -108,24 +108,12 @@ CLASS qb net/minecraft/Bootstrap
 		CLASS qb$19$1
 			METHOD a getVariation ()F
 			METHOD a createProjectile (Lbaq;Lfi;Lavs;)Laqw;
-				ARG 0 world
-				ARG 1 position
-				ARG 2 stack
 			METHOD b getForce ()F
-		METHOD dispense (Leu;Lavs;)Lavs;
-			ARG 0 location
-			ARG 1 stack
 	CLASS qb$20
 		CLASS qb$20$1
 			METHOD a getVariation ()F
 			METHOD a createProjectile (Lbaq;Lfi;Lavs;)Laqw;
-				ARG 0 world
-				ARG 1 position
-				ARG 2 stack
 			METHOD b getForce ()F
-		METHOD dispense (Leu;Lavs;)Lavs;
-			ARG 0 location
-			ARG 1 stack
 	CLASS qb$21
 		METHOD a doDispense (Leu;Lavs;)Lavs;
 			ARG 0 location

mappings/net/minecraft/block/AbstractBannerBlock.mapping

@@ -2,7 +2,6 @@ CLASS bev net/minecraft/block/AbstractBannerBlock
 	FIELD b color Lauo;
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/AbstractButtonBlock.mapping

@@ -3,7 +3,6 @@ CLASS bfy net/minecraft/block/AbstractButtonBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -31,7 +30,6 @@ CLASS bfy net/minecraft/block/AbstractButtonBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/AbstractPressurePlateBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bfk net/minecraft/block/AbstractPressurePlateBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a canMobSpawnInside ()Z
 	METHOD a getTickRate (Lbau;)I
 	METHOD a setRedstoneOutput (Lboj;I)Lboj;
@@ -8,7 +6,6 @@ CLASS bfk net/minecraft/block/AbstractPressurePlateBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/AbstractRailBlock.mapping

@@ -5,7 +5,6 @@ CLASS bfl net/minecraft/block/AbstractRailBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a neighborUpdate (Lboj;Lbaq;Let;Lbfr;Let;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/AbstractRedstoneGateBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bgx net/minecraft/block/AbstractRedstoneGateBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -14,7 +11,6 @@ CLASS bgx net/minecraft/block/AbstractRedstoneGateBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/AbstractSkullBlock.mapping

@@ -1,6 +1,5 @@
 CLASS bew net/minecraft/block/AbstractSkullBlock
 	FIELD a type Lbkk$a;
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a hasBlockEntityBreakingRender (Lboj;)Z
 	METHOD b getSkullType ()Lbkk$a;

mappings/net/minecraft/block/AirBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bex net/minecraft/block/AirBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c canCollideWith (Lboj;)Z
 	METHOD d isAir (Lboj;)Z

mappings/net/minecraft/block/AnvilBlock.mapping

@@ -10,14 +10,10 @@ CLASS bey net/minecraft/block/AnvilBlock
 		METHOD l getContainerId ()Ljava/lang/String;
 	FIELD a FACING Lbpd;
 	FIELD b LOGGER_ANVIL Lorg/apache/logging/log4j/Logger;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -32,6 +28,4 @@ CLASS bey net/minecraft/block/AnvilBlock
 		ARG 8 hitY
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/BambooBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bfa net/minecraft/block/BambooBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -18,7 +15,6 @@ CLASS bfa net/minecraft/block/BambooBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a (Lboj;Lbac;Let;Lcku;)Lclj;
 		ARG 1 state
 		ARG 2 view
@@ -31,7 +27,6 @@ CLASS bfa net/minecraft/block/BambooBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD aa_ getOffsetType ()Lbfr$b;
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world

mappings/net/minecraft/block/BarrelBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bfd net/minecraft/block/BarrelBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -14,7 +10,5 @@ CLASS bfd net/minecraft/block/BarrelBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;

mappings/net/minecraft/block/BarrierBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bfe net/minecraft/block/BarrierBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c getAmbientOcclusionLightLevel (Lboj;Lbac;Let;)F
 	METHOD e isFullBoundsCubeForCulling (Lboj;)Z

mappings/net/minecraft/block/BeaconBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bfm net/minecraft/block/BeaconBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/BedBlock.mapping

@@ -1,9 +1,7 @@
 CLASS bfn net/minecraft/block/BedBlock
 	FIELD w color Lauo;
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onEntityLand (Lbac;Lagi;)V
 		ARG 1 world
 	METHOD a afterBreak (Lbaq;Laqj;Let;Lboj;Lbmn;Lavs;)V
@@ -29,7 +27,6 @@ CLASS bfn net/minecraft/block/BedBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -50,7 +47,6 @@ CLASS bfn net/minecraft/block/BedBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c getRenderLayer ()Lbad;
 	METHOD d getColor ()Lauo;

mappings/net/minecraft/block/BeetrootsBlock.mapping

@@ -1,17 +1,13 @@
 CLASS bfo net/minecraft/block/BeetrootsBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getGrowthAmount (Lbaq;)I
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD d getAgeProperty ()Lbpi;
 	METHOD e getCropAgeMaximum ()I
 	METHOD f getCropItem ()Lbap;

mappings/net/minecraft/block/BellBlock.mapping

@@ -1,14 +1,9 @@
 CLASS bfp net/minecraft/block/BellBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a (Lboj;Lbac;Let;Lcku;)Lclj;
 		ARG 1 state
 		ARG 2 view
@@ -17,6 +12,5 @@ CLASS bfp net/minecraft/block/BellBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD h getPistonBehavior (Lboj;)Lcdw;

mappings/net/minecraft/block/BlastFurnaceBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bfq net/minecraft/block/BlastFurnaceBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/Block.mapping

@@ -50,13 +50,10 @@ CLASS bfr net/minecraft/block/Block
 	FIELD t mapColor Lcdv;
 	FIELD u stateFactory Lbok;
 	FIELD v collidable Z
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createCubeShape (DDDDDD)Lclj;
 	METHOD a getStateFromRawId (I)Lboj;
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a addStacksForDisplay (Lauj;Lfh;)V
 	METHOD a getBlockFromItem (Lavn;)Lbfr;
 		ARG 0 item
@@ -118,7 +115,6 @@ CLASS bfr net/minecraft/block/Block
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -175,7 +171,6 @@ CLASS bfr net/minecraft/block/Block
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getDroppedStacks (Lboj;Lchi$a;)Ljava/util/List;
 		ARG 1 state
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
@@ -183,7 +178,6 @@ CLASS bfr net/minecraft/block/Block
 	METHOD a getDroppedStacks (Lboj;Luj;Let;Lbmn;)Ljava/util/List;
 	METHOD a getDroppedStacks (Lboj;Luj;Let;Lbmn;Lagi;Lavs;)Ljava/util/List;
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD a matches (Lxx;)Z
 	METHOD aa_ getOffsetType ()Lbfr$b;
 	METHOD b getRenderType (Lboj;)Lbjx;

mappings/net/minecraft/block/BlockWithEntity.mapping

@@ -1,6 +1,4 @@
 CLASS bfj net/minecraft/block/BlockWithEntity
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onBlockAction (Lboj;Lbaq;Let;II)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/BrewingStandBlock.mapping

@@ -1,9 +1,6 @@
 CLASS bfu net/minecraft/block/BrewingStandBlock
 	FIELD a BOTTLE_PROPERTIES [Lbpa;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -12,7 +9,6 @@ CLASS bfu net/minecraft/block/BrewingStandBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -31,7 +27,6 @@ CLASS bfu net/minecraft/block/BrewingStandBlock
 		ARG 3 pos
 		ARG 4 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state

mappings/net/minecraft/block/BubbleColumnBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bfv net/minecraft/block/BubbleColumnBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
@@ -19,7 +17,6 @@ CLASS bfv net/minecraft/block/BubbleColumnBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state

mappings/net/minecraft/block/CactusBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bfz net/minecraft/block/CactusBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -24,6 +21,5 @@ CLASS bfz net/minecraft/block/CactusBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD e isFullBoundsCubeForCulling (Lboj;)Z

mappings/net/minecraft/block/CakeBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bga net/minecraft/block/CakeBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -22,7 +19,6 @@ CLASS bga net/minecraft/block/CakeBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/CarpetBlock.mapping

@@ -2,7 +2,6 @@ CLASS bmf net/minecraft/block/CarpetBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;

mappings/net/minecraft/block/CarrotsBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bgb net/minecraft/block/CarrotsBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD f getCropItem ()Lbap;

mappings/net/minecraft/block/CartographyTableBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bgc net/minecraft/block/CartographyTableBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/CauldronBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bge net/minecraft/block/CauldronBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -22,7 +19,6 @@ CLASS bge net/minecraft/block/CauldronBlock
 		ARG 7 hitX
 		ARG 8 hitY
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/ChestBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bgf net/minecraft/block/ChestBlock
 	FIELD a FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a hasBlockOnTop (Lbac;Let;)Z
 	METHOD a isChestBlocked (Lbaq;Let;)Z
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
@@ -17,7 +13,6 @@ CLASS bgf net/minecraft/block/ChestBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -43,11 +38,9 @@ CLASS bgf net/minecraft/block/ChestBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b hasOcelotOnTop (Lbaq;Let;)Z
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I

mappings/net/minecraft/block/ChorusFlowerBlock.mapping

@@ -14,5 +14,4 @@ CLASS bgg net/minecraft/block/ChorusFlowerBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/ChorusPlantBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bgh net/minecraft/block/ChorusPlantBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -15,5 +12,4 @@ CLASS bgh net/minecraft/block/ChorusPlantBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/CocoaBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bgi net/minecraft/block/CocoaBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -14,7 +11,6 @@ CLASS bgi net/minecraft/block/CocoaBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -24,7 +20,6 @@ CLASS bgi net/minecraft/block/CocoaBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/CommandBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bgj net/minecraft/block/CommandBlock
 	FIELD a FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -34,9 +30,7 @@ CLASS bgj net/minecraft/block/CommandBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state

mappings/net/minecraft/block/ComparatorBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bgk net/minecraft/block/ComparatorBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getAttachedItemFrame (Lbaq;Ley;Let;)Laoa;
 		ARG 1 world
 		ARG 2 facing
@@ -24,7 +21,6 @@ CLASS bgk net/minecraft/block/ComparatorBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getOutputLevel (Lbac;Let;Lboj;)I
 		ARG 1 view
 		ARG 2 pos

mappings/net/minecraft/block/ConcretePowderBlock.mapping

@@ -1,5 +1,4 @@
 CLASS bgl net/minecraft/block/ConcretePowderBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state

mappings/net/minecraft/block/ConduitBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bgm net/minecraft/block/ConduitBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -13,14 +9,12 @@ CLASS bgm net/minecraft/block/ConduitBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/ConnectedPlantBlock.mapping

@@ -9,4 +9,3 @@ CLASS bji net/minecraft/block/ConnectedPlantBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos

mappings/net/minecraft/block/CoralBlock.mapping

@@ -2,7 +2,6 @@ CLASS bgp net/minecraft/block/CoralBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onBlockAdded (Lboj;Lbaq;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 world

mappings/net/minecraft/block/CoralBlockBlock.mapping

@@ -1,6 +1,5 @@
 CLASS bgn net/minecraft/block/CoralBlockBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state

mappings/net/minecraft/block/CoralDeadBlock.mapping

@@ -1,7 +1,4 @@
 CLASS bfg net/minecraft/block/CoralDeadBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos

mappings/net/minecraft/block/CoralDeadFanBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bff net/minecraft/block/CoralDeadFanBlock
 	FIELD a a Lclj;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos

mappings/net/minecraft/block/CoralDeadWallFanBlock.mapping

@@ -1,20 +1,14 @@
 CLASS bfi net/minecraft/block/CoralDeadWallFanBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/CoralParentBlock.mapping

@@ -1,18 +1,13 @@
 CLASS bfh net/minecraft/block/CoralParentBlock
 	FIELD b WATERLOGGED Lbpa;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/CraftingTableBlock.mapping

@@ -8,8 +8,6 @@ CLASS bgr net/minecraft/block/CraftingTableBlock
 			ARG 0 playerInv
 			ARG 1 player
 		METHOD l getContainerId ()Ljava/lang/String;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/CropBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bgs net/minecraft/block/CropBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
@@ -17,7 +15,6 @@ CLASS bgs net/minecraft/block/CropBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world
@@ -29,7 +26,6 @@ CLASS bgs net/minecraft/block/CropBlock
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b withCropAge (I)Lboj;
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world

mappings/net/minecraft/block/DaylightDetectorBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bgu net/minecraft/block/DaylightDetectorBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -21,6 +17,5 @@ CLASS bgu net/minecraft/block/DaylightDetectorBlock
 		ARG 7 hitX
 		ARG 8 hitY
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD g emitsRedstonePower (Lboj;)Z

mappings/net/minecraft/block/DeadBushBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bgv net/minecraft/block/DeadBushBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z
 		ARG 1 floor
 		ARG 2 view

mappings/net/minecraft/block/DetectorRailBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bgw net/minecraft/block/DetectorRailBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
@@ -22,9 +20,7 @@ CLASS bgw net/minecraft/block/DetectorRailBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/DispenserBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bgz net/minecraft/block/DispenserBlock
 	FIELD c BEHAVIORS Ljava/util/Map;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBehaviorForItem (Lavs;)Lfa;
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a registerBehavior (Lbap;Lfa;)V
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
@@ -41,9 +37,7 @@ CLASS bgz net/minecraft/block/DispenserBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD a getOutputLocation (Leu;)Lfi;
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I

mappings/net/minecraft/block/DoorBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bha net/minecraft/block/DoorBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a afterBreak (Lbaq;Laqj;Let;Lboj;Lbmn;Lavs;)V
 		ARG 1 world
 		ARG 2 player
@@ -21,7 +18,6 @@ CLASS bha net/minecraft/block/DoorBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -45,10 +41,8 @@ CLASS bha net/minecraft/block/DoorBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD h getPistonBehavior (Lboj;)Lcdw;

mappings/net/minecraft/block/DragonEggBlock.mapping

@@ -1,11 +1,8 @@
 CLASS bhc net/minecraft/block/DragonEggBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos

mappings/net/minecraft/block/DropperBlock.mapping

@@ -1,6 +1,3 @@
 CLASS bhd net/minecraft/block/DropperBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBehaviorForItem (Lavs;)Lfa;
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world

mappings/net/minecraft/block/EnchantingTableBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bhe net/minecraft/block/EnchantingTableBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -11,7 +8,6 @@ CLASS bhe net/minecraft/block/EnchantingTableBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos

mappings/net/minecraft/block/EndGatewayBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bhf net/minecraft/block/EndGatewayBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/EndPortalBlock.mapping

@@ -1,15 +1,11 @@
 CLASS bhg net/minecraft/block/EndPortalBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/EndPortalFrameBlock.mapping

@@ -1,14 +1,10 @@
 CLASS bhh net/minecraft/block/EndPortalFrameBlock
 	FIELD a PROPERTY_FACING Lbpd;
 	FIELD f COMPLETED_FRAME Lboo;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -16,9 +12,7 @@ CLASS bhh net/minecraft/block/EndPortalFrameBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/EndRodBlock.mapping

@@ -1,19 +1,13 @@
 CLASS bhi net/minecraft/block/EndRodBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/EnderChestBlock.mapping

@@ -1,16 +1,11 @@
 CLASS bhj net/minecraft/block/EnderChestBlock
 	FIELD a FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a hasBlockEntityBreakingRender (Lboj;)Z
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -27,11 +22,9 @@ CLASS bhj net/minecraft/block/EnderChestBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state

mappings/net/minecraft/block/FacingBlock.mapping

@@ -1,3 +1 @@
 CLASS bgy net/minecraft/block/FacingBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/net/minecraft/block/FallingBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bhm net/minecraft/block/FallingBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a onBlockAdded (Lboj;Lbaq;Let;Lboj;)V
 		ARG 1 world

mappings/net/minecraft/block/FarmlandBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bhn net/minecraft/block/FarmlandBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onLandedUpon (Lbaq;Let;Lagi;F)V
 		ARG 1 world
 		ARG 2 pos
@@ -10,7 +7,6 @@ CLASS bhn net/minecraft/block/FarmlandBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -23,4 +19,3 @@ CLASS bhn net/minecraft/block/FarmlandBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/FenceBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bho net/minecraft/block/FenceBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -18,4 +15,3 @@ CLASS bho net/minecraft/block/FenceBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/FenceGateBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bhp net/minecraft/block/FenceGateBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -30,4 +26,3 @@ CLASS bhp net/minecraft/block/FenceGateBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/FernBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bli net/minecraft/block/FernBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -12,7 +10,6 @@ CLASS bli net/minecraft/block/FernBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD aa_ getOffsetType ()Lbfr$b;
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world

mappings/net/minecraft/block/FireBlock.mapping

@@ -1,14 +1,10 @@
 CLASS bhq net/minecraft/block/FireBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a trySpreadFire (Lbaq;Let;ILjava/util/Random;I)V
 	METHOD a getTickRate (Lbau;)I
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onBlockAdded (Lboj;Lbaq;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 world
@@ -22,7 +18,6 @@ CLASS bhq net/minecraft/block/FireBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/FletchingTableBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bhr net/minecraft/block/FletchingTableBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/FlowerBlock.mapping

@@ -2,5 +2,4 @@ CLASS bhs net/minecraft/block/FlowerBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD aa_ getOffsetType ()Lbfr$b;

mappings/net/minecraft/block/FlowerPotBlock.mapping

@@ -5,7 +5,6 @@ CLASS bht net/minecraft/block/FlowerPotBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/FluidBlock.mapping

@@ -3,7 +3,6 @@ CLASS biu net/minecraft/block/FluidBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -21,7 +20,6 @@ CLASS biu net/minecraft/block/FluidBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c canCollideWith (Lboj;)Z
 	METHOD c randomTick (Lboj;Lbaq;Let;Ljava/util/Random;)V

mappings/net/minecraft/block/FurnaceBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bhv net/minecraft/block/FurnaceBlock
 	FIELD a FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -29,9 +25,7 @@ CLASS bhv net/minecraft/block/FurnaceBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state

mappings/net/minecraft/block/GlassBlock.mapping

@@ -1,5 +1,3 @@
 CLASS bhw net/minecraft/block/GlassBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD d isSimpleFullBlock (Lboj;Lbac;Let;)Z

mappings/net/minecraft/block/GlazedTerracottaBlock.mapping

@@ -1,8 +1,4 @@
 CLASS bhx net/minecraft/block/GlazedTerracottaBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD h getPistonBehavior (Lboj;)Lcdw;

mappings/net/minecraft/block/GourdBlock.mapping

@@ -1,3 +1 @@
 CLASS blb net/minecraft/block/GourdBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/net/minecraft/block/GrassBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bhy net/minecraft/block/GrassBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/GrassPathBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bhz net/minecraft/block/GrassPathBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos

mappings/net/minecraft/block/GravelBlock.mapping

@@ -1,4 +1,2 @@
 CLASS bia net/minecraft/block/GravelBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD r getColor (Lboj;)I

mappings/net/minecraft/block/GrindstoneBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bib net/minecraft/block/GrindstoneBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a (Lboj;Lbac;Let;Lcku;)Lclj;
 		ARG 1 state
 		ARG 2 view
@@ -14,7 +11,5 @@ CLASS bib net/minecraft/block/GrindstoneBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;

mappings/net/minecraft/block/HayBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bid net/minecraft/block/HayBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onLandedUpon (Lbaq;Let;Lagi;F)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/HopperBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bie net/minecraft/block/HopperBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -13,7 +9,6 @@ CLASS bie net/minecraft/block/HopperBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -48,9 +43,7 @@ CLASS bie net/minecraft/block/HopperBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state

mappings/net/minecraft/block/HorizontalConnectedBlock.mapping

@@ -7,7 +7,6 @@ CLASS bgt net/minecraft/block/HorizontalConnectedBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -18,5 +17,4 @@ CLASS bgt net/minecraft/block/HorizontalConnectedBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/HorizontalFacingBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bif net/minecraft/block/HorizontalFacingBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation

mappings/net/minecraft/block/IceBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bih net/minecraft/block/IceBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a afterBreak (Lbaq;Laqj;Let;Lboj;Lbmn;Lavs;)V
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/block/IceFrostedBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bhu net/minecraft/block/IceFrostedBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
@@ -14,4 +12,3 @@ CLASS bhu net/minecraft/block/IceFrostedBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/JigsawBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bik net/minecraft/block/JigsawBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world
@@ -16,6 +12,4 @@ CLASS bik net/minecraft/block/JigsawBlock
 		ARG 8 hitY
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/JukeboxBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bil net/minecraft/block/JukeboxBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a removeRecord (Lbaq;Let;)V
 	METHOD a setRecord (Lbar;Let;Lboj;Lavs;)V
 		ARG 2 pos
@@ -22,7 +19,6 @@ CLASS bil net/minecraft/block/JukeboxBlock
 		ARG 3 pos
 		ARG 4 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD b getComparatorOutput (Lboj;Lbaq;Let;)I
 		ARG 1 state

mappings/net/minecraft/block/KelpBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bim net/minecraft/block/KelpBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -16,6 +12,5 @@ CLASS bim net/minecraft/block/KelpBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/LadderBlock.mapping

@@ -1,22 +1,16 @@
 CLASS bio net/minecraft/block/LadderBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/LanternBlock.mapping

@@ -1,16 +1,11 @@
 CLASS bip net/minecraft/block/LanternBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/LeavesBlock.mapping

@@ -1,9 +1,6 @@
 CLASS biq net/minecraft/block/LeavesBlock
 	FIELD c translucentLeaves Z
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -11,7 +8,6 @@ CLASS biq net/minecraft/block/LeavesBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD a setRenderingMode (Z)V
 		ARG 0 fancy
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V

mappings/net/minecraft/block/LecternBlock.mapping

@@ -1,14 +1,9 @@
 CLASS bir net/minecraft/block/LecternBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a (Lboj;Lbac;Let;Lcku;)Lclj;
 		ARG 1 state
 		ARG 2 view
@@ -16,7 +11,5 @@ CLASS bir net/minecraft/block/LecternBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;

mappings/net/minecraft/block/LeverBlock.mapping

@@ -1,10 +1,7 @@
 CLASS bit net/minecraft/block/LeverBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -24,7 +21,6 @@ CLASS bit net/minecraft/block/LeverBlock
 		ARG 3 pos
 		ARG 4 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/LoomBlock.mapping

@@ -7,10 +7,7 @@ CLASS bix net/minecraft/block/LoomBlock
 			ARG 0 playerInv
 			ARG 1 player
 		METHOD l getContainerId ()Ljava/lang/String;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world
@@ -21,4 +18,3 @@ CLASS bix net/minecraft/block/LoomBlock
 		ARG 7 hitX
 		ARG 8 hitY
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/MagmaBlock.mapping

@@ -1,6 +1,4 @@
 CLASS biy net/minecraft/block/MagmaBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onSteppedOn (Lbaq;Let;Lagi;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/MelonBlock.mapping

@@ -1,3 +1 @@
 CLASS biz net/minecraft/block/MelonBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/net/minecraft/block/MobSpawnerBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bkt net/minecraft/block/MobSpawnerBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/MushroomBlock.mapping

@@ -1,14 +1,9 @@
 CLASS big net/minecraft/block/MushroomBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/MushroomPlantBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjb net/minecraft/block/MushroomPlantBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -12,7 +10,6 @@ CLASS bjb net/minecraft/block/MushroomPlantBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state

mappings/net/minecraft/block/MyceliumBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjc net/minecraft/block/MyceliumBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/NetherWartBlock.mapping

@@ -1,19 +1,15 @@
 CLASS bje net/minecraft/block/NetherWartBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z
 		ARG 1 floor
 		ARG 2 view

mappings/net/minecraft/block/NoteBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bjf net/minecraft/block/NoteBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onBlockAction (Lboj;Lbaq;Let;II)Z
 		ARG 1 state
 		ARG 2 world
@@ -28,4 +25,3 @@ CLASS bjf net/minecraft/block/NoteBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/ObserverBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bjg net/minecraft/block/ObserverBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -24,11 +21,9 @@ CLASS bjg net/minecraft/block/ObserverBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/OreBlock.mapping

@@ -1,4 +1,2 @@
 CLASS bjh net/minecraft/block/OreBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onStacksDropped (Lboj;Lbaq;Let;Lavs;)V

mappings/net/minecraft/block/PaneBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bij net/minecraft/block/PaneBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/PillarBlock.mapping

@@ -1,11 +1,6 @@
 CLASS bjz net/minecraft/block/PillarBlock
 	FIELD a AXIS Lbpg;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/PistonBlock.mapping

@@ -1,7 +1,6 @@
 CLASS bod net/minecraft/block/PistonBlock
 	FIELD i isSticky Z
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -14,7 +13,6 @@ CLASS bod net/minecraft/block/PistonBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -41,8 +39,6 @@ CLASS bod net/minecraft/block/PistonBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD g canSuffocate (Lboj;Lbac;Let;)Z
 	METHOD i hasSolidTopSurface (Lboj;Lbac;Let;)Z

mappings/net/minecraft/block/PistonExtensionBlock.mapping

@@ -1,10 +1,7 @@
 CLASS boc net/minecraft/block/PistonExtensionBlock
 	FIELD a FACING Lbpd;
 	FIELD b TYPE Lbpg;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getBlockEntityPiston (Lbac;Let;)Lbof;
 		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
@@ -16,7 +13,6 @@ CLASS boc net/minecraft/block/PistonExtensionBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -41,7 +37,6 @@ CLASS boc net/minecraft/block/PistonExtensionBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getDroppedStacks (Lboj;Lchi$a;)Ljava/util/List;
 		ARG 1 state
 	METHOD a createBlockEntityPiston (Lboj;Ley;ZZ)Lbmn;
@@ -49,5 +44,4 @@ CLASS boc net/minecraft/block/PistonExtensionBlock
 		ARG 1 dir
 		ARG 2 extending
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD e isFullBoundsCubeForCulling (Lboj;)Z

mappings/net/minecraft/block/PistonHeadBlock.mapping

@@ -1,6 +1,4 @@
 CLASS boe net/minecraft/block/PistonHeadBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
@@ -11,7 +9,6 @@ CLASS boe net/minecraft/block/PistonHeadBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -31,9 +28,7 @@ CLASS boe net/minecraft/block/PistonHeadBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD i hasSolidTopSurface (Lboj;Lbac;Let;)Z

mappings/net/minecraft/block/PlantBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bfx net/minecraft/block/PlantBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;

mappings/net/minecraft/block/PlayerSkullBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjj net/minecraft/block/PlayerSkullBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/PortalBlock.mapping

@@ -1,13 +1,10 @@
 CLASS bjd net/minecraft/block/PortalBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world
@@ -18,11 +15,9 @@ CLASS bjd net/minecraft/block/PortalBlock
 		ARG 3 pos
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/PotatoesBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bjl net/minecraft/block/PotatoesBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD f getCropItem ()Lbap;

mappings/net/minecraft/block/PoweredRailBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bjn net/minecraft/block/PoweredRailBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD e getShapeProperty ()Lbpl;

mappings/net/minecraft/block/PressurePlateBlock.mapping

@@ -5,5 +5,4 @@ CLASS bjo net/minecraft/block/PressurePlateBlock
 	METHOD a setRedstoneOutput (Lboj;I)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD i getRedstoneOutput (Lboj;)I

mappings/net/minecraft/block/PumpkinBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjp net/minecraft/block/PumpkinBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/PumpkinCarvedBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bgd net/minecraft/block/PumpkinCarvedBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onBlockAdded (Lboj;Lbaq;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 world
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/RailBlock.mapping

@@ -1,11 +1,7 @@
 CLASS bjq net/minecraft/block/RailBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD e getShapeProperty ()Lbpl;

mappings/net/minecraft/block/RedstoneBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjm net/minecraft/block/RedstoneBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/RedstoneLampBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bju net/minecraft/block/RedstoneLampBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a neighborUpdate (Lboj;Lbaq;Let;Lbfr;Let;)V
 		ARG 1 state
 		ARG 2 world
@@ -17,5 +14,4 @@ CLASS bju net/minecraft/block/RedstoneLampBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD k getLuminance (Lboj;)I

mappings/net/minecraft/block/RedstoneOreBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjs net/minecraft/block/RedstoneOreBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onSteppedOn (Lbaq;Let;Lagi;)V
 		ARG 1 world
 		ARG 2 pos
@@ -23,7 +21,6 @@ CLASS bjs net/minecraft/block/RedstoneOreBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/RedstoneTorchBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjv net/minecraft/block/RedstoneTorchBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
@@ -25,7 +23,6 @@ CLASS bjv net/minecraft/block/RedstoneTorchBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/RedstoneTorchWallBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bjw net/minecraft/block/RedstoneTorchWallBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -17,11 +13,9 @@ CLASS bjw net/minecraft/block/RedstoneTorchWallBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/RedstoneWireBlock.mapping

@@ -1,16 +1,12 @@
 CLASS bjt net/minecraft/block/RedstoneWireBlock
 	FIELD h wiresGivePower Z
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getRenderConnectionType (Lbac;Let;Ley;)Lbpn;
 		ARG 1 view
 		ARG 2 pos
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -35,11 +31,9 @@ CLASS bjt net/minecraft/block/RedstoneWireBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getWireColor (I)I
 		ARG 0 powerLevel
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I

mappings/net/minecraft/block/RepeaterBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bjy net/minecraft/block/RepeaterBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world
@@ -15,7 +12,6 @@ CLASS bjy net/minecraft/block/RepeaterBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SaplingBambooBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bfb net/minecraft/block/SaplingBambooBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
@@ -19,7 +17,6 @@ CLASS bfb net/minecraft/block/SaplingBambooBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state

mappings/net/minecraft/block/SaplingBlock.mapping

@@ -11,13 +11,11 @@ CLASS bkc net/minecraft/block/SaplingBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/ScaffoldingBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bkd net/minecraft/block/ScaffoldingBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a (Lboj;Lbac;Let;Lcku;)Lclj;
 		ARG 1 state
 		ARG 2 view
@@ -21,6 +17,5 @@ CLASS bkd net/minecraft/block/ScaffoldingBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/SeaPickleBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bke net/minecraft/block/SeaPickleBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -14,13 +11,11 @@ CLASS bke net/minecraft/block/SeaPickleBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/SeagrassBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bkf net/minecraft/block/SeagrassBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos
@@ -14,7 +11,6 @@ CLASS bkf net/minecraft/block/SeagrassBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V

mappings/net/minecraft/block/ShulkerBoxBlock.mapping

@@ -1,14 +1,12 @@
 CLASS bkh net/minecraft/block/ShulkerBoxBlock
 	FIELD c color Lauo;
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a get (Lauo;)Lbfr;
 		ARG 0 dyeColor
 	METHOD a addInformation (Lavs;Lbac;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 3 tooltip
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
@@ -25,7 +23,6 @@ CLASS bkh net/minecraft/block/ShulkerBoxBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world
@@ -44,11 +41,9 @@ CLASS bkh net/minecraft/block/ShulkerBoxBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getDroppedStacks (Lboj;Lchi$a;)Ljava/util/List;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getItemStack (Lauo;)Lavs;
 		ARG 0 color
 	METHOD b getColor (Lavn;)Lauo;

mappings/net/minecraft/block/SignBlock.mapping

@@ -1,14 +1,10 @@
 CLASS bki net/minecraft/block/SignBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a canMobSpawnInside ()Z
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a hasBlockEntityBreakingRender (Lboj;)Z
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SkullBlock.mapping

@@ -8,15 +8,11 @@ CLASS bkk net/minecraft/block/SkullBlock
 		FIELD e CREEPER Lbkk$b;
 		FIELD f DRAGON Lbkk$b;
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/SlabBlock.mapping

@@ -1,18 +1,13 @@
 CLASS bkl net/minecraft/block/SlabBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD f getFluidState (Lboj;)Lcdq;
 	METHOD i hasSolidTopSurface (Lboj;Lbac;Let;)Z

mappings/net/minecraft/block/SlimeBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bkm net/minecraft/block/SlimeBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onEntityLand (Lbac;Lagi;)V
 		ARG 1 world
 	METHOD a onSteppedOn (Lbaq;Let;Lagi;)V

mappings/net/minecraft/block/SmithingTableBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bkn net/minecraft/block/SmithingTableBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SmokerBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bko net/minecraft/block/SmokerBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a activate (Lboj;Lbaq;Let;Laqj;Lafb;Ley;FFF)Z
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SnowBlock.mapping

@@ -1,12 +1,8 @@
 CLASS bkp net/minecraft/block/SnowBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -22,4 +18,3 @@ CLASS bkp net/minecraft/block/SnowBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/SnowyBlock.mapping

@@ -1,10 +1,6 @@
 CLASS bkq net/minecraft/block/SnowyBlock
 	FIELD a snowy Lbpa;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/SoulSandBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bkr net/minecraft/block/SoulSandBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getTickRate (Lbau;)I
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world

mappings/net/minecraft/block/SpongeBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bku net/minecraft/block/SpongeBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a neighborUpdate (Lboj;Lbaq;Let;Lbfr;Let;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SpongeWetBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bma net/minecraft/block/SpongeWetBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/SpreadableBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bkv net/minecraft/block/SpreadableBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state

mappings/net/minecraft/block/StairsBlock.mapping

@@ -3,7 +3,6 @@ CLASS bky net/minecraft/block/StairsBlock
 	FIELD D baseBlockState Lboj;
 	FIELD a FACING Lbpd;
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onSteppedOn (Lbaq;Let;Lagi;)V
 		ARG 1 world
 		ARG 2 pos
@@ -17,7 +16,6 @@ CLASS bky net/minecraft/block/StairsBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -51,11 +49,9 @@ CLASS bky net/minecraft/block/StairsBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/StandingBannerBlock.mapping

@@ -1,18 +1,14 @@
 CLASS bfc net/minecraft/block/StandingBannerBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/StandingSignBlock.mapping

@@ -1,16 +1,11 @@
 CLASS bkz net/minecraft/block/StandingSignBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/StemAttachedBlock.mapping

@@ -5,16 +5,13 @@ CLASS bez net/minecraft/block/StemAttachedBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z
 		ARG 1 floor
 		ARG 2 view

mappings/net/minecraft/block/StemBlock.mapping

@@ -13,13 +13,11 @@ CLASS bla net/minecraft/block/StemBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b grow (Lbaq;Ljava/util/Random;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 random

mappings/net/minecraft/block/StoneButtonBlock.mapping

@@ -1,3 +1 @@
 CLASS blc net/minecraft/block/StoneButtonBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/net/minecraft/block/StonecutterBlock.mapping

@@ -1,9 +1,6 @@
 CLASS bld net/minecraft/block/StonecutterBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/StructureBlock.mapping

@@ -1,10 +1,6 @@
 CLASS ble net/minecraft/block/StructureBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -25,5 +21,4 @@ CLASS ble net/minecraft/block/StructureBlock
 		ARG 3 pos
 		ARG 4 block
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getRenderType (Lboj;)Lbjx;

mappings/net/minecraft/block/StructureVoidBlock.mapping

@@ -1,10 +1,7 @@
 CLASS blf net/minecraft/block/StructureVoidBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD b getRenderType (Lboj;)Lbjx;
 	METHOD c getAmbientOcclusionLightLevel (Lboj;Lbac;Let;)F
 	METHOD h getPistonBehavior (Lboj;)Lcdw;

mappings/net/minecraft/block/SugarCaneBlock.mapping

@@ -1,11 +1,8 @@
 CLASS blg net/minecraft/block/SugarCaneBlock
 	FIELD a AGE Lbpi;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -15,5 +12,4 @@ CLASS blg net/minecraft/block/SugarCaneBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/TallFlowerBlock.mapping

@@ -1,6 +1,4 @@
 CLASS blh net/minecraft/block/TallFlowerBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a isFertilizable (Lbac;Let;Lboj;Z)Z
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/TallPlantBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bhb net/minecraft/block/TallPlantBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a afterBreak (Lbaq;Laqj;Let;Lboj;Lbmn;Lavs;)V
 		ARG 1 world
 		ARG 2 player
@@ -23,5 +20,4 @@ CLASS bhb net/minecraft/block/TallPlantBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD aa_ getOffsetType ()Lbfr$b;

mappings/net/minecraft/block/TallSeagrassBlock.mapping

@@ -1,15 +1,11 @@
 CLASS blj net/minecraft/block/TallSeagrassBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getPickStack (Lbac;Let;Lboj;)Lavs;
 		ARG 1 world
 		ARG 2 pos
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD b canPlantOnTop (Lboj;Lbac;Let;)Z

mappings/net/minecraft/block/TntBlock.mapping

@@ -1,6 +1,4 @@
 CLASS blk net/minecraft/block/TntBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a shouldDropItemsOnExplosion (Lbaj;)Z
 	METHOD a onDestroyedByExplosion (Lbaq;Let;Lbaj;)V
 		ARG 1 world
@@ -32,4 +30,3 @@ CLASS blk net/minecraft/block/TntBlock
 		ARG 2 world
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/TorchBlock.mapping

@@ -1,11 +1,8 @@
 CLASS bll net/minecraft/block/TorchBlock
 	FIELD d BOUNDING_SHAPE Lclj;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;

mappings/net/minecraft/block/TransparentBlock.mapping

@@ -1,3 +1 @@
 CLASS bic net/minecraft/block/TransparentBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

mappings/net/minecraft/block/TrapdoorBlock.mapping

@@ -1,12 +1,8 @@
 CLASS blm net/minecraft/block/TrapdoorBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -27,6 +23,5 @@ CLASS blm net/minecraft/block/TrapdoorBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;
 	METHOD f getFluidState (Lboj;)Lcdq;

mappings/net/minecraft/block/TrappedChestBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bln net/minecraft/block/TrappedChestBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a createBlockEntity (Lbac;)Lbmn;
-		ARG 1 world
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/TripwireBlock.mapping

@@ -1,6 +1,5 @@
 CLASS blo net/minecraft/block/TripwireBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onBreak (Lbaq;Let;Lboj;Laqj;)V
 		ARG 1 world
 		ARG 2 pos
@@ -8,7 +7,6 @@ CLASS blo net/minecraft/block/TripwireBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world
@@ -30,9 +28,7 @@ CLASS blo net/minecraft/block/TripwireBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/TripwireHookBlock.mapping

@@ -1,9 +1,6 @@
 CLASS blp net/minecraft/block/TripwireHookBlock
 	FIELD a FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos
@@ -12,7 +9,6 @@ CLASS blp net/minecraft/block/TripwireHookBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a getWeakRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view
@@ -32,11 +28,9 @@ CLASS blp net/minecraft/block/TripwireHookBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b getStrongRedstonePower (Lboj;Lbac;Let;Ley;)I
 		ARG 1 state
 		ARG 2 view

mappings/net/minecraft/block/TurtleEggBlock.mapping

@@ -1,8 +1,5 @@
 CLASS blq net/minecraft/block/TurtleEggBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a afterBreak (Lbaq;Laqj;Let;Lboj;Lbmn;Lavs;)V
 		ARG 1 world
 		ARG 2 player
@@ -19,7 +16,6 @@ CLASS blq net/minecraft/block/TurtleEggBlock
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onBlockAdded (Lboj;Lbaq;Let;Lboj;)V
 		ARG 1 world
 		ARG 2 world
@@ -29,5 +25,4 @@ CLASS blq net/minecraft/block/TurtleEggBlock
 		ARG 2 state
 		ARG 3 pos
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/VineBlock.mapping

@@ -1,12 +1,8 @@
 CLASS blr net/minecraft/block/VineBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a scheduledTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 state
@@ -17,9 +13,7 @@ CLASS blr net/minecraft/block/VineBlock
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD c getRenderLayer ()Lbad;

mappings/net/minecraft/block/WallBannerBlock.mapping

@@ -1,19 +1,15 @@
 CLASS bls net/minecraft/block/WallBannerBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD m getTranslationKey ()Ljava/lang/String;

mappings/net/minecraft/block/WallBlock.mapping

@@ -1,12 +1,8 @@
 CLASS blt net/minecraft/block/WallBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAtSide (Lboj;Lbac;Let;Lcfy;)Z
 		ARG 1 world
 		ARG 3 pos
@@ -16,4 +12,3 @@ CLASS blt net/minecraft/block/WallBlock
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder

mappings/net/minecraft/block/WallMountedBlock.mapping

@@ -1,8 +1,5 @@
 CLASS bhl net/minecraft/block/WallMountedBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;

mappings/net/minecraft/block/WallPlayerSkullBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bjk net/minecraft/block/WallPlayerSkullBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/WallSignBlock.mapping

@@ -1,22 +1,16 @@
 CLASS blu net/minecraft/block/WallSignBlock
 	FIELD c FACING Lbpd;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD m getTranslationKey ()Ljava/lang/String;

mappings/net/minecraft/block/WallSkullBlock.mapping

@@ -1,15 +1,11 @@
 CLASS blv net/minecraft/block/WallSkullBlock
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD m getTranslationKey ()Ljava/lang/String;

mappings/net/minecraft/block/WallTorchBlock.mapping

@@ -1,25 +1,19 @@
 CLASS blw net/minecraft/block/WallTorchBlock
 	FIELD a FACING Lbpd;
 	FIELD b BOUNDING_SHAPES Ljava/util/Map;
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getPlacementState (Latw;)Lboj;
-		ARG 1 context
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a canPlaceAt (Lboj;Lbau;Let;)Z
 		ARG 1 world
 	METHOD a applyMirror (Lboj;Lbja;)Lboj;
 		ARG 1 state
 	METHOD a applyRotation (Lboj;Lbka;)Lboj;
 		ARG 1 state
-		ARG 2 rotation
 	METHOD a getRenderingState (Lboj;Ley;Lboj;Lbar;Let;Let;)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD b randomDisplayTick (Lboj;Lbaq;Let;Ljava/util/Random;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/WallWitherSkullBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bmd net/minecraft/block/WallWitherSkullBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/WaterlilyBlock.mapping

@@ -1,10 +1,7 @@
 CLASS blx net/minecraft/block/WaterlilyBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a getBoundingShape (Lboj;Lbac;Let;)Lclj;
 		ARG 1 state
 		ARG 2 view
-		ARG 3 pos
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/WebBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bly net/minecraft/block/WebBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onEntityCollision (Lboj;Lbaq;Let;Lagi;)V
 		ARG 1 state
 		ARG 2 world

mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping

@@ -3,5 +3,4 @@ CLASS blz net/minecraft/block/WeightedPressurePlateBlock
 	METHOD a setRedstoneOutput (Lboj;I)Lboj;
 		ARG 1 state
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 builder
 	METHOD i getRedstoneOutput (Lboj;)I

mappings/net/minecraft/block/WitherSkullBlock.mapping

@@ -1,6 +1,4 @@
 CLASS bmc net/minecraft/block/WitherSkullBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder
 	METHOD a onPlaced (Lbaq;Let;Lboj;Lagr;Lavs;)V
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/block/WoodButtonBlock.mapping

@@ -1,3 +1 @@
 CLASS bme net/minecraft/block/WoodButtonBlock
-	METHOD <init> (Lbfr$c;)V
-		ARG 1 builder

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

@@ -2,11 +2,8 @@ CLASS bmh net/minecraft/block/entity/BannerPattern
 	CLASS bmh$a Builder
 		FIELD a patterns Ljava/util/List;
 		METHOD a build ()Lhv;
-			ARG 1 patternTag
-			ARG 4 tag
 		METHOD a with (Lbmh;Lauo;)Lbmh$a;
 			ARG 1 pattern
-			ARG 2 color
 	FIELD A HALF_VERTICAL_LEFT Lbmh;
 	FIELD B HALF_HORIZONTAL_TOP Lbmh;
 	FIELD C HALF_VERTICAL_RIGHT Lbmh;
@@ -53,11 +50,9 @@ CLASS bmh net/minecraft/block/entity/BannerPattern
 	FIELD z RHOMBUS Lbmh;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
 		ARG 3 name
-		ARG 4 id
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Lavs;)V
 		ARG 3 name
 		ARG 4 id
-		ARG 5 baseStack
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
 		ARG 3 name
 		ARG 4 id
@@ -67,4 +62,3 @@ CLASS bmh net/minecraft/block/entity/BannerPattern
 	METHOD a byId (Ljava/lang/String;)Lbmh;
 		ARG 0 id
 	METHOD b getId ()Ljava/lang/String;
-	METHOD values ()[Lbmh;

mappings/net/minecraft/client/MinecraftClientGame.mapping

@@ -1,5 +1,3 @@
 CLASS cnq net/minecraft/client/MinecraftClientGame
 	FIELD a client Lcnv;
 	FIELD b launcher Lcom/mojang/bridge/launcher/Launcher;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client

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

@@ -17,7 +17,5 @@ CLASS don net/minecraft/client/audio/MusicTracker
 	FIELD b client Lcnv;
 	FIELD c current Ldnt;
 	FIELD d timeUntilNextSong I
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a play (Ldon$a;)V
 	METHOD ab_ tick ()V

mappings/net/minecraft/client/font/FontRenderer.mapping

@@ -17,7 +17,6 @@ CLASS coj net/minecraft/client/font/FontRenderer
 	FIELD e rightToLeft Z
 	METHOD <init> (Ldln;Lcqg;)V
 		ARG 1 textureManager
-		ARG 2 font
 	METHOD a isRightToLeft ()Z
 	METHOD a getCharWidth (C)F
 	METHOD a (Lcqj;ZZFFFLcnf;FFFF)V
@@ -31,18 +30,15 @@ CLASS coj net/minecraft/client/font/FontRenderer
 		ARG 9 green
 		ARG 10 blue
 	METHOD a mirror (Ljava/lang/String;)Ljava/lang/String;
-		ARG 1 string
 	METHOD a drawWithShadow (Ljava/lang/String;FFI)I
 		ARG 1 string
 		ARG 2 x
 		ARG 3 y
-		ARG 4 color
 	METHOD a drawInternal (Ljava/lang/String;FFIZ)I
 		ARG 1 str
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
-		ARG 5 shadow
 	METHOD a (Ljava/lang/String;I)Ljava/lang/String;
 		ARG 1 string
 	METHOD a drawStringBounded (Ljava/lang/String;IIII)V
@@ -55,18 +51,15 @@ CLASS coj net/minecraft/client/font/FontRenderer
 		ARG 2 width
 	METHOD a setRightToLeft (Z)V
 	METHOD b getStringWidth (Ljava/lang/String;)I
-		ARG 1 string
 	METHOD b draw (Ljava/lang/String;FFI)I
 		ARG 1 string
 		ARG 2 x
 		ARG 3 y
-		ARG 4 color
 	METHOD b drawStringInternal (Ljava/lang/String;FFIZ)F
 		ARG 1 str
 		ARG 2 x
 		ARG 3 y
 		ARG 4 color
-		ARG 5 shadow
 	METHOD b getStringBoundedHeight (Ljava/lang/String;I)I
 		ARG 1 str
 	METHOD b renderStringBounded (Ljava/lang/String;IIII)V
@@ -77,7 +70,6 @@ CLASS coj net/minecraft/client/font/FontRenderer
 	METHOD c trimEndNewlines (Ljava/lang/String;)Ljava/lang/String;
 	METHOD c wrapStringToWidthAsList (Ljava/lang/String;I)Ljava/util/List;
 		ARG 1 text
-	METHOD close ()V
 	METHOD d wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String;
 		ARG 1 text
 	METHOD e getCharacterCountForWidth (Ljava/lang/String;I)I

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

@@ -13,18 +13,18 @@ CLASS csv net/minecraft/client/gui/AbstractCommandBlockGui
 	FIELD g doneButton Lcou;
 	FIELD h cancelButton Lcou;
 	FIELD i toggleTrackingOutputButton Lcou;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
 	METHOD f update ()V
 	METHOD g close ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -9,6 +9,8 @@ CLASS csw net/minecraft/client/gui/ContainerGui
 	FIELD u slots Ljava/util/Set;
 	METHOD a getSlotAt (DD)Lath;
 		ARG 1 xPosition
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -18,6 +20,9 @@ CLASS csw net/minecraft/client/gui/ContainerGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a isPointWithinBounds (IIIIDD)Z
 		ARG 1 xPosition
 		ARG 2 yPosition
@@ -37,6 +42,8 @@ CLASS csw net/minecraft/client/gui/ContainerGui
 		ARG 2 xPosition
 		ARG 3 yPosition
 	METHOD aj_ canClose ()Z
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD b drawMousoverTooltip (II)V
 		ARG 1 mouseX
 	METHOD c onInitialized ()V
@@ -47,11 +54,4 @@ CLASS csw net/minecraft/client/gui/ContainerGui
 	METHOD e isPauseScreen ()Z
 	METHOD f update ()V
 	METHOD h calculateOffset ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -13,6 +13,9 @@ CLASS csb net/minecraft/client/gui/Gui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a getStackTooltip (Lavs;)Ljava/util/List;
 	METHOD a drawStackTooltip (Lavs;II)V
 		ARG 1 stack
@@ -54,9 +57,6 @@ CLASS csb net/minecraft/client/gui/Gui
 	METHOD g close ()V
 	METHOD g isSelectAllShortcutPressed (I)Z
 		ARG 0 code
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD n onClosed ()V
 	METHOD p isControlPressed ()Z
 	METHOD q isShiftPressed ()Z

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

@@ -1,13 +1,13 @@
 CLASS cpr net/minecraft/client/gui/GuiEventListener
-	METHOD b setHasFocus (Z)V
+	METHOD a (CI)Z
-	METHOD charTyped (CI)Z
 		ARG 1 chr
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
+	METHOD b setHasFocus (Z)V
+	METHOD c (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD d mouseMoved (DD)V
 		ARG 1 mouseX
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD keyReleased (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD l hasFocus ()Z

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

@@ -40,6 +40,8 @@ CLASS csg net/minecraft/client/gui/MainMenuGui
 	FIELD x warningAlignTop I
 	FIELD y warningAlignRight I
 	FIELD z warningAlignBottom I
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -53,6 +55,4 @@ CLASS csg net/minecraft/client/gui/MainMenuGui
 	METHOD f update ()V
 	METHOD h areRealmsNotificationsEnabled ()Z
 	METHOD i switchToRealms ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -8,6 +8,8 @@ CLASS ctd net/minecraft/client/gui/container/CraftingTableGui
 	METHOD <init> (Laqi;Lbaq;Let;)V
 		ARG 1 playerInv
 		ARG 2 world
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -31,6 +33,4 @@ CLASS ctd net/minecraft/client/gui/container/CraftingTableGui
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
 	METHOD f update ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -7,6 +7,8 @@ CLASS ctj net/minecraft/client/gui/container/EnchantingGui
 	METHOD <init> (Laqi;Lbaq;Lafi;)V
 		ARG 1 playerInv
 		ARG 2 world
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a drawBackground (FII)V
 		ARG 1 delta
 		ARG 2 mouseX
@@ -17,5 +19,3 @@ CLASS ctj net/minecraft/client/gui/container/EnchantingGui
 		ARG 1 mouseX
 	METHOD f update ()V
 	METHOD h calculateOffset ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

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

@@ -7,6 +7,10 @@ CLASS ctk net/minecraft/client/gui/container/FurnaceGui
 	FIELD z playerInv Laqi;
 	METHOD <init> (Laqi;Laev;)V
 		ARG 1 playerInv
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -16,6 +20,9 @@ CLASS ctk net/minecraft/client/gui/container/FurnaceGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a onMouseClick (Lath;IILasi;)V
 		ARG 1 slot
 		ARG 2 invSlot
@@ -23,12 +30,5 @@ CLASS ctk net/minecraft/client/gui/container/FurnaceGui
 	METHOD c onInitialized ()V
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD f update ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -1,5 +1,7 @@
 CLASS ctq net/minecraft/client/gui/container/LoomGui
 	FIELD w TEXTURE Lpy;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -13,5 +15,3 @@ CLASS ctq net/minecraft/client/gui/container/LoomGui
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
 	METHOD f update ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

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

@@ -4,16 +4,16 @@ CLASS cuh net/minecraft/client/gui/container/RecipeBookGui
 	FIELD j recipeBook Lcno;
 	FIELD r searchField Lcoy;
 	FIELD t cachedInvChangeCount I
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a (IILcnv;ZLatb;)V
 		ARG 3 client
 	METHOD a triggerPirateSpeakEasterEgg (Ljava/lang/String;)V
-	METHOD charTyped (CI)Z
+	METHOD c (III)Z
-		ARG 1 chr
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD keyReleased (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

mappings/net/minecraft/client/gui/hud/BossBarHud.mapping

@@ -2,8 +2,6 @@ CLASS cot net/minecraft/client/gui/hud/BossBarHud
 	FIELD a BAR_TEX Lpy;
 	FIELD f client Lcnv;
 	FIELD g bossBars Ljava/util/Map;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a draw ()V
 	METHOD a drawBossBar (IILaet;)V
 		ARG 1 x

mappings/net/minecraft/client/gui/hud/ChatHud.mapping

@@ -1,8 +1,6 @@
 CLASS cov net/minecraft/client/gui/hud/ChatHud
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD f client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a reset ()V
 	METHOD a addMessage (Lja;)V
 	METHOD a addMessage (Lja;I)V

mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping

@@ -1,5 +1,3 @@
 CLASS cor net/minecraft/client/gui/hud/ChatListenerHud
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a onChatMessage (Liy;Lja;)V

mappings/net/minecraft/client/gui/hud/DebugHud.mapping

@@ -1,6 +1,4 @@
 CLASS cox net/minecraft/client/gui/hud/DebugHud
 	FIELD a client Lcnv;
 	FIELD f fontRenderer Lcoj;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD c drawLeftInfoText ()V

mappings/net/minecraft/client/gui/hud/InGameHud.mapping

@@ -19,8 +19,6 @@ CLASS cok net/minecraft/client/gui/hud/InGameHud
 	FIELD u hudSpectator Lcpv;
 	FIELD v hudScoreboard Lcpk;
 	FIELD w hudBossBar Lcot;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a draw (F)V
 	METHOD a addChatMessage (Liy;Lja;)V
 	METHOD a setOverlayMessage (Lja;Z)V

mappings/net/minecraft/client/gui/hud/SpectatorHud.mapping

@@ -3,6 +3,4 @@ CLASS cpv net/minecraft/client/gui/hud/SpectatorHud
 	FIELD f WIDGETS_TEX Lpy;
 	FIELD g client Lcnv;
 	FIELD i spectatorMenu Lcvi;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a draw (F)V

mappings/net/minecraft/client/gui/hud/SubtitlesHud.mapping

@@ -10,7 +10,5 @@ CLASS cpo net/minecraft/client/gui/hud/SubtitlesHud
 	FIELD a client Lcnv;
 	FIELD f entries Ljava/util/List;
 	FIELD g enabled Z
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a onSoundPlayed (Ldnt;Ldor;)V
 		ARG 1 sound

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

@@ -1,17 +1,17 @@
 CLASS cre net/minecraft/client/gui/ingame/ChatGui
 	FIELD a chatField Lcoy;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
 	METHOD e isPauseScreen ()Z
 	METHOD f update ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -2,9 +2,9 @@ CLASS crs net/minecraft/client/gui/ingame/ChatSleepingGui
 	CLASS crs$1
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD c onInitialized ()V
 	METHOD g close ()V
 	METHOD i leaveBed ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode

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

@@ -45,6 +45,10 @@ CLASS ctf net/minecraft/client/gui/ingame/CreativeInventoryGui
 	FIELD x BG_TEX Lpy;
 	FIELD y inventory Lafk;
 	FIELD z selectedTab I
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -54,6 +58,9 @@ CLASS ctf net/minecraft/client/gui/ingame/CreativeInventoryGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a onMouseClick (Lath;IILasi;)V
 		ARG 1 slot
 		ARG 2 invSlot
@@ -61,6 +68,8 @@ CLASS ctf net/minecraft/client/gui/ingame/CreativeInventoryGui
 	METHOD a drawStackTooltip (Lavs;II)V
 		ARG 1 stack
 		ARG 2 x
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD b setSelectedTab (Lauj;)V
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
@@ -68,19 +77,10 @@ CLASS ctf net/minecraft/client/gui/ingame/CreativeInventoryGui
 	METHOD c onInitialized ()V
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
-	METHOD charTyped (CI)Z
+	METHOD c (III)Z
-		ARG 1 chr
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD f update ()V
 	METHOD h calculateOffset ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD keyReleased (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD m doRenderScrollBar ()Z
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -7,6 +7,8 @@ CLASS crl net/minecraft/client/gui/ingame/DeathGui
 			ARG 0 mouseX
 	FIELD a ticksSinceDeath I
 	FIELD f msg Lja;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
@@ -16,5 +18,3 @@ CLASS crl net/minecraft/client/gui/ingame/DeathGui
 		ARG 1 result
 	METHOD e isPauseScreen ()Z
 	METHOD f update ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

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

@@ -33,17 +33,17 @@ CLASS csz net/minecraft/client/gui/ingame/EditBookGui
 	METHOD <init> (Laqj;Lavs;ZLafb;)V
 		ARG 1 player
 		ARG 2 stack
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD c onInitialized ()V
+	METHOD a (III)Z
-	METHOD charTyped (CI)Z
-		ARG 1 chr
-	METHOD d handleTextComponentClick (Lja;)Z
-	METHOD f update ()V
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
+	METHOD c onInitialized ()V
-		ARG 1 mouseX
+	METHOD d handleTextComponentClick (Lja;)Z
+	METHOD f update ()V
 	METHOD n onClosed ()V

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

@@ -3,15 +3,15 @@ CLASS ctu net/minecraft/client/gui/ingame/EditSignGui
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
 	FIELD a sign Lbnj;
+	METHOD a (CI)Z
+		ARG 1 chr
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD c onInitialized ()V
+	METHOD a (III)Z
-	METHOD charTyped (CI)Z
-		ARG 1 chr
-	METHOD f update ()V
-	METHOD g close ()V
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
+	METHOD c onInitialized ()V
+	METHOD f update ()V
+	METHOD g close ()V
 	METHOD n onClosed ()V

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

@@ -3,6 +3,8 @@ CLASS cto net/minecraft/client/gui/ingame/InventoryGui
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
 	FIELD x TEXTURE Lpy;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isClickInContainerBounds (DDIII)Z
 		ARG 1 mouseX
 		ARG 3 mouseY
@@ -24,12 +26,10 @@ CLASS cto net/minecraft/client/gui/ingame/InventoryGui
 		ARG 1 slot
 		ARG 2 invSlot
 		ARG 3 button
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c onInitialized ()V
 	METHOD c drawForeground (II)V
 		ARG 1 mouseX
 	METHOD f update ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -3,18 +3,18 @@ CLASS ctp net/minecraft/client/gui/ingame/JigsawBlockGui
 		METHOD a onPressed (DD)V
 	CLASS ctp$2
 		METHOD a onPressed (DD)V
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
 	METHOD f update ()V
 	METHOD g close ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -18,7 +18,7 @@ CLASS ctv net/minecraft/client/gui/ingame/StructureBlockGui
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
 	CLASS ctv$7
-		METHOD charTyped (CI)Z
+		METHOD a (CI)Z
 			ARG 1 chr
 	CLASS ctv$9
 		METHOD a onPressed (DD)V
@@ -72,9 +72,14 @@ CLASS ctv net/minecraft/client/gui/ingame/StructureBlockGui
 	FIELD x inputPosY Lcoy;
 	FIELD y inputPosZ Lcoy;
 	FIELD z inputSizeX Lcoy;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a parseLong (Ljava/lang/String;)J
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
@@ -87,12 +92,7 @@ CLASS ctv net/minecraft/client/gui/ingame/StructureBlockGui
 	METHOD g close ()V
 	METHOD j updateIgnoreEntitiesButton ()V
 	METHOD k updateShowAirButton ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD m updateShowBoundingBoxButton ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V
 	METHOD o updateMirrorButton ()V
 	METHOD s updateRotationButton ()V

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

@@ -12,13 +12,13 @@ CLASS crp net/minecraft/client/gui/menu/AddServerGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
 	METHOD f update ()V
 	METHOD g close ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD n onClosed ()V

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

@@ -4,9 +4,14 @@ CLASS csq net/minecraft/client/gui/menu/AdvancementsGui
 	FIELD g advancementHandler Lcze;
 	FIELD h widgetMap Ljava/util/Map;
 	FIELD i selectedWidget Lcsm;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b drawWidgets (II)V
 		ARG 1 x
 	METHOD c onInitialized ()V
@@ -18,9 +23,4 @@ CLASS csq net/minecraft/client/gui/menu/AdvancementsGui
 		ARG 1 mouseX
 		ARG 2 mouseY
 		ARG 3 x
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -32,9 +32,14 @@ CLASS cva net/minecraft/client/gui/menu/BackupLevelGui
 	FIELD h levelName Ljava/lang/String;
 	METHOD <init> (Lcrg;Ljava/lang/String;)V
 		ARG 1 callback
+	METHOD a (CI)Z
+		ARG 1 chr
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a backupLevel (Lcgx;Ljava/lang/String;)V
 		ARG 0 level
 		ARG 1 name
@@ -42,11 +47,6 @@ CLASS cva net/minecraft/client/gui/menu/BackupLevelGui
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD f update ()V
 	METHOD h commit ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD n onClosed ()V

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

@@ -27,8 +27,8 @@ CLASS crc net/minecraft/client/gui/menu/BackupPromptGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD aj_ canClose ()Z
+	METHOD a (III)Z
-	METHOD c onInitialized ()V
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
+	METHOD aj_ canClose ()Z
+	METHOD c onInitialized ()V

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

@@ -5,17 +5,17 @@ CLASS crn net/minecraft/client/gui/menu/DirectConnectServerGui
 	CLASS crn$2
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
+	METHOD a (CI)Z
+		ARG 1 chr
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b onScaleChanged (Lcnv;II)V
 		ARG 1 client
 		ARG 2 width
 	METHOD c onInitialized ()V
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD f update ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD n onClosed ()V

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

@@ -19,14 +19,14 @@ CLASS cvc net/minecraft/client/gui/menu/LevelSelectGui
 			ARG 0 mouseX
 	FIELD f title Ljava/lang/String;
 	FIELD h LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD a (CI)Z
+		ARG 1 chr
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD c onInitialized ()V
+	METHOD a (III)Z
-	METHOD charTyped (CI)Z
-		ARG 1 chr
-	METHOD f update ()V
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
+	METHOD c onInitialized ()V
+	METHOD f update ()V
 	METHOD n onClosed ()V

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

@@ -5,7 +5,7 @@ CLASS cua net/minecraft/client/gui/menu/ListEntryLocalServer
 	FIELD f lastUpdateMillis J
 	METHOD <init> (Lcty;Ldoh;)V
 		ARG 1 gui
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a drawEntry (IIIIZF)V
 	METHOD e getLanServerEntry ()Ldoh;
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

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

@@ -6,7 +6,7 @@ CLASS cub net/minecraft/client/gui/menu/ListEntryRemoteServer
 	FIELD g guiMultiplayer Lcty;
 	FIELD h client Lcnv;
 	FIELD i serverEntry Lczn;
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a drawEntry (IIIIZF)V
 	METHOD a drawIcon (IILpy;)V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX

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

@@ -25,12 +25,12 @@ CLASS cty net/minecraft/client/gui/menu/MultiplayerGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD b setIndex (I)V
 	METHOD c onInitialized ()V
 	METHOD confirmResult handle (ZI)V
 		ARG 1 result
 	METHOD f update ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD n onClosed ()V

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

@@ -41,16 +41,16 @@ CLASS cuz net/minecraft/client/gui/menu/NewLevelGui
 	FIELD s gameMode Ljava/lang/String;
 	FIELD u structures Z
 	FIELD v commandsAllowed Z
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD c onInitialized ()V
+	METHOD a (III)Z
-	METHOD charTyped (CI)Z
-		ARG 1 chr
-	METHOD f update ()V
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
+	METHOD c onInitialized ()V
-		ARG 1 mouseX
+	METHOD f update ()V
 	METHOD n onClosed ()V

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

@@ -2,9 +2,16 @@ CLASS cqx net/minecraft/client/gui/menu/RealmsGui
 	FIELD a realmsScreen Lnet/minecraft/realms/RealmsScreen;
 	FIELD f LOGGER_REALMS Lorg/apache/logging/log4j/Logger;
 	METHOD a getRealmsScreen ()Lnet/minecraft/realms/RealmsScreen;
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a drawGradientRect (IIIIII)V
 		ARG 1 top
 		ARG 2 left
@@ -35,6 +42,8 @@ CLASS cqx net/minecraft/client/gui/menu/RealmsGui
 		ARG 2 x
 	METHOD a addButton (Lnet/minecraft/realms/RealmsButton;)V
 	METHOD a addWidget (Lnet/minecraft/realms/RealmsGuiEventListener;)V
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD b drawTexturedRect (IIIIII)V
 		ARG 1 x
 		ARG 2 y
@@ -52,8 +61,6 @@ CLASS cqx net/minecraft/client/gui/menu/RealmsGui
 	METHOD c getStringWidth (Ljava/lang/String;)I
 	METHOD c containsWidget (Lnet/minecraft/realms/RealmsGuiEventListener;)Z
 	METHOD c_ drawBackground (I)V
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD confirmResult handle (ZI)V
 		ARG 1 result
 	METHOD d drawBackground ()V
@@ -62,12 +69,5 @@ CLASS cqx net/minecraft/client/gui/menu/RealmsGui
 	METHOD i getFontHeight ()I
 	METHOD j clearListeners ()V
 	METHOD k getButtons ()Ljava/util/List;
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD m clearWidgets ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n onClosed ()V

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

@@ -26,10 +26,10 @@ CLASS crh net/minecraft/client/gui/menu/YesNoGui
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD aj_ canClose ()Z
 	METHOD b disableButtons (I)V
 	METHOD c onInitialized ()V
 	METHOD f update ()V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode

mappings/net/minecraft/client/gui/menu/settings/ControlsSettingsGui.mapping

@@ -15,14 +15,14 @@ CLASS cst net/minecraft/client/gui/menu/settings/ControlsSettingsGui
 	FIELD u resetButton Lcou;
 	METHOD <init> (Lcsb;Lcnx;)V
 		ARG 1 parent
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
-	METHOD c onInitialized ()V
+	METHOD a (III)Z
-	METHOD keyPressed (III)Z
 		ARG 1 keyCode
 		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
+	METHOD b (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
 		ARG 1 mouseX
+	METHOD c onInitialized ()V

mappings/net/minecraft/client/gui/menu/settings/VideoSettingsGui.mapping

@@ -8,12 +8,12 @@ CLASS csh net/minecraft/client/gui/menu/settings/VideoSettingsGui
 	FIELD i MENU_OPTIONS [Lcnx$a;
 	METHOD <init> (Lcsb;Lcnx;)V
 		ARG 1 parent
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c onInitialized ()V
 	METHOD g close ()V
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX

mappings/net/minecraft/client/gui/widget/AbstractListWidget.mapping

@@ -9,31 +9,31 @@ CLASS cpl net/minecraft/client/gui/widget/AbstractListWidget
 	FIELD l entryHeight I
 	METHOD <init> (Lcnv;IIIII)V
 		ARG 1 client
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a isSelected (I)Z
 	METHOD a draw (IIF)V
 		ARG 1 mouseX
 		ARG 2 mouseY
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a drawEntries (IIIIF)V
 	METHOD a drawEntry (IIIIIIF)V
 	METHOD b getListeners ()Ljava/util/List;
+	METHOD b (DDI)Z
+		ARG 1 mouseX
 	METHOD c (IIII)V
 		ARG 1 width
 		ARG 2 height
 		ARG 3 y1
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD d getEntryCount ()I
 	METHOD e getEntryWidth ()I
 	METHOD e scrollByY (I)V
 	METHOD f getScrollbarPosition ()I
 	METHOD f setLeftPos (I)V
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
-		ARG 1 mouseX
 	METHOD n getContentHeight ()I
 	METHOD o clampScrollY ()V
 	METHOD p getMaxScrollY ()I

mappings/net/minecraft/client/gui/widget/ButtonWidget.mapping

@@ -21,6 +21,8 @@ CLASS cou net/minecraft/client/gui/widget/ButtonWidget
 		ARG 3 y
 	METHOD a isHovered ()Z
 	METHOD a onPressed (DD)V
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a setWidth (I)V
 	METHOD a onHover (II)V
 	METHOD a draw (IIF)V
@@ -30,7 +32,5 @@ CLASS cou net/minecraft/client/gui/widget/ButtonWidget
 	METHOD a getTextureId (Z)I
 	METHOD b getWidth ()I
 	METHOD b onReleased (DD)V
-	METHOD mouseClicked (DDI)Z
+	METHOD b (DDI)Z
-		ARG 1 mouseX
-	METHOD mouseReleased (DDI)Z
 		ARG 1 mouseX

mappings/net/minecraft/client/gui/widget/KeyBindingListWidget.mapping

@@ -9,12 +9,12 @@ CLASS css net/minecraft/client/gui/widget/KeyBindingListWidget
 		CLASS css$c$2
 			METHOD a onPressed (DD)V
 				ARG 0 mouseX
-		METHOD a drawEntry (IIIIZF)V
+		METHOD a (DDI)Z
-		METHOD mouseClicked (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode
-		METHOD mouseReleased (DDI)Z
+		METHOD a drawEntry (IIIIZF)V
+		METHOD b (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode

mappings/net/minecraft/client/gui/widget/LevelEntryWidget.mapping

@@ -6,6 +6,6 @@ CLASS cvd net/minecraft/client/gui/widget/LevelEntryWidget
 	FIELD i levelSummary Lcgy;
 	FIELD j iconLocation Lpy;
 	FIELD l iconFile Ljava/io/File;
-	METHOD a drawEntry (IIIIZF)V
+	METHOD a (DDI)Z
-	METHOD mouseClicked (DDI)Z
 		ARG 1 mouseX
+	METHOD a drawEntry (IIIIZF)V

mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping

@@ -11,24 +11,24 @@ CLASS coy net/minecraft/client/gui/widget/TextFieldWidget
 	FIELD p focused Z
 	FIELD w visible Z
 	METHOD a tick ()V
+	METHOD a (CI)Z
+		ARG 1 chr
+	METHOD a (DDI)Z
+		ARG 1 mouseX
 	METHOD a render (IIF)V
+	METHOD a (III)Z
+		ARG 1 keyCode
+		ARG 2 scanCode
 	METHOD a setText (Ljava/lang/String;)V
 	METHOD b getText ()Ljava/lang/String;
 	METHOD b addText (Ljava/lang/String;)V
 	METHOD b setHasFocus (Z)V
 	METHOD c getSelectedText ()Ljava/lang/String;
-	METHOD charTyped (CI)Z
-		ARG 1 chr
 	METHOD d setIsEditable (Z)V
 	METHOD f setVisible (Z)V
 	METHOD g getMaxLength ()I
 	METHOD g setMaxLength (I)V
 	METHOD h getId ()I
-	METHOD keyPressed (III)Z
-		ARG 1 keyCode
-		ARG 2 scanCode
 	METHOD l hasFocus ()Z
 	METHOD m isFocused ()Z
-	METHOD mouseClicked (DDI)Z
-		ARG 1 mouseX
 	METHOD r getVisible ()Z

mappings/net/minecraft/client/gui/widget/VideoSettingsListWidget.mapping

@@ -3,12 +3,12 @@ CLASS cpi net/minecraft/client/gui/widget/VideoSettingsListWidget
 		METHOD a onPressed (DD)V
 			ARG 0 mouseX
 	CLASS cpi$a
-		METHOD a drawEntry (IIIIZF)V
+		METHOD a (DDI)Z
-		METHOD mouseClicked (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode
-		METHOD mouseReleased (DDI)Z
+		METHOD a drawEntry (IIIIZF)V
+		METHOD b (DDI)Z
 			ARG 0 mouseX
 			ARG 1 mouseX
 			ARG 2 keyCode

mappings/net/minecraft/client/render/FirstPersonRenderer.mapping

@@ -10,8 +10,6 @@ CLASS dce net/minecraft/client/render/FirstPersonRenderer
 	FIELD i prevEquipProgressOffHand F
 	FIELD j renderManager Ldgs;
 	FIELD k itemRenderer Ldhn;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a updateHeldItems ()V
 	METHOD a renderFirstPersonItem (F)V
 	METHOD a rotate (FF)V

mappings/net/minecraft/client/render/Renderer.mapping

@@ -20,8 +20,6 @@ CLASS dcg net/minecraft/client/render/Renderer
 	FIELD j entityRenderDispatcher Ldgs;
 	FIELD k world Lczk;
 	FIELD o chunkRenderDispatcher Ldcq;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a renderSky (F)V
 	METHOD a markRegionForRenderUpdate (IIIZ)V
 	METHOD a onGlobalWorldEvent (ILet;I)V

mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping

@@ -1,5 +1,3 @@
 CLASS dfh net/minecraft/client/render/debug/ChunkBorderDebugRenderer
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a render (FJ)V

mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping

@@ -1,5 +1,3 @@
 CLASS dfl net/minecraft/client/render/debug/HeightmapDebugRenderer
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a render (FJ)V

mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping

@@ -1,5 +1,3 @@
 CLASS dfo net/minecraft/client/render/debug/PathfindingDebugRenderer
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a render (FJ)V

mappings/net/minecraft/client/render/debug/RenderDebug.mapping

@@ -8,7 +8,5 @@ CLASS dfk net/minecraft/client/render/debug/RenderDebug
 	FIELD n showPathfinding Z
 	FIELD o showWater Z
 	FIELD p showHeightmap Z
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a renderDebuggers (FJ)V
 	METHOD b toggleShowChunkBorder ()Z

mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping

@@ -4,6 +4,4 @@ CLASS dfr net/minecraft/client/render/debug/WaterDebugRenderer
 	FIELD c playerX D
 	FIELD d playerY D
 	FIELD e playerZ D
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a render (FJ)V

mappings/net/minecraft/client/settings/ServerList.mapping

@@ -2,8 +2,6 @@ CLASS czo net/minecraft/client/settings/ServerList
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b client Lcnv;
 	FIELD c serverEntries Ljava/util/List;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a loadFile ()V
 	METHOD a get (I)Lczn;
 	METHOD a swapEntries (II)V

mappings/net/minecraft/client/sortme/AdvancementHandler.mapping

@@ -1,7 +1,5 @@
 CLASS cze net/minecraft/client/sortme/AdvancementHandler
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a setGui (Lcze$a;)V
 	METHOD a onAdvancements (Lmu;)V

mappings/net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory.mapping

@@ -1,6 +1,6 @@
 CLASS ddr net/minecraft/client/sortme/BlockStatePropertyValuePredicateFactory
-	FIELD a VALUE_SPLITTER Lcom/google/common/base/Splitter;
+	FIELD c VALUE_SPLITTER Lcom/google/common/base/Splitter;
-	FIELD b key Ljava/lang/String;
+	FIELD d key Ljava/lang/String;
-	FIELD c valueString Ljava/lang/String;
+	FIELD e valueString Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;Ljava/lang/String;)V
 		ARG 1 key

mappings/net/minecraft/client/sortme/ClientCommandSource.mapping

@@ -1,8 +1,6 @@
 CLASS czi net/minecraft/client/sortme/ClientCommandSource
 	FIELD a networkHandler Lczh;
 	FIELD b client Lcnv;
-	METHOD <init> (Lczh;Lcnv;)V
-		ARG 2 client
 	METHOD m getTeamNames ()Ljava/util/Collection;
 	METHOD n getSoundIds ()Ljava/util/Collection;
 	METHOD o getRecipeIds ()Ljava/util/Collection;

mappings/net/minecraft/client/toast/ToastManager.mapping

@@ -8,8 +8,6 @@ CLASS cqb net/minecraft/client/toast/ToastManager
 	FIELD a client Lcnv;
 	FIELD f visibleEntries [Lcqb$a;
 	FIELD g toastQueue Ljava/util/Deque;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a draw ()V
 	METHOD a add (Lcqa;)V
 	METHOD b clear ()V

mappings/net/minecraft/client/tutorial/TutorialManager.mapping

@@ -1,8 +1,6 @@
 CLASS dpa net/minecraft/client/tutorial/TutorialManager
 	FIELD a client Lcnv;
 	FIELD b currentHandler Ldpb;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a onInventoryOpened ()V
 	METHOD a onSlotUpdate (Lavs;)V
 	METHOD a onBlockAttacked (Lczk;Let;Lboj;F)V

mappings/net/minecraft/client/util/Keyboard.mapping

@@ -2,8 +2,6 @@ CLASS cnu net/minecraft/client/util/Keyboard
 	FIELD a client Lcnv;
 	FIELD b repeatEvents Z
 	FIELD c clipboard Lcme;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a getClipboard ()Ljava/lang/String;
 	METHOD a setup (J)V
 	METHOD a onChar (JII)V

mappings/net/minecraft/client/util/Mouse.mapping

@@ -1,7 +1,5 @@
 CLASS cnw net/minecraft/client/util/Mouse
 	FIELD a client Lcnv;
-	METHOD <init> (Lcnv;)V
-		ARG 1 client
 	METHOD a setup (J)V
 	METHOD a onMouseScroll (JDD)V
 		ARG 1 window

mappings/net/minecraft/data/DataGenerator.mapping

@@ -5,9 +5,7 @@ CLASS fy net/minecraft/data/DataGenerator
 	FIELD d providers Ljava/util/List;
 	METHOD <init> (Ljava/nio/file/Path;Ljava/util/Collection;)V
 		ARG 1 output
-		ARG 2 inputs
 	METHOD a getInputs ()Ljava/util/Collection;
 	METHOD a install (Lfz;)V
-		ARG 1 provider
 	METHOD b getOutput ()Ljava/nio/file/Path;
 	METHOD c run ()V

mappings/net/minecraft/data/DataProvider.mapping

@@ -5,4 +5,3 @@ CLASS fz net/minecraft/data/DataProvider
 		ARG 0 gson
 		ARG 1 cache
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/SnbtProvider.mapping

@@ -3,4 +3,3 @@ CLASS hc net/minecraft/data/SnbtProvider
 	FIELD c root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/dev/NbtProvider.mapping

@@ -3,4 +3,3 @@ CLASS hb net/minecraft/data/dev/NbtProvider
 	FIELD c root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/report/BlockListProvider.mapping

@@ -2,4 +2,3 @@ CLASS gi net/minecraft/data/report/BlockListProvider
 	FIELD b root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/report/CommandSyntaxProvider.mapping

@@ -2,4 +2,3 @@ CLASS gj net/minecraft/data/report/CommandSyntaxProvider
 	FIELD b root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/report/ItemListProvider.mapping

@@ -2,4 +2,3 @@ CLASS gk net/minecraft/data/report/ItemListProvider
 	FIELD b root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/data/server/AbstractTagProvider.mapping

@@ -6,6 +6,5 @@ CLASS hi net/minecraft/data/server/AbstractTagProvider
 	METHOD <init> (Lfy;Lfk;)V
 		ARG 1 root
 	METHOD a run (Lga;)V
-		ARG 1 cache
 	METHOD a getOutput (Lpy;)Ljava/nio/file/Path;
 	METHOD b configure ()V

mappings/net/minecraft/data/server/AdvancementsProvider.mapping

@@ -4,7 +4,6 @@ CLASS gb net/minecraft/data/server/AdvancementsProvider
 	FIELD d root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache
 	METHOD a getOutput (Ljava/nio/file/Path;Ln;)Ljava/nio/file/Path;
 		ARG 0 rootOutput
 		ARG 1 advancement

mappings/net/minecraft/data/server/LootTablesProvider.mapping

@@ -4,7 +4,6 @@ CLASS gr net/minecraft/data/server/LootTablesProvider
 	FIELD d root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache
 	METHOD a getOutput (Ljava/nio/file/Path;Lpy;)Ljava/nio/file/Path;
 		ARG 0 rootOutput
 		ARG 1 lootTableId

mappings/net/minecraft/data/server/RecipesProvider.mapping

@@ -4,4 +4,3 @@ CLASS gv net/minecraft/data/server/RecipesProvider
 	FIELD d root Lfy;
 	METHOD a getName ()Ljava/lang/String;
 	METHOD a run (Lga;)V
-		ARG 1 cache

mappings/net/minecraft/entity/AbstractLightningEntity.mapping

@@ -1,4 +1,3 @@
 CLASS aoh net/minecraft/entity/AbstractLightningEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world

mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping

@@ -27,13 +27,11 @@ CLASS agg net/minecraft/entity/AreaEffectCloudEntity
 	METHOD a setPotion (Laxj;)V
 	METHOD a setParticleType (Lft;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD a setWaiting (Z)V
 	METHOD b setRadiusStart (F)V
 	METHOD b setDuration (I)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c setRadiusGrowth (F)V
 	METHOD d setWaitTime (I)V
 	METHOD f getRadius ()F

mappings/net/minecraft/entity/EnderEyeEntity.mapping

@@ -2,10 +2,8 @@ CLASS aqs net/minecraft/entity/EnderEyeEntity
 	METHOD U_ update ()V
 	METHOD a shouldRender (D)Z
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD h setVelocityClient (DDD)V
 		ARG 1 x
 	METHOD x_ initDataTracker ()V

mappings/net/minecraft/entity/Entity.mapping

@@ -63,7 +63,6 @@ CLASS agi net/minecraft/entity/Entity
 	FIELD y onGround Z
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD A_ getPistonBehavior ()Lcdw;
 	METHOD B_ shouldBroadcastConsoleToOps ()Z
 	METHOD E updatePortalCooldown ()V
@@ -132,7 +131,6 @@ CLASS agi net/minecraft/entity/Entity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a appendCommandFeedback (Lja;)V
 	METHOD a addScoreboardTag (Ljava/lang/String;)Z
 	METHOD a setUuid (Ljava/util/UUID;)V
@@ -191,7 +189,6 @@ CLASS agi net/minecraft/entity/Entity
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setCustomName (Lja;)V
 	METHOD b removeScoreboardTag (Ljava/lang/String;)Z
 	METHOD b isInsideFluid (Lxx;)Z

mappings/net/minecraft/entity/ExperienceOrbEntity.mapping

@@ -12,11 +12,9 @@ CLASS ago net/minecraft/entity/ExperienceOrbEntity
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD aw onSwimmingStart ()V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f getExperienceAmount ()I
 	METHOD g burn (I)V
 	METHOD i getOrbSize ()I

mappings/net/minecraft/entity/FallingBlockEntity.mapping

@@ -12,11 +12,9 @@ CLASS aok net/minecraft/entity/FallingBlockEntity
 	METHOD a addCrashReportDetails (Lc;)V
 	METHOD a setFallingBlockPos (Let;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setHurtEntities (Z)V
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bu doesRenderOnFire ()Z
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance

mappings/net/minecraft/entity/FireworkEntity.mapping

@@ -3,9 +3,7 @@ CLASS aqt net/minecraft/entity/FireworkEntity
 	METHOD U_ update ()V
 	METHOD a shouldRender (D)Z
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD g shouldRenderFrom (DDD)Z
 		ARG 1 x
 	METHOD h setVelocityClient (DDD)V

mappings/net/minecraft/entity/ItemEntity.mapping

@@ -13,10 +13,8 @@ CLASS aol net/minecraft/entity/ItemEntity
 	METHOD a tryMerge (Laol;)Z
 	METHOD a changeDimension (Lbrc;)Lagi;
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setStack (Lavs;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setOwner (Ljava/util/UUID;)V
 	METHOD c setThrower (Ljava/util/UUID;)V
 	METHOD g burn (I)V

mappings/net/minecraft/entity/LightningEntity.mapping

@@ -1,8 +1,6 @@
 CLASS aoi net/minecraft/entity/LightningEntity
 	METHOD U_ update ()V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD x_ initDataTracker ()V

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -26,7 +26,6 @@ CLASS agr net/minecraft/entity/LivingEntity
 	FIELD f HEALTH Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD C updatePotionVisibility ()V
 	METHOD C pushAway (Lagi;)V
 	METHOD D canSee (Lagi;)Z
@@ -52,7 +51,6 @@ CLASS agr net/minecraft/entity/LivingEntity
 	METHOD a setAttacker (Lagr;)V
 	METHOD a getAttributeInstance (Lahf;)Lahg;
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD aD doesCollide ()Z
 	METHOD aH isValid ()Z
@@ -63,7 +61,6 @@ CLASS agr net/minecraft/entity/LivingEntity
 	METHOD b getEquippedStack (Lagn;)Lavs;
 	METHOD b onEquipStack (Lavs;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bB shouldRenderName ()Z
 	METHOD bl getHeadPitch ()F
 	METHOD c heal (F)V

mappings/net/minecraft/entity/PrimedTNTEntity.mapping

@@ -9,11 +9,9 @@ CLASS aom net/minecraft/entity/PrimedTNTEntity
 	METHOD U_ update ()V
 	METHOD a setFuse (I)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD f getCausingEntity ()Lagr;
 	METHOD i getFuse ()I

mappings/net/minecraft/entity/WaterCreatureEntity.mapping

@@ -1,7 +1,6 @@
 CLASS amk net/minecraft/entity/WaterCreatureEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD Y updateLogic ()V
 	METHOD a canBeLeashedBy (Laqj;)Z
 	METHOD by canFly ()Z

mappings/net/minecraft/entity/ai/goal/CrossbowAttackGoal.mapping

@@ -6,4 +6,3 @@ CLASS ajq net/minecraft/entity/ai/goal/CrossbowAttackGoal
 	METHOD b shouldContinue ()Z
 	METHOD d onRemove ()V
 	METHOD e tick ()V
-		ARG 1 target

mappings/net/minecraft/entity/ai/goal/Goal.mapping

@@ -2,7 +2,6 @@ CLASS aio net/minecraft/entity/ai/goal/Goal
 	FIELD a controlBits I
 	METHOD a canStart ()Z
 	METHOD a setControlBits (I)V
-		ARG 1 controlBits
 	METHOD b shouldContinue ()Z
 	METHOD c start ()V
 	METHOD d onRemove ()V

mappings/net/minecraft/entity/ai/goal/MeleeAttackGoal.mapping

@@ -4,9 +4,6 @@ CLASS aiz net/minecraft/entity/ai/goal/MeleeAttackGoal
 		ARG 1 entity
 	METHOD a canStart ()Z
 	METHOD b shouldContinue ()Z
-		ARG 1 target
 	METHOD c start ()V
 	METHOD d onRemove ()V
-		ARG 1 target
 	METHOD e tick ()V
-		ARG 1 target

mappings/net/minecraft/entity/ai/goal/ProjectileAttackGoal.mapping

@@ -5,7 +5,6 @@ CLASS ajo net/minecraft/entity/ai/goal/ProjectileAttackGoal
 	METHOD <init> (Lapm;DIIF)V
 		ARG 1 entity
 	METHOD a canStart ()Z
-		ARG 1 target
 	METHOD b shouldContinue ()Z
 	METHOD d onRemove ()V
 	METHOD e tick ()V

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

@@ -19,11 +19,9 @@ CLASS anc net/minecraft/entity/boss/EntityEnderDragon
 		ARG 1 part
 		ARG 2 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD bk getParts ()[Lagi;
 	METHOD c addPotionEffect (Lagb;)Z

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

@@ -18,10 +18,8 @@ CLASS anw net/minecraft/entity/boss/EntityWither
 	METHOD a canDestroy (Lbfr;)Z
 		ARG 0 block
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setCustomName (Lja;)V
 	METHOD bj stickInWeb ()V
 	METHOD c handleFallDamage (FF)V
@@ -38,5 +36,4 @@ CLASS anw net/minecraft/entity/boss/EntityWither
 	METHOD n canStartRiding (Lagi;)Z
 	METHOD p getTrackedEntityId (I)I
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -4,7 +4,6 @@ CLASS anz net/minecraft/entity/decoration/AbstractDecorationEntity
 	FIELD c facing Ley;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD <init> (Lagm;Lbaq;Let;)V
 		ARG 1 world
 	METHOD U_ update ()V
@@ -20,13 +19,11 @@ CLASS anz net/minecraft/entity/decoration/AbstractDecorationEntity
 	METHOD a applyRotation (Lbka;)F
 	METHOD a setFacing (Ley;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aD doesCollide ()Z
 	METHOD aF shouldSetPositionOnLoad ()Z
 	METHOD b setPosition (DDD)V
 		ARG 1 x
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bC getHorizontalFacing ()Ley;
 	METHOD f addVelocity (DDD)V
 		ARG 1 deltaX

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

@@ -42,7 +42,6 @@ CLASS any net/minecraft/entity/decoration/ArmorStandEntity
 		ARG 2 hitPos
 	METHOD a setHeadRotation (Lfl;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD a onSmallValueChange (Z)V
 	METHOD aD doesCollide ()Z
@@ -52,7 +51,6 @@ CLASS any net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD b getEquippedStack (Lagn;)Lavs;
 	METHOD b setBodyRotation (Lfl;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bN isImmuneToExplosion ()Z
 	METHOD c setLeftArmRotation (Lfl;)V

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

@@ -8,11 +8,9 @@ CLASS anb net/minecraft/entity/decoration/EnderCrystalEntity
 		ARG 1 source
 	METHOD a setBeamTarget (Let;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setShowBottom (Z)V
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f getBeamTarget ()Let;
 	METHOD i shouldShowBottom ()Z
 	METHOD x_ initDataTracker ()V

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

@@ -13,13 +13,11 @@ CLASS aoa net/minecraft/entity/decoration/ItemFrameEntity
 		ARG 1 value
 	METHOD a setFacing (Ley;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b setHeldItemStack (Lavs;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD k getWidthPixels ()I
 	METHOD l getHeightPixels ()I

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

@@ -3,13 +3,11 @@ CLASS aob net/minecraft/entity/decoration/LeashKnotEntity
 	METHOD a copyEntityData (Lagi;)V
 	METHOD a setFacing (Ley;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setPosition (DDD)V
 		ARG 1 x
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD k getWidthPixels ()I
 	METHOD l getHeightPixels ()I

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

@@ -9,12 +9,10 @@ CLASS aod net/minecraft/entity/decoration/PaintingEntity
 		ARG 5 z
 	METHOD a copyEntityData (Lagi;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setPositionAndAngles (DDDFF)V
 		ARG 1 x
 		ARG 3 y
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD k getWidthPixels ()I
 	METHOD l getHeightPixels ()I
 	METHOD m onDecorationPlaced ()V

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

@@ -5,7 +5,6 @@ CLASS aop net/minecraft/entity/mob/AbstractSkeletonEntity
 	FIELD a AIMING Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a initEquipment (Lafa;)V
 	METHOD a setEquippedStack (Lagn;Lavs;)V
 		ARG 1 slot
@@ -16,7 +15,6 @@ CLASS aop net/minecraft/entity/mob/AbstractSkeletonEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aK getHeightOffset ()D
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
@@ -24,5 +22,4 @@ CLASS aop net/minecraft/entity/mob/AbstractSkeletonEntity
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -1,5 +1,4 @@
 CLASS alh net/minecraft/entity/mob/AmbientEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a canBeLeashedBy (Laqj;)Z

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

@@ -11,9 +11,7 @@ CLASS aos net/minecraft/entity/mob/CreeperEntity
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bp getSafeFallDistance ()I
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance

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

@@ -22,11 +22,9 @@ CLASS aow net/minecraft/entity/mob/EndermanEntity
 		ARG 1 source
 	METHOD a dropEquipment (Lafr;IZ)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b setCarriedBlock (Lboj;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -4,10 +4,8 @@ CLASS aox net/minecraft/entity/mob/EndermiteEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aK getHeightOffset ()D
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -37,9 +37,7 @@ CLASS aoz net/minecraft/entity/mob/EvokerEntity
 	METHOD U_ update ()V
 	METHOD a setWololoTarget (Lame;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dP getWololoTarget ()Lame;

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

@@ -10,8 +10,6 @@ CLASS aqr net/minecraft/entity/mob/EvokerFangsEntity
 	METHOD U_ update ()V
 	METHOD a setOwner (Lagr;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f getOwner ()Lagr;
 	METHOD x_ initDataTracker ()V

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

@@ -1,7 +1,6 @@
 CLASS agp net/minecraft/entity/mob/FlyingEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD z_ canClimb ()Z

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

@@ -23,10 +23,8 @@ CLASS apa net/minecraft/entity/mob/GhastEntity
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setShooting (Z)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cI getSoundVolume ()F

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

@@ -9,7 +9,6 @@ CLASS apc net/minecraft/entity/mob/GuardianEntity
 		METHOD a tick ()V
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source

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

@@ -1,7 +1,6 @@
 CLASS aph net/minecraft/entity/mob/HostileEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD U_ update ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source

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

@@ -9,11 +9,9 @@ CLASS ape net/minecraft/entity/mob/IllagerBeastEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aL getMountedHeightOffset ()D
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;

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

@@ -1,5 +1,4 @@
 CLASS aoo net/minecraft/entity/mob/IllagerEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD x_ initDataTracker ()V

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

@@ -25,5 +25,4 @@ CLASS apf net/minecraft/entity/mob/IllusionerEntity
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -21,7 +21,6 @@ CLASS ags net/minecraft/entity/mob/MobEntity
 	FIELD c target Lagr;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD A playSoundAmbient ()V
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD F getLootTableId ()Lpy;
@@ -49,7 +48,6 @@ CLASS ags net/minecraft/entity/mob/MobEntity
 	METHOD a setPathNodeTypeWeight (Lcft;F)V
 		ARG 1 type
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a detachLeash (ZZ)V
 		ARG 1 sendPacket
 	METHOD aU getItemsHand ()Ljava/lang/Iterable;
@@ -61,7 +59,6 @@ CLASS ags net/minecraft/entity/mob/MobEntity
 		ARG 1 player
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD bp getSafeFallDistance ()I
 	METHOD cX getMainHand ()Lagq;

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

@@ -3,7 +3,6 @@ CLASS agy net/minecraft/entity/mob/MobEntityWithAi
 	FIELD b aiRadius F
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a setAiHome (Let;I)V
 		ARG 1 home
 	METHOD dt isInAiRange ()Z

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

@@ -6,12 +6,9 @@ CLASS api net/minecraft/entity/mob/PatrolEntity
 		METHOD e tick ()V
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aK getHeightOffset ()D
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD n initAi ()V

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

@@ -15,7 +15,6 @@ CLASS apj net/minecraft/entity/mob/PhantomEntity
 		METHOD a tick ()V
 	CLASS apj$g
 		METHOD a tick ()V
-	CLASS apj$h
 	CLASS apj$i
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
@@ -29,10 +28,8 @@ CLASS apj net/minecraft/entity/mob/PhantomEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxh;

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

@@ -11,9 +11,7 @@ CLASS apk net/minecraft/entity/mob/PigZombieEntity
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dC getSkull ()Lavs;

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

@@ -6,14 +6,11 @@ CLASS apl net/minecraft/entity/mob/PillagerEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -1,21 +1,12 @@
 CLASS arl net/minecraft/entity/mob/RaiderEntity
-	CLASS arl$a
 	FIELD bC hasRaidGoal Z
 	FIELD b wave I
 	FIELD c raid Lark;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a setRaid (Lark;)V
-		ARG 1 raid
-	METHOD a (Lhp;)V
-		ARG 1 tag
 	METHOD b setWave (I)V
-		ARG 1 wave
-	METHOD b (Lhp;)V
-		ARG 1 tag
 	METHOD dK hasRaidGoal ()Z
 	METHOD dL getRaid ()Lark;
 	METHOD dN getWave ()I
 	METHOD u setHasRaidGoal (Z)V
-		ARG 1 hasRaidGoal

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

@@ -34,12 +34,10 @@ CLASS apo net/minecraft/entity/mob/ShulkerEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b setPosition (DDD)V
 		ARG 1 x
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cb initAttributes ()V

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

@@ -4,11 +4,9 @@ CLASS amt net/minecraft/entity/mob/SkeletonHorseEntity
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aL getMountedHeightOffset ()D
 	METHOD af getSoundSwim ()Lxf;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;

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

@@ -18,7 +18,6 @@ CLASS apr net/minecraft/entity/mob/SlimeEntity
 	FIELD bC SLIME_SIZE Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD F getLootTableId ()Lpy;
 	METHOD R getType ()Lagm;
 	METHOD U_ update ()V
@@ -26,10 +25,8 @@ CLASS apr net/minecraft/entity/mob/SlimeEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -19,11 +19,8 @@ CLASS aps net/minecraft/entity/mob/SpellcastingIllagerEntity
 	FIELD b spellTicks I
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD H mobTick ()V
 	METHOD U_ update ()V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD x_ initDataTracker ()V

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

@@ -7,7 +7,6 @@ CLASS apt net/minecraft/entity/mob/SpiderEntity
 	FIELD a SPIDER_FLAGS Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD U_ update ()V
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;

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

@@ -32,10 +32,8 @@ CLASS apv net/minecraft/entity/mob/VexEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dA getBounds ()Let;

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

@@ -8,9 +8,7 @@ CLASS apw net/minecraft/entity/mob/VindicatorEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setCustomName (Lja;)V
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -12,5 +12,4 @@ CLASS apx net/minecraft/entity/mob/WitchEntity
 	METHOD l isDrinking ()Z
 	METHOD n initAi ()V
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -6,7 +6,6 @@ CLASS apz net/minecraft/entity/mob/ZombieEntity
 	FIELD c SPAWN_REINFORCEMENTS Lahf;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setSize (FF)V
@@ -20,11 +19,9 @@ CLASS apz net/minecraft/entity/mob/ZombieEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD aK getHeightOffset ()D
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -10,10 +10,8 @@ CLASS aqa net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setConverting (Ljava/util/UUID;I)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cJ getSoundPitch ()F
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dB getSoundStep ()Lxf;

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

@@ -8,9 +8,7 @@ CLASS ana net/minecraft/entity/parts/EntityPart
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD s isPartOf (Lagi;)Z
 	METHOD x_ initDataTracker ()V

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

@@ -2,14 +2,11 @@ CLASS amm net/minecraft/entity/passive/AbstractDonkeyEntity
 	FIELD bM CHEST Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aL getMountedHeightOffset ()D
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD dA hasChest ()Z
 	METHOD dB getInventorySize ()I

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

@@ -2,15 +2,12 @@ CLASS aln net/minecraft/entity/passive/AnimalEntity
 	FIELD bF spawningGround Lbfr;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD H mobTick ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aK getHeightOffset ()D
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD k updateMovement ()V

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

@@ -7,10 +7,8 @@ CLASS ali net/minecraft/entity/passive/BatEntity
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setRoosting (Z)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bt canAvoidTraps ()Z
 	METHOD c handleFallDamage (FF)V

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

@@ -6,10 +6,7 @@ CLASS alo net/minecraft/entity/passive/CatEntity
 	CLASS alo$b SleepWithOwnerGoal
 		FIELD a entity Lalo;
 		FIELD b owner Laqj;
-		METHOD <init> (Lalo;)V
-			ARG 1 entity
 		METHOD a canStart ()Z
-			ARG 1 ownerEntity
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
@@ -30,12 +27,8 @@ CLASS alo net/minecraft/entity/passive/CatEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b createChild (Lagf;)Lalo;
-		ARG 1 otherParent
-		ARG 2 entity
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
@@ -47,5 +40,4 @@ CLASS alo net/minecraft/entity/passive/CatEntity
 	METHOD e getSoundHurt (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD p getOcelotType (I)V
-	METHOD v (Z)V
 	METHOD x_ initDataTracker ()V

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

@@ -5,10 +5,8 @@ CLASS alp net/minecraft/entity/passive/ChickenEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b createChild (Lagf;)Lalp;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance

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

@@ -1,7 +1,6 @@
 CLASS alr net/minecraft/entity/passive/CowEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a interactMob (Laqj;Lafb;)Z

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

@@ -27,12 +27,10 @@ CLASS als net/minecraft/entity/passive/DolphinEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD af getSoundSwim ()Lxf;
 	METHOD ag getSoundSplash ()Lxf;
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bh getMaxBreath ()I
 	METHOD cb initAttributes ()V

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

@@ -5,16 +5,13 @@ CLASS alk net/minecraft/entity/passive/FishEntity
 		METHOD a canStart ()Z
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD M getLimitPerChunk ()I
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD af getSoundSwim ()Lxf;
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD dl isPersistent ()Z

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

@@ -1,7 +1,6 @@
 CLASS all net/minecraft/entity/passive/GolemEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance

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

@@ -5,7 +5,6 @@ CLASS amn net/minecraft/entity/passive/HorseBaseEntity
 	FIELD bO OWNER_UUID Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD D getSoundAmbient ()Lxf;
 	METHOD H_ canJump ()Z
 	METHOD J_ stopJumping ()V
@@ -21,11 +20,9 @@ CLASS amn net/minecraft/entity/passive/HorseBaseEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a_ setJumpStrength (I)V
 	METHOD b startJumping (I)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setOwnerUuid (Ljava/util/UUID;)V
 	METHOD bH getEyeHeight ()F
 	METHOD c handleFallDamage (FF)V

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

@@ -16,9 +16,7 @@ CLASS amp net/minecraft/entity/passive/HorseEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dA getTextureLocation ()Ljava/lang/String;

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

@@ -7,9 +7,7 @@ CLASS alu net/minecraft/entity/passive/IronGolemEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -16,11 +16,9 @@ CLASS amr net/minecraft/entity/passive/LlamaEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aL getMountedHeightOffset ()D
 	METHOD b createChild (Lagf;)Lamr;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
@@ -32,6 +30,5 @@ CLASS amr net/minecraft/entity/passive/LlamaEntity
 	METHOD n initAi ()V
 	METHOD s setVariant (I)V
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD t setStrength (I)V
 	METHOD x_ initDataTracker ()V

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

@@ -12,9 +12,7 @@ CLASS alw net/minecraft/entity/passive/OcelotEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V

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

@@ -44,9 +44,7 @@ CLASS alx net/minecraft/entity/passive/PandaEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;

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

@@ -1,5 +1,4 @@
 CLASS amf net/minecraft/entity/passive/ParrotBaseEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD U_ update ()V

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

@@ -12,10 +12,8 @@ CLASS aly net/minecraft/entity/passive/ParrotEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD c handleFallDamage (FF)V

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

@@ -3,17 +3,14 @@ CLASS agf net/minecraft/entity/passive/PassiveEntity
 	FIELD bC CHILD Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD a setSize (FF)V
 		ARG 1 width
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b_ setBreedingAge (I)V
 	METHOD i getBreedingAge ()I
 	METHOD k updateMovement ()V

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

@@ -8,11 +8,9 @@ CLASS alz net/minecraft/entity/passive/PigEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b createChild (Lagf;)Lalz;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD dz isSaddled ()Z

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

@@ -9,10 +9,8 @@ CLASS amb net/minecraft/entity/passive/PufferfishEntity
 	METHOD a setSize (FF)V
 		ARG 1 width
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;
 	METHOD k updateMovement ()V

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

@@ -22,11 +22,9 @@ CLASS amc net/minecraft/entity/passive/RabbitEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD ax attemptSprintingParticles ()V
 	METHOD b createChild (Lagf;)Lamc;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -16,11 +16,9 @@ CLASS ame net/minecraft/entity/passive/SheepEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b createChild (Lagf;)Lame;
 	METHOD b setColor (Lauo;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -6,10 +6,8 @@ CLASS amg net/minecraft/entity/passive/SnowmanEntity
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setHasPumpkin (Z)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;
@@ -18,5 +16,4 @@ CLASS amg net/minecraft/entity/passive/SnowmanEntity
 	METHOD l hasPumpkin ()Z
 	METHOD n initAi ()V
 	METHOD s setArmsRaised (Z)V
-		ARG 1 armsRaised
 	METHOD x_ initDataTracker ()V

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

@@ -3,15 +3,12 @@ CLASS ahe net/minecraft/entity/passive/TameableEntity
 	FIELD bD OWNER_UUID Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD C_ getOwnerUuid ()Ljava/util/UUID;
 	METHOD D_ getOwner ()Lagi;
 	METHOD a onDeath (Lafr;)V
 	METHOD a canBeLeashedBy (Laqj;)Z
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setOwnerUuid (Ljava/util/UUID;)V
 	METHOD bg getScoreboardTeam ()Lclr;
 	METHOD dA onTamedChanged ()V

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

@@ -3,9 +3,7 @@ CLASS ami net/minecraft/entity/passive/TropicalFishEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD cw getSoundDeath ()Lxf;
 	METHOD e getSoundHurt (Lafr;)Lxf;
 	METHOD x_ initDataTracker ()V

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

@@ -45,11 +45,9 @@ CLASS amj net/minecraft/entity/passive/TurtleEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD af getSoundSwim ()Lxf;
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD by canFly ()Z
 	METHOD cb initAttributes ()V
 	METHOD cw getSoundDeath ()Lxf;

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

@@ -23,11 +23,9 @@ CLASS aqe net/minecraft/entity/passive/VillagerEntity
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a_ setCurrentCustomer (Laqj;)V
 	METHOD b createChild (Lagf;)Laqe;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD b_ getRecipes (Laqj;)Lazw;
 	METHOD c getVillagerWorld ()Lbaq;

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

@@ -18,10 +18,8 @@ CLASS aml net/minecraft/entity/passive/WolfEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b createChild (Lagf;)Laml;
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V

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

@@ -8,9 +8,7 @@ CLASS aqh net/minecraft/entity/player/PlayerAbilities
 	FIELD g walkSpeed F
 	METHOD a getFlySpeed ()F
 	METHOD a setFlySpeed (D)V
-		ARG 1 flySpeed
 	METHOD a setWalkSpeed (F)V
-		ARG 1 walkSpeed
 	METHOD a serialize (Lhp;)V
 	METHOD b getWalkSpeed ()F
 	METHOD b deserialize (Lhp;)V

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

@@ -83,7 +83,6 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity
 		ARG 1 pos
 		ARG 2 side
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a addChatMessage (Lja;Z)V
 		ARG 1 message
 	METHOD a playSoundAtEntity (Lxf;FF)V
@@ -106,7 +105,6 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity
 	METHOD b setPlayerSpawn (Let;Z)V
 		ARG 1 pos
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b incrementStat (Lxm;)V
 	METHOD bB shouldRenderName ()Z
 	METHOD bH getEyeHeight ()F

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

@@ -11,11 +11,9 @@ CLASS aqp net/minecraft/entity/projectile/ArrowEntity
 	METHOD a addEffect (Lagb;)V
 	METHOD a onHit (Lagr;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b spawnParticles (I)V
 	METHOD b initFromStack (Lavs;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD l asItemStack ()Lavs;
 	METHOD t getColor ()I
 	METHOD u initColor ()V

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

@@ -11,10 +11,8 @@ CLASS aqo net/minecraft/entity/projectile/ExplosiveProjectileEntity
 		ARG 1 source
 	METHOD a onCollision (Lckm;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD aD doesCollide ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD i getParticleType ()Lft;
 	METHOD x_ initDataTracker ()V

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

@@ -2,6 +2,4 @@ CLASS aqu net/minecraft/entity/projectile/FireballEntity
 	FIELD e explosionPower I
 	METHOD a onCollision (Lckm;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag

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

@@ -10,8 +10,6 @@ CLASS aof net/minecraft/entity/projectile/FishHookEntity
 		ARG 3 y
 		ARG 5 z
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD x_ initDataTracker ()V

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

@@ -2,9 +2,7 @@ CLASS aqv net/minecraft/entity/projectile/LlamaSpitEntity
 	FIELD a owner Lamr;
 	METHOD U_ update ()V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c setVelocity (DDDFF)V
 		ARG 1 dirX
 		ARG 3 dirY

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

@@ -20,7 +20,6 @@ CLASS aqn net/minecraft/entity/projectile/ProjectileEntity
 	FIELD f ownerUuid Ljava/util/UUID;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD U_ update ()V
 	METHOD a shouldRender (D)Z
 	METHOD a setPositionAndRotations (DDDFFIZ)V
@@ -34,12 +33,10 @@ CLASS aqn net/minecraft/entity/projectile/ProjectileEntity
 	METHOD a move (Lagw;DDD)V
 		ARG 2 x
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setSound (Lxf;)V
 	METHOD a setCritical (Z)V
 	METHOD b setFlagByte (B)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD c setDamage (D)V
 	METHOD c setVelocity (DDDFF)V

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

@@ -4,11 +4,9 @@ CLASS aqy net/minecraft/entity/projectile/ShulkerBulletEntity
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aA getLightmapCoordinates ()I
 	METHOD aD doesCollide ()Z
 	METHOD aX isOnFire ()Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD x_ initDataTracker ()V

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

@@ -3,7 +3,5 @@ CLASS arb net/minecraft/entity/projectile/SpectralArrowEntity
 	METHOD U_ update ()V
 	METHOD a onHit (Lagr;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD l asItemStack ()Lavs;

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

@@ -3,9 +3,7 @@ CLASS arh net/minecraft/entity/projectile/TridentEntity
 	FIELD ax dealtDamage Z
 	METHOD U_ update ()V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD g shouldRenderFrom (DDD)Z
 		ARG 1 x
 	METHOD i getSound ()Lxf;

mappings/net/minecraft/entity/thrown/ThrownEntity.mapping

@@ -13,14 +13,11 @@ CLASS arc net/minecraft/entity/thrown/ThrownEntity
 		ARG 1 world
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD U_ update ()V
 	METHOD a shouldRender (D)Z
 	METHOD a onCollision (Lckm;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c setVelocity (DDDFF)V
 		ARG 1 dirX
 		ARG 3 dirY

mappings/net/minecraft/entity/thrown/ThrownPotionEntity.mapping

@@ -13,10 +13,8 @@ CLASS arg net/minecraft/entity/thrown/ThrownPotionEntity
 	METHOD a onCollision (Lckm;)V
 	METHOD a extinguishFire (Let;Ley;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setItemStack (Lavs;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f getGravity ()F
 	METHOD k getItemStack ()Lavs;
 	METHOD m isLingering ()Z

mappings/net/minecraft/entity/tracker/EntityTracker.mapping

@@ -1,16 +1,12 @@
 CLASS ue net/minecraft/entity/tracker/EntityTracker
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b world Luj;
-	METHOD <init> (Luj;)V
-		ARG 1 world
 	METHOD a toFixedPoint (D)J
 	METHOD a track (Lagi;)V
-		ARG 1 entity
 	METHOD a (Lagi;DDD)V
 		ARG 0 entity
 		ARG 1 x
 		ARG 3 y
-		ARG 5 z
 	METHOD a track (Lagi;II)V
 	METHOD a track (Lagi;IIZ)V
 		ARG 2 trackingRange

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

@@ -24,13 +24,11 @@ CLASS arp net/minecraft/entity/vehicle/BoatEntity
 	METHOD a copyEntityData (Lagi;)V
 	METHOD a setBoatType (Larp$b;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD aD doesCollide ()Z
 	METHOD aL getMountedHeightOffset ()D
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f asItem ()Lavn;
 	METHOD i pushAwayFrom (Lagi;)V
 	METHOD p getBoatType ()Larp$b;

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

@@ -10,12 +10,10 @@ CLASS ars net/minecraft/entity/vehicle/CommandBlockMinecartEntity
 		ARG 2 y
 		ARG 3 z
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f getCommandExecutor ()Lazy;
 	METHOD v getMinecartType ()Larn$a;
 	METHOD x_ initDataTracker ()V

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

@@ -6,11 +6,9 @@ CLASS art net/minecraft/entity/vehicle/FurnaceMinecartEntity
 	METHOD U_ update ()V
 	METHOD a dropItems (Lafr;)V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD f isLit ()Z
 	METHOD o setLit (Z)V
 	METHOD v getMinecartType ()Larn$a;

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

@@ -20,11 +20,9 @@ CLASS aru net/minecraft/entity/vehicle/HopperMinecartEntity
 	METHOD a createContainer (Laqi;Laqj;)Lasb;
 		ARG 1 playerInv
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD l getContainerId ()Ljava/lang/String;
 	METHOD m setTransferCooldown (I)V
 	METHOD o setEnabled (Z)V

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

@@ -10,7 +10,6 @@ CLASS arn net/minecraft/entity/vehicle/MinecartBaseEntity
 	FIELD f CUSTOM_BLOCK_PRESENT Lpn;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD <init> (Lagm;Lbaq;DDD)V
 		ARG 1 world
 		ARG 3 x
@@ -34,7 +33,6 @@ CLASS arn net/minecraft/entity/vehicle/MinecartBaseEntity
 		ARG 1 x
 		ARG 3 y
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setCustomBlockPresent (Z)V
 	METHOD aD doesCollide ()Z
 	METHOD aL getMountedHeightOffset ()D
@@ -42,7 +40,6 @@ CLASS arn net/minecraft/entity/vehicle/MinecartBaseEntity
 		ARG 1 x
 	METHOD b setCustomBlock (Lboj;)V
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD h setVelocityClient (DDD)V
 		ARG 1 x
 	METHOD i pushAwayFrom (Lagi;)V

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

@@ -5,8 +5,6 @@ CLASS arv net/minecraft/entity/vehicle/MobSpawnerMinecartEntity
 	FIELD a logic Lazz;
 	METHOD U_ update ()V
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD v getMinecartType ()Larn$a;
 	METHOD z getDefaultContainedBlock ()Lboj;

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

@@ -4,7 +4,6 @@ CLASS aro net/minecraft/entity/vehicle/StorageMinecartEntity
 	FIELD d lootSeed J
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
-		ARG 2 world
 	METHOD S_ isInvEmpty ()Z
 	METHOD T_ getLootTableId ()Lpy;
 	METHOD X invalidate ()V
@@ -19,7 +18,6 @@ CLASS aro net/minecraft/entity/vehicle/StorageMinecartEntity
 	METHOD a canPlayerUseInv (Laqj;)Z
 	METHOD a changeDimension (Lbrc;)Lagi;
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a setLootTable (Lpy;J)V
 		ARG 1 id
 	METHOD b removeInvStack (I)Lavs;
@@ -31,7 +29,6 @@ CLASS aro net/minecraft/entity/vehicle/StorageMinecartEntity
 	METHOD b interact (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b setInWorld (Z)V
 	METHOD c getInvProperty (I)I
 	METHOD c onInvClose (Laqj;)V

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

@@ -19,9 +19,7 @@ CLASS arw net/minecraft/entity/vehicle/TNTMinecartEntity
 		ARG 3 pos
 		ARG 5 state
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD c explode (D)V
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance

mappings/net/minecraft/fluid/BaseFluid.mapping

@@ -2,6 +2,5 @@ CLASS cdo net/minecraft/fluid/BaseFluid
 	FIELD a STILL Lbpa;
 	FIELD b LEVEL Lbpi;
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 stateFactory
 	METHOD e getFlowing ()Lcdp;
 	METHOD f getStill ()Lcdp;

mappings/net/minecraft/fluid/EmptyFluid.mapping

@@ -4,7 +4,4 @@ CLASS cdn net/minecraft/fluid/EmptyFluid
 	METHOD b toBlockState (Lcdq;)Lboj;
 	METHOD c isEmpty ()Z
 	METHOD c isStill (Lcdq;)Z
-		ARG 1 state
 	METHOD d getBlastResistance ()F
-	METHOD d (Lcdq;)I
-		ARG 1 state

mappings/net/minecraft/fluid/Fluid.mapping

@@ -4,19 +4,14 @@ CLASS cdp net/minecraft/fluid/Fluid
 	FIELD d stateFactory Lbok;
 	METHOD a getRenderLayer ()Lbad;
 	METHOD a appendProperties (Lbok$a;)V
-		ARG 1 stateFactory
 	METHOD a matchesType (Lcdp;)Z
-		ARG 1 fluid
 	METHOD a matches (Lxx;)Z
 	METHOD b getBucketItem ()Lavn;
 	METHOD b onRandomTick (Lbaq;Let;Lcdq;Ljava/util/Random;)V
 	METHOD b toBlockState (Lcdq;)Lboj;
 	METHOD c isEmpty ()Z
 	METHOD c isStill (Lcdq;)Z
-		ARG 1 state
 	METHOD d getBlastResistance ()F
-	METHOD d (Lcdq;)I
-		ARG 1 state
 	METHOD f setDefaultState (Lcdq;)V
 	METHOD h getStateFactory ()Lbok;
 	METHOD i getDefaultState ()Lcdq;

mappings/net/minecraft/fluid/LavaFluid.mapping

@@ -1,19 +1,11 @@
 CLASS cdt net/minecraft/fluid/LavaFluid
 	CLASS cdt$a Flowing
 		METHOD a appendProperties (Lbok$a;)V
-			ARG 1 stateFactory
 		METHOD c isStill (Lcdq;)Z
-			ARG 1 state
-		METHOD d (Lcdq;)I
-			ARG 1 state
 	CLASS cdt$b Still
 		METHOD c isStill (Lcdq;)Z
-			ARG 1 state
-		METHOD d (Lcdq;)I
-			ARG 1 state
 	METHOD a getRenderLayer ()Lbad;
 	METHOD a matchesType (Lcdp;)Z
-		ARG 1 fluid
 	METHOD b getBucketItem ()Lavn;
 	METHOD b onRandomTick (Lbaq;Let;Lcdq;Ljava/util/Random;)V
 	METHOD b toBlockState (Lcdq;)Lboj;

mappings/net/minecraft/fluid/WaterFluid.mapping

@@ -1,19 +1,11 @@
 CLASS cdx net/minecraft/fluid/WaterFluid
 	CLASS cdx$a Flowing
 		METHOD a appendProperties (Lbok$a;)V
-			ARG 1 stateFactory
 		METHOD c isStill (Lcdq;)Z
-			ARG 1 state
-		METHOD d (Lcdq;)I
-			ARG 1 state
 	CLASS cdx$b Still
 		METHOD c isStill (Lcdq;)Z
-			ARG 1 state
-		METHOD d (Lcdq;)I
-			ARG 1 state
 	METHOD a getRenderLayer ()Lbad;
 	METHOD a matchesType (Lcdp;)Z
-		ARG 1 fluid
 	METHOD b getBucketItem ()Lavn;
 	METHOD b toBlockState (Lcdq;)Lboj;
 	METHOD d getBlastResistance ()F

mappings/net/minecraft/item/ArmorItem.mapping

@@ -11,7 +11,6 @@ CLASS atm net/minecraft/item/ArmorItem
 	METHOD a getAttributeModifiers (Lagn;)Lcom/google/common/collect/Multimap;
 	METHOD a canRepair (Lavs;Lavs;)Z
 		ARG 1 tool
-		ARG 2 stack
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/ArmorStandItem.mapping

@@ -1,6 +1,4 @@
 CLASS atp net/minecraft/item/ArmorStandItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a setRotations (Lany;Ljava/util/Random;)V
 		ARG 1 armorStand
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/ArrowItem.mapping

@@ -1,6 +1,4 @@
 CLASS atq net/minecraft/item/ArrowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a createEntityArrow (Lbaq;Lavs;Lagr;)Laqn;
 		ARG 1 world
 		ARG 2 stack

mappings/net/minecraft/item/AxeItem.mapping

@@ -3,5 +3,4 @@ CLASS atr net/minecraft/item/AxeItem
 	FIELD e EFFECTIVE_BLOCKS Ljava/util/Set;
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/BaseBowItem.mapping

@@ -1,6 +1,4 @@
 CLASS awe net/minecraft/item/BaseBowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a findArrowStack (Laqj;)Lavs;
 	METHOD c getEnchantability ()I
 	METHOD f isArrow (Lavs;)Z

mappings/net/minecraft/item/BoneMealItem.mapping

@@ -1,4 +1,2 @@
 CLASS aty net/minecraft/item/BoneMealItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/BookItem.mapping

@@ -1,5 +1,3 @@
 CLASS atz net/minecraft/item/BookItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a isTool (Lavs;)Z
 	METHOD c getEnchantability ()I

mappings/net/minecraft/item/BookKnowledgeItem.mapping

@@ -1,6 +1,4 @@
 CLASS avu net/minecraft/item/BookKnowledgeItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/BookWritableItem.mapping

@@ -1,6 +1,4 @@
 CLASS axh net/minecraft/item/BookWritableItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/BookWrittenItem.mapping

@@ -1,6 +1,4 @@
 CLASS axi net/minecraft/item/BookWrittenItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/BowItem.mapping

@@ -1,6 +1,4 @@
 CLASS aub net/minecraft/item/BowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a onItemStopUsing (Lavs;Lbaq;Lagr;I)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/BucketMilkItem.mapping

@@ -1,6 +1,4 @@
 CLASS avy net/minecraft/item/BucketMilkItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a onItemFinishedUsing (Lavs;Lbaq;Lagr;)Lavs;
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/CarrotOnAStickItem.mapping

@@ -1,6 +1,4 @@
 CLASS aue net/minecraft/item/CarrotOnAStickItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/ClockItem.mapping

@@ -4,5 +4,3 @@ CLASS aug net/minecraft/item/ClockItem
 			ARG 0 stack
 			ARG 1 world
 			ARG 2 user
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder

mappings/net/minecraft/item/CompassItem.mapping

@@ -4,5 +4,3 @@ CLASS auh net/minecraft/item/CompassItem
 			ARG 0 stack
 			ARG 1 world
 			ARG 2 user
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder

mappings/net/minecraft/item/CrossbowItem.mapping

@@ -1,6 +1,4 @@
 CLASS auk net/minecraft/item/CrossbowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a onItemStopUsing (Lavs;Lbaq;Lagr;I)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/DebugStickItem.mapping

@@ -1,6 +1,4 @@
 CLASS aul net/minecraft/item/DebugStickItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;
 	METHOD a beforeBlockBreak (Lboj;Lbaq;Let;Laqj;)Z
 	METHOD e_ hasEnchantmentGlow (Lavs;)Z

mappings/net/minecraft/item/EggItem.mapping

@@ -1,6 +1,4 @@
 CLASS aur net/minecraft/item/EggItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/ElytraItem.mapping

@@ -1,9 +1,6 @@
 CLASS aus net/minecraft/item/ElytraItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a canRepair (Lavs;Lavs;)Z
 		ARG 1 tool
-		ARG 2 stack
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/EmptyMapItem.mapping

@@ -1,6 +1,4 @@
 CLASS aut net/minecraft/item/EmptyMapItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/EnchantedBookItem.mapping

@@ -1,6 +1,4 @@
 CLASS auu net/minecraft/item/EnchantedBookItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addStacksForDisplay (Lauj;Lfh;)V
 	METHOD a isTool (Lavs;)Z
 	METHOD a addEnchantment (Lavs;Layw;)V

mappings/net/minecraft/item/EndCrystalItem.mapping

@@ -1,5 +1,3 @@
 CLASS auw net/minecraft/item/EndCrystalItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;
 	METHOD e_ hasEnchantmentGlow (Lavs;)Z

mappings/net/minecraft/item/EnderEyeItem.mapping

@@ -1,6 +1,4 @@
 CLASS auy net/minecraft/item/EnderEyeItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world

mappings/net/minecraft/item/EnderPearlItem.mapping

@@ -1,6 +1,4 @@
 CLASS auz net/minecraft/item/EnderPearlItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/ExperienceBottleItem.mapping

@@ -1,6 +1,4 @@
 CLASS ava net/minecraft/item/ExperienceBottleItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/FilledMapItem.mapping

@@ -1,6 +1,4 @@
 CLASS avx net/minecraft/item/FilledMapItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a onUpdate (Lavs;Lbaq;Lagi;IZ)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/FireChargeItem.mapping

@@ -1,4 +1,2 @@
 CLASS avb net/minecraft/item/FireChargeItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/FireworkChargeItem.mapping

@@ -1,6 +1,4 @@
 CLASS avd net/minecraft/item/FireworkChargeItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a getColorTextComponent (I)Lja;
 		ARG 0 colorRGB
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V

mappings/net/minecraft/item/FireworksItem.mapping

@@ -1,6 +1,4 @@
 CLASS avc net/minecraft/item/FireworksItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/FishingRodItem.mapping

@@ -1,6 +1,4 @@
 CLASS avg net/minecraft/item/FishingRodItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/FlintAndSteelItem.mapping

@@ -1,4 +1,2 @@
 CLASS avh net/minecraft/item/FlintAndSteelItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/GlassBottleItem.mapping

@@ -1,6 +1,4 @@
 CLASS aua net/minecraft/item/GlassBottleItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/HoeItem.mapping

@@ -5,5 +5,4 @@ CLASS avm net/minecraft/item/HoeItem
 	METHOD a onEntityDamaged (Lavs;Lagr;Lagr;)Z
 		ARG 1 stack
 		ARG 2 target
-		ARG 3 attacker
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/Item.mapping

@@ -7,22 +7,16 @@ CLASS avn net/minecraft/item/Item
 		FIELD e rarity Lawf;
 		METHOD a stackSize (I)Lavn$a;
 			ARG 0 value
-			ARG 1 fullStackSize
 		METHOD a itemGroup (Lauj;)Lavn$a;
 			ARG 0 value
-			ARG 1 itemGroup
 		METHOD a containerItem (Lavn;)Lavn$a;
 			ARG 0 item
-			ARG 1 containerItem
 		METHOD a rarity (Lawf;)Lavn$a;
 			ARG 0 value
-			ARG 1 rarity
 		METHOD b durabilityIfNotSet (I)Lavn$a;
 			ARG 0 value
-			ARG 1 maxDamage
 		METHOD c durability (I)Lavn$a;
 			ARG 0 value
-			ARG 1 durability
 	FIELD a GETTER_DAMAGED Lavr;
 	FIELD b GETTER_DAMAGE Lavr;
 	FIELD c GETTER_HAND Lavr;
@@ -39,8 +33,6 @@ CLASS avn net/minecraft/item/Item
 	FIELD n durability I
 	FIELD o containerItem Lavn;
 	FIELD p translationKey Ljava/lang/String;
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD Z_ isMap ()Z
 	METHOD a getTranslationKey ()Ljava/lang/String;
 	METHOD a getAttributeModifiers (Lagn;)Lcom/google/common/collect/Multimap;
@@ -51,14 +43,12 @@ CLASS avn net/minecraft/item/Item
 	METHOD a onEntityDamaged (Lavs;Lagr;Lagr;)Z
 		ARG 1 stack
 		ARG 2 target
-		ARG 3 attacker
 	METHOD a interactWithEntity (Lavs;Laqj;Lagr;Lafb;)Z
 		ARG 1 stack
 		ARG 2 player
 		ARG 3 target
 	METHOD a canRepair (Lavs;Lavs;)Z
 		ARG 1 tool
-		ARG 2 stack
 	METHOD a onUpdate (Lavs;Lbaq;Lagi;IZ)V
 		ARG 1 stack
 		ARG 2 world
@@ -76,14 +66,12 @@ CLASS avn net/minecraft/item/Item
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
-		ARG 5 entity
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 2 world
 		ARG 3 tooltip
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state
 	METHOD a useOnBlock (Laxf;)Lafd;
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
@@ -93,7 +81,6 @@ CLASS avn net/minecraft/item/Item
 		ARG 2 player
 	METHOD a getItemFromBlock (Lbfr;)Lavn;
 		ARG 0 block
-		ARG 1 item
 	METHOD a isEffectiveOn (Lboj;)Z
 	METHOD a beforeBlockBreak (Lboj;Lbaq;Let;Laqj;)Z
 	METHOD a onTagDeserialized (Lhp;)Z

mappings/net/minecraft/item/ItemFrameItem.mapping

@@ -1,3 +1 @@
 CLASS avp net/minecraft/item/ItemFrameItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder

mappings/net/minecraft/item/ItemStack.mapping

@@ -23,7 +23,6 @@ CLASS avs net/minecraft/item/ItemStack
 	METHOD a isEmpty ()Z
 	METHOD a split (I)Lavs;
 	METHOD a applyDamage (ILagr;)V
-		ARG 2 entity
 	METHOD a applyDamage (ILjava/util/Random;Lul;)Z
 		ARG 1 amount
 	METHOD a getAttributeModifiers (Lagn;)Lcom/google/common/collect/Multimap;

mappings/net/minecraft/item/LeashItem.mapping

@@ -1,4 +1,2 @@
 CLASS avv net/minecraft/item/LeashItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a useOnBlock (Laxf;)Lafd;

mappings/net/minecraft/item/LingeringPotionItem.mapping

@@ -1,6 +1,4 @@
 CLASS avw net/minecraft/item/LingeringPotionItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/MapItem.mapping

@@ -1,6 +1,4 @@
 CLASS aui net/minecraft/item/MapItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD Z_ isMap ()Z
 	METHOD a createMapPacket (Lavs;Lbaq;Laqj;)Ljo;
 		ARG 1 stack

mappings/net/minecraft/item/MiningToolItem.mapping

@@ -8,18 +8,14 @@ CLASS aum net/minecraft/item/MiningToolItem
 		ARG 2 attackSpeed
 		ARG 3 toolType
 		ARG 4 effectiveBlocks
-		ARG 5 builder
 	METHOD a getAttributeModifiers (Lagn;)Lcom/google/common/collect/Multimap;
 	METHOD a onEntityDamaged (Lavs;Lagr;Lagr;)Z
 		ARG 1 stack
 		ARG 2 target
-		ARG 3 attacker
 	METHOD a onBlockBroken (Lavs;Lbaq;Lboj;Let;Lagr;)Z
 		ARG 1 stack
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
-		ARG 5 entity
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state

mappings/net/minecraft/item/NameTagItem.mapping

@@ -1,6 +1,4 @@
 CLASS awa net/minecraft/item/NameTagItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a interactWithEntity (Lavs;Laqj;Lagr;Lafb;)Z
 		ARG 1 stack
 		ARG 2 player

mappings/net/minecraft/item/NetherStarItem.mapping

@@ -1,4 +1,2 @@
 CLASS awq net/minecraft/item/NetherStarItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD e_ hasEnchantmentGlow (Lavs;)Z

mappings/net/minecraft/item/PickaxeItem.mapping

@@ -2,5 +2,4 @@ CLASS awb net/minecraft/item/PickaxeItem
 	FIELD a EFFECTIVE_BLOCKS Ljava/util/Set;
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state
 	METHOD a isEffectiveOn (Lboj;)Z

mappings/net/minecraft/item/PotionItem.mapping

@@ -1,6 +1,4 @@
 CLASS awd net/minecraft/item/PotionItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addStacksForDisplay (Lauj;Lfh;)V
 	METHOD a onItemFinishedUsing (Lavs;Lbaq;Lagr;)Lavs;
 		ARG 1 stack

mappings/net/minecraft/item/SaddleItem.mapping

@@ -1,6 +1,4 @@
 CLASS awh net/minecraft/item/SaddleItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a interactWithEntity (Lavs;Laqj;Lagr;Lafb;)Z
 		ARG 1 stack
 		ARG 2 player

mappings/net/minecraft/item/ShearsItem.mapping

@@ -1,13 +1,9 @@
 CLASS awm net/minecraft/item/ShearsItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a onBlockBroken (Lavs;Lbaq;Lboj;Let;Lagr;)Z
 		ARG 1 stack
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
-		ARG 5 entity
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state
 	METHOD a isEffectiveOn (Lboj;)Z

mappings/net/minecraft/item/ShieldItem.mapping

@@ -1,9 +1,6 @@
 CLASS awn net/minecraft/item/ShieldItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a canRepair (Lavs;Lavs;)Z
 		ARG 1 tool
-		ARG 2 stack
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack
 		ARG 2 world

mappings/net/minecraft/item/SnowballItem.mapping

@@ -1,6 +1,4 @@
 CLASS awr net/minecraft/item/SnowballItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/SpectralArrowItem.mapping

@@ -1,6 +1,4 @@
 CLASS awt net/minecraft/item/SpectralArrowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a createEntityArrow (Lbaq;Lavs;Lagr;)Laqn;
 		ARG 1 world
 		ARG 2 stack

mappings/net/minecraft/item/SplashPotionItem.mapping

@@ -1,6 +1,4 @@
 CLASS awu net/minecraft/item/SplashPotionItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/item/SwordItem.mapping

@@ -4,15 +4,12 @@ CLASS awx net/minecraft/item/SwordItem
 	METHOD a onEntityDamaged (Lavs;Lagr;Lagr;)Z
 		ARG 1 stack
 		ARG 2 target
-		ARG 3 attacker
 	METHOD a onBlockBroken (Lavs;Lbaq;Lboj;Let;Lagr;)Z
 		ARG 1 stack
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
-		ARG 5 entity
 	METHOD a getBlockBreakingSpeed (Lavs;Lboj;)F
 		ARG 1 stack
-		ARG 2 state
 	METHOD a isEffectiveOn (Lboj;)Z
 	METHOD a beforeBlockBreak (Lboj;Lbaq;Let;Laqj;)Z

mappings/net/minecraft/item/TippedArrowItem.mapping

@@ -1,6 +1,4 @@
 CLASS axb net/minecraft/item/TippedArrowItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a addStacksForDisplay (Lauj;Lfh;)V
 	METHOD a addInformation (Lavs;Lbaq;Ljava/util/List;Laxc;)V
 		ARG 1 stack

mappings/net/minecraft/item/ToolItem.mapping

@@ -2,9 +2,7 @@ CLASS awz net/minecraft/item/ToolItem
 	FIELD a material Lawy;
 	METHOD <init> (Lawy;Lavn$a;)V
 		ARG 1 material
-		ARG 2 builder
 	METHOD a canRepair (Lavs;Lavs;)Z
 		ARG 1 tool
-		ARG 2 stack
 	METHOD c getEnchantability ()I
 	METHOD e getType ()Lawy;

mappings/net/minecraft/item/ToolMaterials.mapping

@@ -16,7 +16,6 @@ CLASS axa net/minecraft/item/ToolMaterials
 		ARG 5 blockBreakSpeed
 		ARG 6 attackDamage
 		ARG 7 enchantibility
-		ARG 8 repairIngredient
 	METHOD a getDurability ()I
 	METHOD b getBlockBreakingSpeed ()F
 	METHOD c getAttackDamage ()F

mappings/net/minecraft/item/TridentItem.mapping

@@ -1,11 +1,8 @@
 CLASS axd net/minecraft/item/TridentItem
-	METHOD <init> (Lavn$a;)V
-		ARG 1 builder
 	METHOD a getAttributeModifiers (Lagn;)Lcom/google/common/collect/Multimap;
 	METHOD a onEntityDamaged (Lavs;Lagr;Lagr;)Z
 		ARG 1 stack
 		ARG 2 target
-		ARG 3 attacker
 	METHOD a onItemStopUsing (Lavs;Lbaq;Lagr;I)V
 		ARG 1 stack
 		ARG 2 world
@@ -15,7 +12,6 @@ CLASS axd net/minecraft/item/TridentItem
 		ARG 2 world
 		ARG 3 state
 		ARG 4 pos
-		ARG 5 entity
 	METHOD a use (Lbaq;Laqj;Lafb;)Lafe;
 		ARG 1 world
 		ARG 2 player

mappings/net/minecraft/particle/BlockStateParticle.mapping

@@ -2,6 +2,4 @@ CLASS fq net/minecraft/particle/BlockStateParticle
 	METHOD <init> (Lfu;Lboj;)V
 		ARG 1 particleType
 	METHOD a asString ()Ljava/lang/String;
-	METHOD a (Liq;)V
-		ARG 1 packetByteBuf
 	METHOD b getParticleType ()Lfu;

mappings/net/minecraft/particle/DustParticle.mapping

@@ -7,10 +7,7 @@ CLASS fr net/minecraft/particle/DustParticle
 		ARG 1 red
 		ARG 2 green
 		ARG 3 blue
-		ARG 4 alpha
 	METHOD a asString ()Ljava/lang/String;
-	METHOD a (Liq;)V
-		ARG 1 packetByteBuf
 	METHOD b getParticleType ()Lfu;
 	METHOD c getRed ()F
 	METHOD d getGreen ()F

mappings/net/minecraft/particle/ItemStackParticle.mapping

@@ -1,15 +1,8 @@
 CLASS fs net/minecraft/particle/ItemStackParticle
-	CLASS fs$1
-		METHOD a (Lfu;Lcom/mojang/brigadier/StringReader;)Lfs;
-			ARG 4 stack
-		METHOD a (Lfu;Liq;)Lfs;
 	FIELD b particleType Lfu;
 	FIELD c stack Lavs;
 	METHOD <init> (Lfu;Lavs;)V
 		ARG 1 particleType
-		ARG 2 stack
 	METHOD a asString ()Ljava/lang/String;
-	METHOD a (Liq;)V
-		ARG 1 packetByteBuf
 	METHOD b getParticleType ()Lfu;
 	METHOD c getItemStack ()Lavs;

mappings/net/minecraft/particle/Particle.mapping

@@ -1,6 +1,3 @@
 CLASS ft net/minecraft/particle/Particle
-	CLASS ft$a
 	METHOD a asString ()Ljava/lang/String;
-	METHOD a (Liq;)V
-		ARG 1 packetByteBuf
 	METHOD b getParticleType ()Lfu;

mappings/net/minecraft/particle/TexturedParticle.mapping

@@ -1,5 +1,3 @@
 CLASS fw net/minecraft/particle/TexturedParticle
 	METHOD a asString ()Ljava/lang/String;
-	METHOD a (Liq;)V
-		ARG 1 packetByteBuf
 	METHOD b getParticleType ()Lfu;

mappings/net/minecraft/predicate/DamagePredicate.mapping

@@ -7,9 +7,7 @@ CLASS ai net/minecraft/predicate/DamagePredicate
 		FIELD e type Laj;
 		METHOD a create ()Lai$a;
 		METHOD a type (Laj$a;)Lai$a;
-			ARG 1 type
 		METHOD a blocked (Ljava/lang/Boolean;)Lai$a;
-			ARG 1 blocked
 		METHOD b build ()Lai;
 	FIELD a ANY Lai;
 	FIELD b dealt Lbf$c;
@@ -22,7 +20,6 @@ CLASS ai net/minecraft/predicate/DamagePredicate
 		ARG 2 taken
 		ARG 3 sourceEntity
 		ARG 4 blocked
-		ARG 5 type
 	METHOD a serialize ()Lcom/google/gson/JsonElement;
 	METHOD a deserialize (Lcom/google/gson/JsonElement;)Lai;
 	METHOD a test (Lul;Lafr;FFZ)Z

mappings/net/minecraft/server/dedicated/DedicatedPlayerManager.mapping

@@ -1,6 +1,4 @@
 CLASS tm net/minecraft/server/dedicated/DedicatedPlayerManager
-	METHOD <init> (Ltn;)V
-		ARG 1 server
 	METHOD A loadUserBanList ()V
 	METHOD B loadOpList ()V
 	METHOD C saveOpList ()V

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

@@ -40,7 +40,6 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity
 	METHOD a changeDimension (Lbrc;)Lagi;
 	METHOD a trySleep (Let;)Laqj$a;
 	METHOD a deserializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD a appendCommandFeedback (Lja;)V
 	METHOD a sendChatMessage (Lja;Liy;)V
 	METHOD a addChatMessage (Lja;Z)V
@@ -50,7 +49,6 @@ CLASS ul net/minecraft/server/network/ServerPlayerEntity
 		ARG 1 stat
 	METHOD b isInvulnerableTo (Lafr;)Z
 	METHOD b serializeCustomData (Lhp;)V
-		ARG 1 tag
 	METHOD d addExperience (I)V
 	METHOD f attack (Lagi;)V
 	METHOD g createCooldownManager ()Lavo;

mappings/net/minecraft/sortme/CachedSupplier.mapping

@@ -1,7 +1,4 @@
 CLASS ym net/minecraft/sortme/CachedSupplier
 	FIELD a supplier Ljava/util/function/Supplier;
 	FIELD b type Ljava/lang/Object;
-	METHOD <init> (Ljava/util/function/Supplier;)V
-		ARG 1 supplier
 	METHOD a getType ()Ljava/lang/Object;
-		ARG 1 supplier

mappings/net/minecraft/sortme/Raid.mapping

@@ -24,18 +24,12 @@ CLASS ark net/minecraft/sortme/Raid
 	METHOD <init> (ILbaq;Lald;)V
 		ARG 1 id
 		ARG 2 world
-		ARG 3 villageProperties
 	METHOD a deserialize (Lhp;)V
-		ARG 1 tag
 	METHOD b hasStarted ()Z
 	METHOD b serialize (Lhp;)Lhp;
-		ARG 1 tag
 	METHOD c getGroupsSpawned ()I
 	METHOD e getBadOmenLevel ()I
 	METHOD j getVillageProperties ()Lald;
 	METHOD l getRaidId ()I
 	METHOD m isActive ()Z
 	METHOD u getIllagerBanner ()Lavs;
-		ARG 0 stack
-		ARG 1 tag
-		ARG 2 patterns

mappings/net/minecraft/sortme/RaidState.mapping

@@ -4,5 +4,3 @@ CLASS arm net/minecraft/sortme/RaidState
 	FIELD e tick I
 	METHOD a getRaid (I)Lark;
 	METHOD b nextId ()I
-	METHOD b (Lhp;)Lhp;
-		ARG 2 raids

mappings/net/minecraft/sortme/structures/MineshaftGenerator.mapping

@@ -4,14 +4,10 @@ CLASS can net/minecraft/sortme/structures/MineshaftGenerator
 			ARG 3 random
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS can$b MineshaftCrossing
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 		METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;)Lcag;
 			ARG 5 facing
@@ -26,14 +22,10 @@ CLASS can net/minecraft/sortme/structures/MineshaftGenerator
 			ARG 2 y
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS can$e MineshaftStairs
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;)Lcag;
 			ARG 1 random
 	METHOD a (Ljava/util/List;Ljava/util/Random;IIILey;ILbvf$b;)Lcan$c;

mappings/net/minecraft/sortme/structures/NetherFortressGenerator.mapping

@@ -2,8 +2,6 @@ CLASS cao net/minecraft/sortme/structures/NetherFortressGenerator
 	CLASS cao$a
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$b
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
@@ -11,50 +9,32 @@ CLASS cao net/minecraft/sortme/structures/NetherFortressGenerator
 	CLASS cao$c
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$d
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$e
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$f
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$g
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$h
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS cao$i
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$j
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS cao$k
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$l
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
@@ -64,10 +44,6 @@ CLASS cao net/minecraft/sortme/structures/NetherFortressGenerator
 	CLASS cao$o
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS cao$p
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random

mappings/net/minecraft/sortme/structures/StrongholdGenerator.mapping

@@ -2,8 +2,6 @@ CLASS caw net/minecraft/sortme/structures/StrongholdGenerator
 	CLASS caw$a
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$b
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
@@ -12,14 +10,10 @@ CLASS caw net/minecraft/sortme/structures/StrongholdGenerator
 	CLASS caw$c
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$d
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS caw$e
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
@@ -27,24 +21,16 @@ CLASS caw net/minecraft/sortme/structures/StrongholdGenerator
 	CLASS caw$g
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$h
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS caw$i
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS caw$j
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$k
 		METHOD a (Ljava/util/Random;IIIZ)V
@@ -53,19 +39,13 @@ CLASS caw net/minecraft/sortme/structures/StrongholdGenerator
 	CLASS caw$l
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$n
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS caw$o
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 	CLASS caw$p
 		METHOD a toNbt (Lhp;)V

mappings/net/minecraft/sortme/structures/VillageGenerator.mapping

@@ -34,8 +34,6 @@ CLASS cbe net/minecraft/sortme/structures/VillageGenerator
 	CLASS cbe$l
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random
 		METHOD a toNbt (Lhp;)V
 	CLASS cbe$m
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
@@ -69,5 +67,3 @@ CLASS cbe net/minecraft/sortme/structures/VillageGenerator
 	CLASS cbe$p
 		METHOD a (Lbar;Ljava/util/Random;Lcag;Lbae;)Z
 			ARG 2 random
-		METHOD a (Lcba;Ljava/util/List;Ljava/util/Random;)V
-			ARG 3 random

mappings/net/minecraft/sound/BlockSoundGroup.mapping

@@ -23,14 +23,6 @@ CLASS bks net/minecraft/sound/BlockSoundGroup
 	FIELD v placeSound Lxf;
 	FIELD w hitSound Lxf;
 	FIELD x fallSound Lxf;
-	METHOD <init> (FFLxf;Lxf;Lxf;Lxf;Lxf;)V
-		ARG 1 volume
-		ARG 2 pitch
-		ARG 3 breakSound
-		ARG 4 stepSound
-		ARG 5 placeSound
-		ARG 6 hitSound
-		ARG 7 fallSound
 	METHOD a getVolume ()F
 	METHOD b getPitch ()F
 	METHOD c getBreakSound ()Lxf;

mappings/net/minecraft/util/PacketByteBuf.mapping

@@ -34,4 +34,3 @@ CLASS iq net/minecraft/util/PacketByteBuf
 	METHOD k readItemStack ()Lavs;
 	METHOD l readIdentifier ()Lpy;
 	METHOD m readDate ()Ljava/util/Date;
-	METHOD writeFloat (F)Lio/netty/buffer/ByteBuf;

mappings/net/minecraft/util/Rarity.mapping

@@ -4,5 +4,3 @@ CLASS awf net/minecraft/util/Rarity
 	FIELD c RARE Lawf;
 	FIELD d EPIC Lawf;
 	FIELD e formatting La;
-	METHOD <init> (Ljava/lang/String;ILa;)V
-		ARG 3 formatting

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

@@ -57,7 +57,6 @@ CLASS ey net/minecraft/util/math/Facing
 			ARG 0 random
 		METHOD b isVertical ()Z
 		METHOD c isHorizontal ()Z
-		METHOD d ()Ley$c;
 		METHOD m asString ()Ljava/lang/String;
 	CLASS ey$b Direction
 		FIELD a POSITIVE Ley$b;
@@ -74,7 +73,6 @@ CLASS ey net/minecraft/util/math/Facing
 			ARG 0 facing
 		METHOD a random (Ljava/util/Random;)Ley;
 			ARG 0 rand
-			ARG 1 random
 	FIELD a DOWN Ley;
 	FIELD b UP Ley;
 	FIELD c NORTH Ley;

mappings/net/minecraft/util/shape/VoxelShape.mapping

@@ -12,15 +12,12 @@ CLASS cky net/minecraft/util/shape/VoxelShape
 		ARG 2 y
 		ARG 3 z
 		ARG 4 resize
-	METHOD a (Ler;III)Z
 	METHOD a getMinimum (Ley$a;)I
 	METHOD b getXSize ()I
 	METHOD b contains (III)Z
 		ARG 1 x
 		ARG 2 y
-	METHOD b (Ler;III)Z
 	METHOD b getMaximum (Ley$a;)I
 	METHOD c getYSize ()I
-	METHOD c (III)Z
 	METHOD c getSize (Ley$a;)I
 	METHOD d getZSize ()I

mappings/net/minecraft/world/chunk/EmptyChunk.mapping

@@ -3,7 +3,6 @@ CLASS bqd net/minecraft/world/chunk/EmptyChunk
 	METHOD <init> (Lbaq;II)V
 		ARG 1 world
 		ARG 2 x
-		ARG 3 z
 	METHOD a addEntity (Lagi;)V
 	METHOD a remove (Lagi;I)V
 		ARG 1 entity